Bug 978876 - Part 3: Mark engines as declined after making a datatype election. r=markh, a=sledru
authorRichard Newman <rnewman@mozilla.com>
Thu, 13 Mar 2014 16:37:26 -0700
changeset 183419 9ddefe5e8915c2b4d300b9d707a54d03be1f4b76
parent 183418 20d7784290825d90cdd1d5d80ac21461a9be6b5e
child 183420 f1f617d5c5ea92df023a7c272dad790bcd6705cb
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh, sledru
bugs978876
milestone29.0a2
Bug 978876 - Part 3: Mark engines as declined after making a datatype election. r=markh, a=sledru
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(() => {