Remove v1 Android embedding in flutter-hms-push

Author: crasowas

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/backgroundmessaging/BackgroundMessagingService.java

@@ -24,8 +24,6 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
-
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -44,11 +42,6 @@ private synchronized void setBackgroundRunner(FlutterBackgroundRunner bgRunner)
         BackgroundMessagingService.backgroundRunner = bgRunner;
     }
 
-    // For Backwards Compatibility with V1 Plugin registration.
-    public static void setPluginRegistrantCallback(final PluginRegistrantCallback callback) {
-        FlutterBackgroundRunner.setPluginRegistrantCallback(callback);
-    }
-
     public static void setUserCallback(final Context context, final long userCallback) {
         FlutterBackgroundRunner.setUserCallback(context, userCallback);
     }

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/backgroundmessaging/FlutterBackgroundRunner.java

@@ -38,13 +38,11 @@
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.dart.DartExecutor.DartCallback;
 import io.flutter.embedding.engine.loader.FlutterLoader;
-import io.flutter.embedding.engine.plugins.shim.ShimPluginRegistry;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
 import io.flutter.view.FlutterCallbackInformation;
 
 import java.util.Arrays;
@@ -60,9 +58,6 @@ public class FlutterBackgroundRunner implements MethodCallHandler {
 
     public static final String USER_CALLBACK_KEY = "push_background_message_callback";
 
-    // Deprecated, Support for backwards compatibility with V1 embedding.
-    private static PluginRegistrantCallback pluginRegistrantCallback;
-
     private final AtomicBoolean isCallbackDispatcherReady = new AtomicBoolean(false);
 
     private MethodChannel bgMethodChannel;
@@ -71,11 +66,6 @@ public class FlutterBackgroundRunner implements MethodCallHandler {
 
     private long bgMessagingCallback;
 
-    // For Backwards Compatibility with V1 Plugin registration.
-    public static void setPluginRegistrantCallback(final PluginRegistrantCallback callback) {
-        pluginRegistrantCallback = callback;
-    }
-
     public static void setCallBackDispatcher(final Context context, final long callbackHandle) {
         final SharedPreferences prefs = context.getSharedPreferences(Core.PREFERENCE_NAME, Context.MODE_PRIVATE);
         prefs.edit().putLong(CALLBACK_DISPATCHER_KEY, callbackHandle).apply();
@@ -128,12 +118,6 @@ public void startBgIsolate(final Context context, final long callbackHandle) {
                     initializeMethodChannel(executor);
                     final DartCallback dartCallback = new DartCallback(assets, appBundlePath, flutterCallbackInfo);
                     executor.executeDartCallback(dartCallback);
-
-                    // For V1 Embedding
-                    if (pluginRegistrantCallback != null) {
-                        pluginRegistrantCallback.registerWith(new ShimPluginRegistry(flutterEngine));
-                    }
-
                 }
             });
         };