Backed out changeset 2bfa24370b7c (bug 965461)
authorWes Kocher <wkocher@mozilla.com>
Wed, 29 Jan 2014 21:04:08 -0800
changeset 181880 bec6cec02f28f188855727a44c58e55a6f1f63ac
parent 181879 2bfa24370b7c90fcbd91af94e044d27b684d796e
child 181881 bf49e44289068c200029888e2f246a0f9732329f
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)
bugs965461
milestone29.0a1
backs out2bfa24370b7c90fcbd91af94e044d27b684d796e
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
Backed out changeset 2bfa24370b7c (bug 965461)
browser/components/preferences/sync.js
services/sync/modules/browserid_identity.js
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -122,20 +122,17 @@ let gSyncPane = {
         // server rejected our credentials (eg, password changed on the server)
         let fxaLoginStatus = document.getElementById("fxaLoginStatus");
         let enginesListDisabled;
         // Not Verfied implies login error state, so check that first.
         if (!data.verified) {
           fxaLoginStatus.selectedIndex = FXA_LOGIN_UNVERIFIED;
           enginesListDisabled = true;
         // So we think we are logged in, so login problems are next.
-        // (Although if the Sync identity manager is still initializing, we
-        // ignore login errors and assume all will eventually be good.)
-        } else if (Weave.Service.identity.readyToAuthenticate &&
-                   Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
+        } else if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
           fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED;
           enginesListDisabled = true;
         // Else we must be golden!
         } else {
           fxaLoginStatus.selectedIndex = FXA_LOGIN_VERIFIED;
           enginesListDisabled = false;
         }
         document.getElementById("fxaEmailAddress1").textContent = data.email;
--- a/services/sync/modules/browserid_identity.js
+++ b/services/sync/modules/browserid_identity.js
@@ -122,17 +122,16 @@ this.BrowserIDManager.prototype = {
 
       this._account = accountData.email;
       // We start a background keybundle fetch...
       this._log.info("Starting background fetch for key bundle.");
       this._fetchSyncKeyBundle().then(() => {
         this._shouldHaveSyncKeyBundle = true; // and we should actually have one...
         this.whenReadyToAuthenticate.resolve();
         this._log.info("Background fetch for key bundle done");
-        Weave.Service.verifyLogin();
       }).then(null, err => {
         this._shouldHaveSyncKeyBundle = true; // but we probably don't have one...
         this.whenReadyToAuthenticate.reject(err);
         // report what failed...
         this._log.error("Background fetch for key bundle failed: " + err);
         throw err;
       });
       // and we are done - the fetch continues on in the background...