Sync engines in case of a explicit sync (#2226)

keianhzo · MortimerGoro · commit e0b1ebdf82ad · 2019-11-12T21:07:58.000+01:00
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/FxAAccountOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/FxAAccountOptionsView.java
@@ -191,7 +191,12 @@ private void updateProfile(Profile profile) {
     }
 
     private void sync(View view) {
-        mAccounts.syncNowAsync(SyncReason.User.INSTANCE, false);
+        if (mBinding.bookmarksSyncSwitch.isChecked() != mInitialBookmarksState ||
+                mBinding.historySyncSwitch.isChecked() != mInitialHistoryState) {
+            mAccounts.syncNowAsync(SyncReason.EngineChange.INSTANCE, false);
+        } else {
+            mAccounts.syncNowAsync(SyncReason.User.INSTANCE, false);
+        }
     }
 
     private AccountObserver mAccountListener = new AccountObserver() {

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,12 @@ private void updateProfile(Profile profile) {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`private void sync(View view) {`
`194`		`- mAccounts.syncNowAsync(SyncReason.User.INSTANCE, false);`
	`194`	`+ if (mBinding.bookmarksSyncSwitch.isChecked() != mInitialBookmarksState \|\|`
	`195`	`+ mBinding.historySyncSwitch.isChecked() != mInitialHistoryState) {`
	`196`	`+ mAccounts.syncNowAsync(SyncReason.EngineChange.INSTANCE, false);`
	`197`	`+ } else {`
	`198`	`+ mAccounts.syncNowAsync(SyncReason.User.INSTANCE, false);`
	`199`	`+ }`
`195`	`200`	`}`
`196`	`201`
`197`	`202`	`private AccountObserver mAccountListener = new AccountObserver() {`