[image_picker] fix crash when aar from 'flutter build aar'

packages/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.1+7
+
+* Android: Fix ImagePickerPlugin#onCreate casting context which causes exception.
+
 ## 0.6.1+6
 
 * Define clang module for iOS

packages/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/ImagePickerPlugin.java

@@ -81,18 +81,25 @@ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
 
           @Override
           public void onActivityDestroyed(Activity activity) {
-            if (activity == registrar.activity()) {
-              ((Application) registrar.context()).unregisterActivityLifecycleCallbacks(this);
+            if (activity == registrar.activity()
+                && registrar.activity().getApplicationContext() != null) {
+              ((Application) registrar.activity().getApplicationContext())
+                  .unregisterActivityLifecycleCallbacks(
+                      this); // Use getApplicationContext() to avoid casting failures
             }
           }
 
           @Override
           public void onActivityStopped(Activity activity) {}
         };
 
-    if (this.registrar != null) {
-      ((Application) this.registrar.context())
-          .registerActivityLifecycleCallbacks(this.activityLifecycleCallbacks);
+    if (this.registrar != null
+        && this.registrar.context() != null
+        && this.registrar.context().getApplicationContext() != null) {
+      ((Application) this.registrar.context().getApplicationContext())
+          .registerActivityLifecycleCallbacks(
+              this
+                  .activityLifecycleCallbacks); // Use getApplicationContext() to avoid casting failures.
     }
   }
 

packages/image_picker/example/android/app/src/test/java/io/flutter/plugins/imagepicker/ImagePickerPluginTest.java

@@ -109,6 +109,14 @@ public void onResiter_WhenAcitivityIsNull_ShouldNotCrash() {
         "No exception thrown when ImagePickerPlugin.registerWith ran with activity = null", true);
   }
 
+  @Test
+  public void onConstructor_WhenContextTypeIsActivity_ShouldNotCrash() {
+    when(mockRegistrar.context()).thenReturn(mockActivity);
+    new ImagePickerPlugin(mockRegistrar, mockImagePickerDelegate);
+    assertTrue(
+        "No exception thrown when ImagePickerPlugin() ran with context instanceof Activity", true);
+  }
+
   private MethodCall buildMethodCall(final int source) {
     final Map<String, Object> arguments = new HashMap<>();
     arguments.put("source", source);

packages/image_picker/pubspec.yaml

@@ -5,7 +5,7 @@ authors:
   - Flutter Team <[email protected]>
   - Rhodes Davis Jr. <[email protected]>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.1+6
+version: 0.6.1+7
 
 flutter:
   plugin: