diff --git a/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt b/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt index ec8c868b..68a4b7c8 100644 --- a/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt +++ b/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt @@ -11,10 +11,10 @@ import com.google.common.util.concurrent.ListenableFuture import io.flutter.embedding.engine.FlutterEngine import io.flutter.embedding.engine.dart.DartExecutor import io.flutter.embedding.engine.loader.FlutterLoader -import io.flutter.embedding.engine.plugins.shim.ShimPluginRegistry import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel import io.flutter.view.FlutterCallbackInformation +import io.flutter.plugins.GeneratedPluginRegistrant import java.util.Random /*** @@ -95,7 +95,8 @@ class BackgroundWorker( } // Backwards compatibility with v1. We register all the user's plugins. - WorkmanagerPlugin.pluginRegistryCallback?.registerWith(ShimPluginRegistry(engine!!)) + // WorkmanagerPlugin.pluginRegistryCallback?.registerWith(ShimPluginRegistry(engine!!)) + GeneratedPluginRegistrant.registerWith(engine) engine?.let { engine -> backgroundChannel = MethodChannel(engine.dartExecutor, BACKGROUND_CHANNEL_NAME) diff --git a/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt b/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt index eacaf04c..ca28a9c8 100644 --- a/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt +++ b/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt @@ -30,24 +30,4 @@ class WorkmanagerPlugin : FlutterPlugin { methodChannel = null workmanagerCallHandler = null } - - companion object { - var pluginRegistryCallback: PluginRegistry.PluginRegistrantCallback? = null - - @JvmStatic - fun registerWith(registrar: PluginRegistry.Registrar) { - val plugin = WorkmanagerPlugin() - plugin.onAttachedToEngine(registrar.context(), registrar.messenger()) - registrar.addViewDestroyListener { - plugin.onDetachedFromEngine() - false - } - } - - @Deprecated(message = "Use the Android v2 embedding method.") - @JvmStatic - fun setPluginRegistrantCallback(pluginRegistryCallback: PluginRegistry.PluginRegistrantCallback) { - Companion.pluginRegistryCallback = pluginRegistryCallback - } - } }