Bug 966131 - On first sync set firstSync pref to resetClient instead of calling resetClient directly. r=markh
authorChris Karlof <ckarlof@mozilla.com>
Thu, 30 Jan 2014 20:19:48 -0800
changeset 182246 14d515084a878eb2adcc37f6b5db24412a859fd6
parent 182245 d9d7a18c14f367fad80e4223bcad699ff816eab1
child 182247 260266bdf0cace14ed04197e9417405281bafd43
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
bugs966131
milestone29.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 966131 - On first sync set firstSync pref to resetClient instead of calling resetClient directly. r=markh
services/sync/modules/browserid_identity.js
--- a/services/sync/modules/browserid_identity.js
+++ b/services/sync/modules/browserid_identity.js
@@ -131,17 +131,17 @@ this.BrowserIDManager.prototype = {
       }).then(() => {
         return this._fetchSyncKeyBundle();
       }).then(() => {
         this._shouldHaveSyncKeyBundle = true; // and we should actually have one...
         this.whenReadyToAuthenticate.resolve();
         this._log.info("Background fetch for key bundle done");
         if (isInitialSync) {
           this._log.info("Doing initial sync actions");
-          Weave.Service.resetClient();
+          Svc.Prefs.set("firstSync", "resetClient");
           Services.obs.notifyObservers(null, "weave:service:setup-complete", null);
           Weave.Utils.nextTick(Weave.Service.sync, Weave.Service);
         }
       }).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);