Bug 978876 - Part 3: mark engines as declined after making a datatype election. r=markh
authorRichard Newman <rnewman@mozilla.com>
Thu, 13 Mar 2014 16:37:26 -0700
changeset 191751 8b53fb541235f1d741dd7f9ec46a07302ab18e22
parent 191750 1767b08fd43a2ddbf4ad0ca95cc7d7f4741225d8
child 191752 7d63f2bf9042804952f88f16f7f8c1bb966fde66
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs978876
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 978876 - Part 3: mark engines as declined after making a datatype election. r=markh
services/sync/modules/browserid_identity.js
--- a/services/sync/modules/browserid_identity.js
+++ b/services/sync/modules/browserid_identity.js
@@ -204,16 +204,19 @@ this.BrowserIDManager.prototype = {
       this._log.info("Waiting for user to be verified.");
       this._fxaService.whenVerified(accountData).then(accountData => {
         this._updateSignedInUser(accountData);
         this._log.info("Starting fetch for key bundle.");
         if (this.needsCustomization) {
           let data = this.offerSyncOptions();
           if (data.accepted) {
             Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION);
+
+            // Mark any non-selected engines as declined.
+            Weave.Service.engineManager.declineDisabled();
           } else {
             // Log out if the user canceled the dialog.
             return this._fxaService.signOut();
           }
         }
       }).then(() => {
         return this._fetchSyncKeyBundle();
       }).then(() => {