Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 messaging/src/android/cpp/messaging.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions release_build_files/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,8 @@ 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.
([#760](https://github.com/firebase/firebase-cpp-sdk/pull/760))


### 8.7.0
Expand Down