From 72d76c796d668f2a0b4fa95b93b8edda546cfbc3 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Thu, 28 Oct 2021 12:39:33 -0700 Subject: [PATCH 1/2] Delete deprecated v1 code --- .../io/flutter/plugins/pathprovider/PathProviderPlugin.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java b/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java index 983f6ff8719f..9036aa425ea5 100644 --- a/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java +++ b/packages/path_provider/path_provider/android/src/main/java/io/flutter/plugins/pathprovider/PathProviderPlugin.java @@ -177,12 +177,6 @@ private void setup(BinaryMessenger messenger, Context context) { channel.setMethodCallHandler(this); } - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - PathProviderPlugin instance = new PathProviderPlugin(); - instance.setup(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { setup(binding.getBinaryMessenger(), binding.getApplicationContext()); From 7a941b5e9e159839cb8b7d53861571cffee819ab Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Thu, 28 Oct 2021 12:57:02 -0700 Subject: [PATCH 2/2] deperecate --- .../AndroidAlarmManagerPlugin.java | 15 ----------- .../FlutterBackgroundExecutor.java | 7 ------ .../androidintent/AndroidIntentPlugin.java | 14 ----------- .../plugins/battery/BatteryPlugin.java | 7 ------ .../plugins/deviceinfo/DeviceInfoPlugin.java | 7 ------ .../com/example/espresso/EspressoPlugin.java | 15 ----------- .../FlutterAndroidLifecyclePlugin.java | 5 ---- .../imagepicker/ImagePickerPlugin.java | 16 ------------ .../imagepicker/ImagePickerPluginTest.java | 8 ------ .../inapppurchase/InAppPurchasePlugin.java | 9 ------- .../InAppPurchasePluginTest.java | 21 ---------------- .../plugins/localauth/LocalAuthPlugin.java | 19 -------------- .../packageinfo/PackageInfoPlugin.java | 7 ------ .../quickactions/QuickActionsPlugin.java | 11 -------- .../plugins/sensors/SensorsPlugin.java | 7 ------ .../io/flutter/plugins/share/SharePlugin.java | 6 ----- .../SharedPreferencesPlugin.java | 6 ----- .../urllauncher/UrlLauncherPlugin.java | 14 ----------- .../videoplayer/VideoPlayerPlugin.java | 11 -------- .../webviewflutter/WebViewFlutterPlugin.java | 25 ------------------- .../WifiInfoFlutterPlugin.java | 7 ------ 21 files changed, 237 deletions(-) diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java index 45f047b5ae68..350eae49caa5 100644 --- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java +++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java @@ -46,21 +46,6 @@ public class AndroidAlarmManagerPlugin implements FlutterPlugin, MethodCallHandl private Object initializationLock = new Object(); private MethodChannel alarmManagerPluginChannel; - /** - * Registers this plugin with an associated Flutter execution context, represented by the given - * {@link io.flutter.plugin.common.PluginRegistry.Registrar}. - * - *

Once this method is executed, an instance of {@code AndroidAlarmManagerPlugin} will be - * connected to, and running against, the associated Flutter execution context. - */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - if (instance == null) { - instance = new AndroidAlarmManagerPlugin(); - } - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); diff --git a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java index 0aa08ed216e0..97fa41afccd2 100644 --- a/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java +++ b/packages/android_alarm_manager/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java @@ -12,7 +12,6 @@ import io.flutter.embedding.engine.FlutterEngine; import io.flutter.embedding.engine.dart.DartExecutor; import io.flutter.embedding.engine.dart.DartExecutor.DartCallback; -import io.flutter.embedding.engine.plugins.shim.ShimPluginRegistry; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.JSONMethodCodec; import io.flutter.plugin.common.MethodCall; @@ -149,12 +148,6 @@ public void startBackgroundIsolate(Context context, long callbackHandle) { DartCallback dartCallback = new DartCallback(assets, appBundlePath, flutterCallback); executor.executeDartCallback(dartCallback); - - // The pluginRegistrantCallback should only be set in the V1 embedding as - // plugin registration is done via reflection in the V2 embedding. - if (pluginRegistrantCallback != null) { - pluginRegistrantCallback.registerWith(new ShimPluginRegistry(backgroundFlutterEngine)); - } } } diff --git a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java index 883d05922874..b847a6b2d873 100644 --- a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java +++ b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java @@ -28,20 +28,6 @@ public AndroidIntentPlugin() { impl = new MethodCallHandlerImpl(sender); } - /** - * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common} - * package. - * - *

Calling this automatically initializes the plugin. However plugins initialized this way - * won't react to changes in activity or context, unlike {@link AndroidIntentPlugin}. - */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - IntentSender sender = new IntentSender(registrar.activity(), registrar.context()); - MethodCallHandlerImpl impl = new MethodCallHandlerImpl(sender); - impl.startListening(registrar.messenger()); - } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { sender.setApplicationContext(binding.getApplicationContext()); diff --git a/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java index 7f2e1efbeede..e42d1f102e35 100644 --- a/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java +++ b/packages/battery/battery/android/src/main/java/io/flutter/plugins/battery/BatteryPlugin.java @@ -30,13 +30,6 @@ public class BatteryPlugin implements MethodCallHandler, StreamHandler, FlutterP private MethodChannel methodChannel; private EventChannel eventChannel; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final BatteryPlugin instance = new BatteryPlugin(); - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); diff --git a/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java b/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java index 756f5e0ce820..4cf9ff80e513 100644 --- a/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java +++ b/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java @@ -19,13 +19,6 @@ public class DeviceInfoPlugin implements FlutterPlugin { static final String TAG = "DeviceInfoPlugin"; MethodChannel channel; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - DeviceInfoPlugin plugin = new DeviceInfoPlugin(); - plugin.setupMethodChannel(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding binding) { setupMethodChannel(binding.getBinaryMessenger(), binding.getApplicationContext()); diff --git a/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java b/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java index 6c8620b3ca14..213e83c22f74 100644 --- a/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java +++ b/packages/espresso/android/src/main/java/com/example/espresso/EspressoPlugin.java @@ -20,21 +20,6 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin channel.setMethodCallHandler(new EspressoPlugin()); } - // This static function is optional and equivalent to onAttachedToEngine. It supports the old - // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting - // plugin registration via this function while apps migrate to use the new Android APIs - // post-flutter-1.12 via https://flutter.dev/go/android-project-migration. - // - // It is encouraged to share logic between onAttachedToEngine and registerWith to keep - // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called - // depending on the user's project. onAttachedToEngine or registerWith must both be defined - // in the same class. - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final MethodChannel channel = new MethodChannel(registrar.messenger(), "espresso"); - channel.setMethodCallHandler(new EspressoPlugin()); - } - @Override public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) { if (call.method.equals("getPlatformVersion")) { diff --git a/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java b/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java index e3b8ea2a6318..b9d0915384e7 100644 --- a/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java +++ b/packages/flutter_plugin_android_lifecycle/android/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle/FlutterAndroidLifecyclePlugin.java @@ -14,11 +14,6 @@ *

DO NOT USE THIS CLASS. */ public class FlutterAndroidLifecyclePlugin implements FlutterPlugin { - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - // no-op - } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { // no-op diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java index 577675bd433a..6ed9588a6529 100644 --- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java +++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java @@ -111,22 +111,6 @@ public void onActivityStopped(Activity activity) { private Lifecycle lifecycle; private LifeCycleObserver observer; - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - if (registrar.activity() == null) { - // If a background flutter view tries to register the plugin, there will be no activity from the registrar, - // we stop the registering process immediately because the ImagePicker requires an activity. - return; - } - Activity activity = registrar.activity(); - Application application = null; - if (registrar.context() != null) { - application = (Application) (registrar.context().getApplicationContext()); - } - ImagePickerPlugin plugin = new ImagePickerPlugin(); - plugin.setup(registrar.messenger(), application, activity, registrar, null); - } - /** * Default constructor for the plugin. * diff --git a/packages/image_picker/image_picker/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java b/packages/image_picker/image_picker/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java index 422b8be74f7c..0e373f6ab544 100644 --- a/packages/image_picker/image_picker/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java +++ b/packages/image_picker/image_picker/android/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java @@ -147,14 +147,6 @@ public void onMethodCall_PickingVideo_WhenSourceIsCamera_InvokesTakeImageWithCam verify(mockImagePickerDelegate).setCameraDevice(eq(CameraDevice.FRONT)); } - @Test - public void onResiter_WhenAcitivityIsNull_ShouldNotCrash() { - when(mockRegistrar.activity()).thenReturn(null); - ImagePickerPlugin.registerWith((mockRegistrar)); - assertTrue( - "No exception thrown when ImagePickerPlugin.registerWith ran with activity = null", true); - } - @Test public void onConstructor_WhenContextTypeIsActivity_ShouldNotCrash() { new ImagePickerPlugin(mockImagePickerDelegate, mockActivity); diff --git a/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java b/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java index b21ab6992608..79f823ea7dff 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java +++ b/packages/in_app_purchase/in_app_purchase_android/android/src/main/java/io/flutter/plugins/inapppurchase/InAppPurchasePlugin.java @@ -55,15 +55,6 @@ static final class MethodNames { private MethodChannel methodChannel; private MethodCallHandlerImpl methodCallHandler; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - InAppPurchasePlugin plugin = new InAppPurchasePlugin(); - registrar.activity().getIntent().putExtra(PROXY_PACKAGE_KEY, PROXY_VALUE); - ((Application) registrar.context().getApplicationContext()) - .registerActivityLifecycleCallbacks(plugin.methodCallHandler); - } - @Override public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding binding) { setupMethodChannel( diff --git a/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java b/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java index ad7633903275..500743939cc8 100644 --- a/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java +++ b/packages/in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase/InAppPurchasePluginTest.java @@ -46,27 +46,6 @@ public void setUp() { when(flutterPluginBinding.getApplicationContext()).thenReturn(context); } - @Test - public void registerWith_doNotCrashWhenRegisterContextIsActivity_V1Embedding() { - when(mockRegistrar.context()).thenReturn(activity); - when(activity.getApplicationContext()).thenReturn(mockApplication); - InAppPurchasePlugin.registerWith(mockRegistrar); - } - - // The PROXY_PACKAGE_KEY value of this test (io.flutter.plugins.inapppurchase) should never be changed. - // In case there's a strong reason to change it, please inform the current code owner of the plugin. - @Test - public void registerWith_proxyIsSet_V1Embedding() { - when(mockRegistrar.context()).thenReturn(activity); - when(activity.getApplicationContext()).thenReturn(mockApplication); - InAppPurchasePlugin.registerWith(mockRegistrar); - // The `PROXY_PACKAGE_KEY` value is hard coded in the plugin code as "io.flutter.plugins.inapppurchase". - // We cannot use `BuildConfig.LIBRARY_PACKAGE_NAME` directly in the plugin code because whether to read BuildConfig.APPLICATION_ID or LIBRARY_PACKAGE_NAME - // depends on the "APP's" Android Gradle plugin version. Newer versions of AGP use LIBRARY_PACKAGE_NAME, whereas older ones use BuildConfig.APPLICATION_ID. - Mockito.verify(mockIntent).putExtra(PROXY_PACKAGE_KEY, "io.flutter.plugins.inapppurchase"); - assertEquals("io.flutter.plugins.inapppurchase", BuildConfig.LIBRARY_PACKAGE_NAME); - } - // The PROXY_PACKAGE_KEY value of this test (io.flutter.plugins.inapppurchase) should never be changed. // In case there's a strong reason to change it, please inform the current code owner of the plugin. @Test diff --git a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java index 7ed9a7ea324d..fcafee09065c 100644 --- a/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java +++ b/packages/local_auth/android/src/main/java/io/flutter/plugins/localauth/LocalAuthPlugin.java @@ -68,25 +68,6 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) { } }; - /** - * Registers a plugin with the v1 embedding api {@code io.flutter.plugin.common}. - * - *

Calling this will register the plugin with the passed registrar. However, plugins - * initialized this way won't react to changes in activity or context. - * - * @param registrar attaches this plugin's {@link - * io.flutter.plugin.common.MethodChannel.MethodCallHandler} to the registrar's {@link - * io.flutter.plugin.common.BinaryMessenger}. - */ - @SuppressWarnings("deprecation") - public static void registerWith(Registrar registrar) { - final MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL_NAME); - final LocalAuthPlugin plugin = new LocalAuthPlugin(); - plugin.activity = registrar.activity(); - channel.setMethodCallHandler(plugin); - registrar.addActivityResultListener(plugin.resultListener); - } - /** * Default constructor for LocalAuthPlugin. * diff --git a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java index 4611f70951f9..b3e2ee895dad 100644 --- a/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info/android/src/main/java/io/flutter/plugins/packageinfo/PackageInfoPlugin.java @@ -22,13 +22,6 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private Context applicationContext; private MethodChannel methodChannel; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final PackageInfoPlugin instance = new PackageInfoPlugin(); - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); diff --git a/packages/quick_actions/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java b/packages/quick_actions/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java index b2f80ad0a271..bb1319fa448b 100644 --- a/packages/quick_actions/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java +++ b/packages/quick_actions/quick_actions/android/src/main/java/io/flutter/plugins/quickactions/QuickActionsPlugin.java @@ -22,17 +22,6 @@ public class QuickActionsPlugin implements FlutterPlugin, ActivityAware, NewInte private MethodChannel channel; private MethodCallHandlerImpl handler; - /** - * Plugin registration. - * - *

Must be called when the application is created. - */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final QuickActionsPlugin plugin = new QuickActionsPlugin(); - plugin.setupChannel(registrar.messenger(), registrar.context(), registrar.activity()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { setupChannel(binding.getBinaryMessenger(), binding.getApplicationContext(), null); diff --git a/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java b/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java index c643edce3401..754d56101260 100644 --- a/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java +++ b/packages/sensors/android/src/main/java/io/flutter/plugins/sensors/SensorsPlugin.java @@ -23,13 +23,6 @@ public class SensorsPlugin implements FlutterPlugin { private EventChannel userAccelChannel; private EventChannel gyroscopeChannel; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - SensorsPlugin plugin = new SensorsPlugin(); - plugin.setupEventChannels(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { final Context context = binding.getApplicationContext(); diff --git a/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java b/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java index c596b8b71555..ffa96490523a 100644 --- a/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java +++ b/packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java @@ -20,12 +20,6 @@ public class SharePlugin implements FlutterPlugin, ActivityAware { private Share share; private MethodChannel methodChannel; - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - SharePlugin plugin = new SharePlugin(); - plugin.setUpChannel(registrar.context(), registrar.activity(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { setUpChannel(binding.getApplicationContext(), null, binding.getBinaryMessenger()); diff --git a/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java b/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java index d41328ee6202..4ca6ec27c76a 100644 --- a/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java +++ b/packages/shared_preferences/shared_preferences/android/src/main/java/io/flutter/plugins/sharedpreferences/SharedPreferencesPlugin.java @@ -15,12 +15,6 @@ public class SharedPreferencesPlugin implements FlutterPlugin { private MethodChannel channel; private MethodCallHandlerImpl handler; - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final SharedPreferencesPlugin plugin = new SharedPreferencesPlugin(); - plugin.setupChannel(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(FlutterPlugin.FlutterPluginBinding binding) { setupChannel(binding.getBinaryMessenger(), binding.getApplicationContext()); diff --git a/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java b/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java index 3c9db478e14b..98f5984442e4 100644 --- a/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java +++ b/packages/url_launcher/url_launcher/android/src/main/java/io/flutter/plugins/urllauncher/UrlLauncherPlugin.java @@ -21,20 +21,6 @@ public final class UrlLauncherPlugin implements FlutterPlugin, ActivityAware { @Nullable private MethodCallHandlerImpl methodCallHandler; @Nullable private UrlLauncher urlLauncher; - /** - * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common} - * package. - * - *

Calling this automatically initializes the plugin. However plugins initialized this way - * won't react to changes in activity or context, unlike {@link UrlLauncherPlugin}. - */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - MethodCallHandlerImpl handler = - new MethodCallHandlerImpl(new UrlLauncher(registrar.context(), registrar.activity())); - handler.startListening(registrar.messenger()); - } - @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { urlLauncher = new UrlLauncher(binding.getApplicationContext(), /*activity=*/ null); diff --git a/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java index d77b45e03d4b..89a212bac757 100644 --- a/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java +++ b/packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java @@ -48,17 +48,6 @@ private VideoPlayerPlugin(io.flutter.plugin.common.PluginRegistry.Registrar regi flutterState.startListening(this, registrar.messenger()); } - /** Registers this with the stable v1 embedding. Will not respond to lifecycle events. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final VideoPlayerPlugin plugin = new VideoPlayerPlugin(registrar); - registrar.addViewDestroyListener( - view -> { - plugin.onDestroy(); - return false; // We are not interested in assuming ownership of the NativeView. - }); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java index 268d35a1e04c..8fed966df746 100644 --- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java +++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java @@ -11,9 +11,6 @@ * Java platform implementation of the webview_flutter plugin. * *

Register this in an add to app scenario to gracefully handle activity and context changes. - * - *

Call {@link #registerWith(Registrar)} to use the stable {@code io.flutter.plugin.common} - * package instead. */ public class WebViewFlutterPlugin implements FlutterPlugin { @@ -23,33 +20,11 @@ public class WebViewFlutterPlugin implements FlutterPlugin { * Add an instance of this to {@link io.flutter.embedding.engine.plugins.PluginRegistry} to * register it. * - *

THIS PLUGIN CODE PATH DEPENDS ON A NEWER VERSION OF FLUTTER THAN THE ONE DEFINED IN THE - * PUBSPEC.YAML. Text input will fail on some Android devices unless this is used with at least - * flutter/flutter@1d4d63ace1f801a022ea9ec737bf8c15395588b9. Use the V1 embedding with {@link - * #registerWith(Registrar)} to use this plugin with older Flutter versions. - * *

Registration should eventually be handled automatically by v2 of the * GeneratedPluginRegistrant. https://github.com/flutter/flutter/issues/42694 */ public WebViewFlutterPlugin() {} - /** - * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common} - * package. - * - *

Calling this automatically initializes the plugin. However plugins initialized this way - * won't react to changes in activity or context, unlike {@link CameraPlugin}. - */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - registrar - .platformViewRegistry() - .registerViewFactory( - "plugins.flutter.io/webview", - new FlutterWebViewFactory(registrar.messenger(), registrar.view())); - new FlutterCookieManager(registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { BinaryMessenger messenger = binding.getBinaryMessenger(); diff --git a/packages/wifi_info_flutter/wifi_info_flutter/android/src/main/java/io/flutter/plugins/wifi_info_flutter/WifiInfoFlutterPlugin.java b/packages/wifi_info_flutter/wifi_info_flutter/android/src/main/java/io/flutter/plugins/wifi_info_flutter/WifiInfoFlutterPlugin.java index 7757688bc9fa..f48aac76fd64 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter/android/src/main/java/io/flutter/plugins/wifi_info_flutter/WifiInfoFlutterPlugin.java +++ b/packages/wifi_info_flutter/wifi_info_flutter/android/src/main/java/io/flutter/plugins/wifi_info_flutter/WifiInfoFlutterPlugin.java @@ -14,13 +14,6 @@ public class WifiInfoFlutterPlugin implements FlutterPlugin { private MethodChannel methodChannel; - /** Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - WifiInfoFlutterPlugin plugin = new WifiInfoFlutterPlugin(); - plugin.setupChannels(registrar.messenger(), registrar.context()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { setupChannels(binding.getBinaryMessenger(), binding.getApplicationContext());