Skip to content

Commit 618a317

Browse files
authored
Cancel callbacks for messaging (#745)
* Cancel callbacks for messaging util::Terminate is referenced counted som when there ar more APIs than messaging active the callbacks will not be canceled until later and still cause a NULL ref due to the FutureData being destroyed now. * Cancel callback earlier * Update readme
1 parent a219a97 commit 618a317

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

messaging/src/android/cpp/messaging.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ void Terminate() {
677677
}
678678
internal::UnregisterTerminateOnDefaultAppDestroy();
679679
JNIEnv* env = g_app->GetJNIEnv();
680+
util::CancelCallbacks(env, kApiIdentifier);
680681
// Dereference the app.
681682
{
682683
MutexLock lock(g_app_mutex);

release_build_files/readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,8 @@ code.
577577
([#737](https://github.com/firebase/firebase-cpp-sdk/issues/737))
578578
- Messaging (Android): Fixed crash during termination.
579579
([#739](https://github.com/firebase/firebase-cpp-sdk/pull/739))
580+
([#745](https://github.com/firebase/firebase-cpp-sdk/pull/745))
581+
580582

581583
### 8.7.0
582584
- Changes

0 commit comments

Comments
 (0)