Skip to content

Store registered context for sync task unregistrations #6752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2025
Merged

Store registered context for sync task unregistrations #6752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6750b7
Store registered context for sync task unregistrations
welishr Mar 10, 2025
678ad02
Merge branch 'main' into messaging/fm_sync_task_fix
welishr Mar 10, 2025
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
2 changes: 2 additions & 0 deletions firebase-messaging/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Unreleased
* [changed] Bug fix in SyncTask to always unregister the receiver on the same
context on which it was registered.


# 24.1.0
Expand Down
10 changes: 8 additions & 2 deletions firebase-messaging/src/main/java/com/google/firebase/messaging/SyncTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ boolean isDeviceConnected() {
static class ConnectivityChangeReceiver extends BroadcastReceiver {

@Nullable private SyncTask task; // task is set to null after it has been fired.
@Nullable private Context receiverContext;

public ConnectivityChangeReceiver(SyncTask task) {
this.task = task;
Expand All @@ -171,7 +172,10 @@ public void registerReceiver() {
Log.d(TAG, "Connectivity change received registered");
}
IntentFilter intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
task.getContext().registerReceiver(this, intentFilter);
if (task != null) {
receiverContext = task.getContext();
receiverContext.registerReceiver(this, intentFilter);
}
}

@Override
Expand All @@ -191,7 +195,9 @@ public void onReceive(Context context, Intent intent) {
Log.d(TAG, "Connectivity changed. Starting background sync.");
}
task.firebaseMessaging.enqueueTaskWithDelaySeconds(task, 0);
task.getContext().unregisterReceiver(this);
if (receiverContext != null) {
receiverContext.unregisterReceiver(this);
}
task = null;
}
}
Expand Down
Loading