diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-12-12 11:01:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 11:01:48 +0100 |
| commit | bc8a25f5e33700f700b1e07b238bef5dae22f1ad (patch) | |
| tree | c1f1ec816f1a85459d05bd6a4cf4f6170b01c602 /services/sync/modules/status.js | |
| parent | f2d4bd1e395f903355cc157a1de7207e5b22b7fb (diff) | |
| parent | 9697bfa68f32984b196748e388d743dddbe6aa7b (diff) | |
| download | UXP-bc8a25f5e33700f700b1e07b238bef5dae22f1ad.tar UXP-bc8a25f5e33700f700b1e07b238bef5dae22f1ad.tar.gz UXP-bc8a25f5e33700f700b1e07b238bef5dae22f1ad.tar.lz UXP-bc8a25f5e33700f700b1e07b238bef5dae22f1ad.tar.xz UXP-bc8a25f5e33700f700b1e07b238bef5dae22f1ad.zip | |
Merge pull request #898 from MoonchildProductions/Sync-weave
Remove FxA Phase 1
Diffstat (limited to 'services/sync/modules/status.js')
| -rw-r--r-- | services/sync/modules/status.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/sync/modules/status.js b/services/sync/modules/status.js index 100bc7965..a5b8305b4 100644 --- a/services/sync/modules/status.js +++ b/services/sync/modules/status.js @@ -12,7 +12,6 @@ var Cu = Components.utils; Cu.import("resource://services-sync/constants.js"); Cu.import("resource://gre/modules/Log.jsm"); Cu.import("resource://services-sync/identity.js"); -Cu.import("resource://services-sync/browserid_identity.js"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://services-common/async.js"); @@ -28,9 +27,12 @@ this.Status = { let service = Components.classes["@mozilla.org/weave/service;1"] .getService(Components.interfaces.nsISupports) .wrappedJSObject; - let idClass = service.fxAccountsEnabled ? BrowserIDManager : IdentityManager; + let idClass = IdentityManager; this.__authManager = new idClass(); - this.__authManager.initialize(); + // .initialize returns a promise, so we need to spin until it resolves. + let cb = Async.makeSpinningCallback(); + this.__authManager.initialize().then(cb, cb); + cb.wait(); return this.__authManager; }, |