Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1497977 p6 - Also send a collection_changed push notification when uploading our client record following an fxa device id change. r=nalexander

Browse Source 
Depends on D8611

Differential Revision: https://phabricator.services.mozilla.com/D8612

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Edouard Oger 2018-10-17 18:23:14 +00:00
parent 171423c58a
commit d73808b14d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/android/services/src/main/java/org/mozilla/gecko/sync/stage/SyncClientsEngineStage.java
View File

@ -79,6 +79,7 @@ public class SyncClientsEngineStage extends AbstractSessionManagingSyncStage {
protected volatile boolean shouldWipe;
protected volatile boolean shouldUploadLocalRecord; // Set if, e.g., we received commands or need to refresh our version.
protected volatile boolean shouldNotifyOtherClients = false; // If set, ask the FxA server to notify other clients that the client collection changed.
protected final AtomicInteger uploadAttemptsCount = new AtomicInteger();
protected final List<ClientRecord> modifiedClientsToUpload = new ArrayList<ClientRecord>();
@ -144,11 +145,10 @@ public class SyncClientsEngineStage extends AbstractSessionManagingSyncStage {
// If we successfully downloaded all records but ours was not one of them
// then reset the timestamp.
boolean isFirstLocalClientRecordUpload = false;
if (!localAccountGUIDDownloaded) {
Logger.info(LOG_TAG, "Local client GUID does not exist on the server. Upload timestamp will be reset.");
session.config.persistServerClientRecordTimestamp(0);
isFirstLocalClientRecordUpload = true;
shouldNotifyOtherClients = true;
}
localAccountGUIDDownloaded = false;
@ -184,7 +184,7 @@ public class SyncClientsEngineStage extends AbstractSessionManagingSyncStage {
uploadRemoteRecords();
// We will send a push notification later anyway.
if (!isFirstLocalClientRecordUpload && account != null) {
if (!shouldNotifyOtherClients && account != null) {
// Notify the clients who got their record written
final AndroidFxAccount fxAccount = new AndroidFxAccount(context, account);
notifyClients(fxAccount, devicesToNotify, NOTIFY_TAB_SENT_TTL_SECS, COLLECTION_MODIFIED_REASON_SENDTAB);
@ -193,7 +193,7 @@ public class SyncClientsEngineStage extends AbstractSessionManagingSyncStage {
return;
}
checkAndUpload();
if (isFirstLocalClientRecordUpload && account != null) {
if (shouldNotifyOtherClients && account != null) {
final AndroidFxAccount fxAccount = new AndroidFxAccount(context, account);
notifyAllClients(fxAccount, 0, COLLECTION_MODIFIED_REASON_FIRSTSYNC);
}
@ -585,6 +585,7 @@ public class SyncClientsEngineStage extends AbstractSessionManagingSyncStage {
!getLocalClientVersion().equals(r.version) ||
!getLocalClientProtocols().equals(r.protocols)) {
shouldUploadLocalRecord = true;
shouldNotifyOtherClients = true;
}
processCommands(r.commands);
}