From 5d7a7fc2ec50a2e655291faf1f154102ac3fc7a8 Mon Sep 17 00:00:00 2001 From: Tobias Barendt Date: Thu, 25 Nov 2021 12:51:26 +0000 Subject: [PATCH 1/2] Messaging crash during initialization --- messaging/src/android/cpp/messaging.cc | 4 ++-- release_build_files/readme.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/messaging/src/android/cpp/messaging.cc b/messaging/src/android/cpp/messaging.cc index 0f3a8e04e2..047c4e8591 100644 --- a/messaging/src/android/cpp/messaging.cc +++ b/messaging/src/android/cpp/messaging.cc @@ -630,6 +630,8 @@ InitResult Initialize(const ::firebase::App& app, Listener* listener, pthread_create(&g_poll_thread, nullptr, MessageProcessingThread, nullptr); FIREBASE_ASSERT(result == 0); + FutureData::Create(); + if (g_registration_token_request_state != kRegistrationTokenRequestStateNone) { // Calling this again, now that we're initialized. @@ -647,8 +649,6 @@ InitResult Initialize(const ::firebase::App& app, Listener* listener, kDeliveryMetricsExportToBigQueryEnable); } - FutureData::Create(); - // Supposedly App creation also creates a registration token, but this seems // to happen before the C++ listeners are able to capture it. // So this may seem redundant but at least both are respecting the same flag diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 97cb0377c9..9388bc83b0 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -578,6 +578,7 @@ code. - Messaging (Android): Fixed crash during termination. ([#739](https://github.com/firebase/firebase-cpp-sdk/pull/739)) ([#745](https://github.com/firebase/firebase-cpp-sdk/pull/745)) + - Messaging (Android): Fixed crash during initialization. ### 8.7.0 From d80247aa36b4e21d3779e7f76438190a77d3e8c9 Mon Sep 17 00:00:00 2001 From: Tobias Barendt Date: Thu, 25 Nov 2021 13:11:30 +0000 Subject: [PATCH 2/2] Update readme --- release_build_files/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 9388bc83b0..6f173209ad 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -579,6 +579,7 @@ code. ([#739](https://github.com/firebase/firebase-cpp-sdk/pull/739)) ([#745](https://github.com/firebase/firebase-cpp-sdk/pull/745)) - Messaging (Android): Fixed crash during initialization. + ([#760](https://github.com/firebase/firebase-cpp-sdk/pull/760)) ### 8.7.0