From 1cf4e493d6184cd2e844e95af672890a4fca0604 Mon Sep 17 00:00:00 2001
From: gianlucaparadise <gianlucaparadise@gmail.com>
Date: Mon, 1 Nov 2021 19:46:26 +0100
Subject: [PATCH] Pigeon: Removed `MethodChannel`

---
 .../FlutterCastFrameworkPlugin.kt               |  7 -------
 .../SwiftFlutterCastFrameworkPlugin.swift       | 10 ++++------
 lib/src/flutter_cast_framework.dart             | 17 -----------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt
index 708c401..131fecd 100644
--- a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt
+++ b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt
@@ -48,10 +48,6 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa
     private fun onAttachedToEngine(applicationContext: Context, messenger: BinaryMessenger) {
         this.applicationContext = applicationContext
 
-        val methodChannel = MethodChannel(messenger, "flutter_cast_framework")
-        methodChannel.setMethodCallHandler(this)
-        channel = methodChannel
-
         castApi = MyApi()
         HostApis.CastApi.setup(messenger, castApi)
 
@@ -72,8 +68,6 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         Log.d(TAG, "onDetachedFromEngine")
         applicationContext = null;
-        channel?.setMethodCallHandler(null);
-        channel = null;
         mMessageCastingChannel = null
     }
     //endregion
@@ -103,7 +97,6 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa
     private lateinit var mSessionManager: SessionManager
     private val mSessionManagerListener = CastSessionManagerListener()
 
-    private var channel: MethodChannel? = null
     private var castApi : HostApis.CastApi? = null
     private var flutterApi: HostApis.CastFlutterApi? = null
     private var applicationContext: Context? = null
diff --git a/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift b/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift
index e3631db..2bf733d 100644
--- a/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift
+++ b/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift
@@ -5,11 +5,11 @@ import GoogleCast
 public class SwiftFlutterCastFrameworkPlugin: NSObject, FlutterPlugin, GCKSessionManagerListener, CastApi {
     public static func register(with registrar: FlutterPluginRegistrar) {
         let messenger : FlutterBinaryMessenger = registrar.messenger()
-        
-        let channel = FlutterMethodChannel(name: "flutter_cast_framework", binaryMessenger: messenger)
         let flutterApi = CastFlutterApi.init(binaryMessenger: messenger)
         
-        let instance = SwiftFlutterCastFrameworkPlugin(channel: channel, flutterApi: flutterApi)
+        let instance = SwiftFlutterCastFrameworkPlugin(flutterApi: flutterApi)
+        
+        let channel = FlutterMethodChannel(name: "flutter_cast_framework_dummy_channel", binaryMessenger: messenger)
         registrar.addMethodCallDelegate(instance, channel: channel)
         
         let api : CastApi & NSObjectProtocol = instance
@@ -18,7 +18,6 @@ public class SwiftFlutterCastFrameworkPlugin: NSObject, FlutterPlugin, GCKSessio
     
     private let castContext: GCKCastContext
     private var castStateObserver: NSKeyValueObservation?
-    private let channel: FlutterMethodChannel
     private let flutterApi : CastFlutterApi
     
     private let sessionManager: GCKSessionManager
@@ -62,8 +61,7 @@ public class SwiftFlutterCastFrameworkPlugin: NSObject, FlutterPlugin, GCKSessio
         }
     }
     
-    init(channel: FlutterMethodChannel, flutterApi : CastFlutterApi) {
-        self.channel = channel
+    init(flutterApi : CastFlutterApi) {
         self.castContext = GCKCastContext.sharedInstance()
         self.sessionManager = GCKCastContext.sharedInstance().sessionManager
         
diff --git a/lib/src/flutter_cast_framework.dart b/lib/src/flutter_cast_framework.dart
index 15acd1d..e7d3037 100644
--- a/lib/src/flutter_cast_framework.dart
+++ b/lib/src/flutter_cast_framework.dart
@@ -1,13 +1,9 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_cast_framework/cast.dart';
 
 import 'HostApis.dart';
 import 'cast/CastContext.dart';
 
 class FlutterCastFramework {
-  static const MethodChannel _channel =
-      const MethodChannel('flutter_cast_framework');
   static final castApi = CastApi();
 
   /// List of namespaces to listen for custom messages
@@ -17,19 +13,6 @@ class FlutterCastFramework {
 
   static _init() {
     CastFlutterApi.setup(CastFlutterApiImpl());
-    _channel.setMethodCallHandler((MethodCall call) async {
-      String method = call.method;
-      dynamic arguments = call.arguments;
-      debugPrint("Method call on flutter: $method $arguments");
-
-      switch (method) {
-        default:
-          debugPrint("Method not handled: $method");
-          break;
-      }
-
-      return null;
-    });
   }
 
   static CastContext? _castContext;