Skip to content

Commit b14b14c

Browse files
committed
fix: initialize Firebase before guarded background handler execution
1 parent ff6471d commit b14b14c

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

lib/bootstrap.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,10 @@ Future<void> _initFirebaseMessaging() async {
233233
Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
234234
final logger = Logger('_firebaseMessagingBackgroundHandler');
235235

236-
runZonedGuarded(
236+
// Ensure Firebase services are initialized before configuring Crashlytics.
237+
await _initFirebaseApp();
238+
239+
await runZonedGuarded(
237240
() => _handleBackgroundMessage(message, logger),
238241
(error, stack) => _recordBackgroundError(error, stack, logger),
239242
);
@@ -254,9 +257,6 @@ void _recordBackgroundError(Object error, StackTrace stack, Logger logger) {
254257

255258
/// Core logic for processing background messages.
256259
Future<void> _handleBackgroundMessage(RemoteMessage message, Logger logger) async {
257-
/// Ensure Firebase services are initialized before configuring Crashlytics.
258-
await _initFirebaseApp();
259-
260260
// Cache remote configuration
261261
final remoteCacheConfigService = await DefaultRemoteCacheConfigService.init();
262262

@@ -277,8 +277,8 @@ Future<void> _handleBackgroundMessage(RemoteMessage message, Logger logger) asyn
277277
_dHandleInspectPush(message.data, true);
278278

279279
if (appPush is PendingCallPush && Platform.isAndroid) {
280-
/// Known issue: [SqliteException] with code 5 (database is locked) may occur
281-
/// due to concurrent database access from multiple isolates.
280+
// Known issue: [SqliteException] with code 5 (database is locked) may occur
281+
// due to concurrent database access from multiple isolates.
282282
final displayName = await _resolveContactDisplayNameWithFallback(appPush, logger);
283283

284284
AndroidCallkeepServices.backgroundPushNotificationBootstrapService.reportNewIncomingCall(

0 commit comments

Comments
 (0)