Merge branch 'master' into master

ksmohamed · Dec 17, 2024 · 4f885e5 · 4f885e5
2 parents c87fe23 + 525840e
commit 4f885e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 8.1.6
 ### Android
 Fix [#1647](https://github.com/miguelpruivo/flutter_file_picker/issues/1647)
+Fix [#1643](https://github.com/miguelpruivo/flutter_file_picker/issues/1643)
 
 
 ## 8.1.5

diff --git a/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java b/android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerPlugin.java
@@ -256,16 +256,11 @@ public void onCancel(final Object arguments) {
         });
         this.observer = new LifeCycleObserver(activity);
 
-        if (registrar != null) {
-            // V1 embedding setup for activity listeners.
-            application.registerActivityLifecycleCallbacks(this.observer);
-            registrar.addActivityResultListener(this.delegate);
-        } else {
-            // V2 embedding setup for activity listeners.
-            activityBinding.addActivityResultListener(this.delegate);
-            this.lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(activityBinding);
-            this.lifecycle.addObserver(this.observer);
-        }
+        // V2 embedding setup for activity listeners.
+        activityBinding.addActivityResultListener(this.delegate);
+        this.lifecycle = FlutterLifecycleAdapter.getActivityLifecycle(activityBinding);
+        this.lifecycle.addObserver(this.observer);
+
     }
 
     private void tearDown() {