Skip to content

fix(messaging, android): use only one FlutterLoader instance #12845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
russellwheatley merged 2 commits into from
May 31, 2024
Merged

fix(messaging, android): use only one FlutterLoader instance #12845

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4be5882
fix(messaging, android): use only one `FlutterLoader` instance
russellwheatley May 29, 2024
1fb28cf
Merge branch 'master' into messaging-9964
russellwheatley May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ava/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingBackgroundExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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;
Expand All @@ -30,7 +31,6 @@
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;

/**
* An background execution abstraction which handles initializing a background isolate running a
* callback dispatcher, used to invoke Dart callbacks while backgrounded.
Expand Down Expand Up @@ -149,7 +149,7 @@ public void startBackgroundIsolate(long callbackHandle, FlutterShellArgs shellAr
return;
}

FlutterLoader loader = new FlutterLoader();
FlutterLoader loader = FlutterInjector.instance().flutterLoader();
Handler mainHandler = new Handler(Looper.getMainLooper());
Runnable myRunnable =
() -> {
Expand Down