diff --git a/flutter/flutter/android/src/main/java/com/arthenica/ffmpegkit/flutter/FFmpegKitFlutterPlugin.java b/flutter/flutter/android/src/main/java/com/arthenica/ffmpegkit/flutter/FFmpegKitFlutterPlugin.java index 479ce82..d394d67 100644 --- a/flutter/flutter/android/src/main/java/com/arthenica/ffmpegkit/flutter/FFmpegKitFlutterPlugin.java +++ b/flutter/flutter/android/src/main/java/com/arthenica/ffmpegkit/flutter/FFmpegKitFlutterPlugin.java @@ -153,17 +153,6 @@ public class FFmpegKitFlutterPlugin implements FlutterPlugin, ActivityAware, Met Log.d(LIBRARY_NAME, String.format("FFmpegKitFlutterPlugin created %s.", this)); } - @SuppressWarnings("deprecation") - public static void registerWith(final io.flutter.plugin.common.PluginRegistry.Registrar registrar) { - final Context context = (registrar.activity() != null) ? registrar.activity() : registrar.context(); - if (context == null) { - Log.w(LIBRARY_NAME, "FFmpegKitFlutterPlugin can not be registered without a context."); - return; - } - FFmpegKitFlutterPlugin plugin = new FFmpegKitFlutterPlugin(); - plugin.init(registrar.messenger(), context, registrar.activity(), registrar, null); - } - protected void registerGlobalCallbacks() { FFmpegKitConfig.enableFFmpegSessionCompleteCallback(this::emitSession); FFmpegKitConfig.enableFFprobeSessionCompleteCallback(this::emitSession); @@ -195,7 +184,7 @@ public class FFmpegKitFlutterPlugin implements FlutterPlugin, ActivityAware, Met @Override public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBinding) { Log.d(LIBRARY_NAME, String.format("FFmpegKitFlutterPlugin %s attached to activity %s.", this, activityPluginBinding.getActivity())); - init(flutterPluginBinding.getBinaryMessenger(), flutterPluginBinding.getApplicationContext(), activityPluginBinding.getActivity(), null, activityPluginBinding); + init(flutterPluginBinding.getBinaryMessenger(), flutterPluginBinding.getApplicationContext(), activityPluginBinding.getActivity(), activityPluginBinding); } @Override @@ -648,7 +637,7 @@ public class FFmpegKitFlutterPlugin implements FlutterPlugin, ActivityAware, Met } @SuppressWarnings("deprecation") - protected void init(final BinaryMessenger messenger, final Context context, final Activity activity, final io.flutter.plugin.common.PluginRegistry.Registrar registrar, final ActivityPluginBinding activityBinding) { + protected void init(final BinaryMessenger messenger, final Context context, final Activity activity, final ActivityPluginBinding activityBinding) { registerGlobalCallbacks(); if (methodChannel == null) { @@ -667,14 +656,9 @@ public class FFmpegKitFlutterPlugin implements FlutterPlugin, ActivityAware, Met this.context = context; this.activity = activity; - - if (registrar != null) { - // V1 embedding setup for activity listeners. - registrar.addActivityResultListener(this); - } else { - // V2 embedding setup for activity listeners. - activityBinding.addActivityResultListener(this); - } + + // V2 embedding setup for activity listeners. + activityBinding.addActivityResultListener(this); Log.d(LIBRARY_NAME, String.format("FFmpegKitFlutterPlugin %s initialised with context %s and activity %s.", this, context, activity)); }