fix(messaging, android): possible fix to a crash occurring on android…

… background executor (#12057)
firebase · Dec 27, 2023 · 3eaae47 · 3eaae47
1 parent d37e834
commit 3eaae47
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/...ava/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingBackgroundExecutor.java b/...ava/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingBackgroundExecutor.java
@@ -13,6 +13,7 @@
 import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.firebase.messaging.RemoteMessage;
+import io.flutter.FlutterInjector;
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.dart.DartExecutor;
@@ -138,6 +139,7 @@ public void startBackgroundIsolate() {
    *       handle does not resolve to a Dart callback then this method does nothing.
    * </ul>
    */
+  @SuppressWarnings("ConstantConditions")
   public void startBackgroundIsolate(long callbackHandle, FlutterShellArgs shellArgs) {
     if (backgroundFlutterEngine != null) {
       Log.e(TAG, "Background isolate already started.");
@@ -177,6 +179,15 @@ public void startBackgroundIsolate(long callbackHandle, FlutterShellArgs shellAr
                       FlutterCallbackInformation.lookupCallbackInformation(callbackHandle);
                   DartExecutor executor = backgroundFlutterEngine.getDartExecutor();
                   initializeMethodChannel(executor);
+
+                  if (appBundlePath == null) {
+                    // appBundlePath is possibly "null", this will allow us to fallback to the alternative lookup method.
+                    // See: https://github.com/firebase/flutterfire/issues/9345#issuecomment-1467601511
+                    Log.w(
+                        TAG,
+                        "startBackgroundIsolate: 'appBundlePath' was null, using alternative lookup method.");
+                    appBundlePath = FlutterInjector.instance().flutterLoader().findAppBundlePath();
+                  }
                   DartCallback dartCallback =
                       new DartCallback(assets, appBundlePath, flutterCallback);