Skip to content

Commit 4462002

Browse files
authored
Messaging crash during initialization (#760)
* Messaging crash during initialization * Update readme
1 parent 4b090f4 commit 4462002

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

messaging/src/android/cpp/messaging.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,8 @@ InitResult Initialize(const ::firebase::App& app, Listener* listener,
630630
pthread_create(&g_poll_thread, nullptr, MessageProcessingThread, nullptr);
631631
FIREBASE_ASSERT(result == 0);
632632

633+
FutureData::Create();
634+
633635
if (g_registration_token_request_state !=
634636
kRegistrationTokenRequestStateNone) {
635637
// Calling this again, now that we're initialized.
@@ -647,8 +649,6 @@ InitResult Initialize(const ::firebase::App& app, Listener* listener,
647649
kDeliveryMetricsExportToBigQueryEnable);
648650
}
649651

650-
FutureData::Create();
651-
652652
// Supposedly App creation also creates a registration token, but this seems
653653
// to happen before the C++ listeners are able to capture it.
654654
// So this may seem redundant but at least both are respecting the same flag

release_build_files/readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,8 @@ code.
578578
- Messaging (Android): Fixed crash during termination.
579579
([#739](https://github.com/firebase/firebase-cpp-sdk/pull/739))
580580
([#745](https://github.com/firebase/firebase-cpp-sdk/pull/745))
581+
- Messaging (Android): Fixed crash during initialization.
582+
([#760](https://github.com/firebase/firebase-cpp-sdk/pull/760))
581583

582584

583585
### 8.7.0

0 commit comments

Comments
 (0)