diff options
Diffstat (limited to 'services/sync/Weave.js')
| -rw-r--r-- | services/sync/Weave.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/services/sync/Weave.js b/services/sync/Weave.js index de131d08a..0e8d2fe31 100644 --- a/services/sync/Weave.js +++ b/services/sync/Weave.js @@ -96,11 +96,14 @@ WeaveService.prototype = { * Whether Firefox Accounts is enabled. * * @return bool + * + * This function is currently always returning false because we don't support + * the use of FxA/Sync-1.5 but do want to keep the code "just in case". */ get fxAccountsEnabled() { -#ifdef MC_PALEMOON + // Early exit: FxA not supported. return false; -#else +/* -- commented out to prevent unreachable code warning -- try { // Old sync guarantees '@' will never appear in the username while FxA // uses the FxA email address - so '@' is the flag we use. @@ -109,7 +112,7 @@ WeaveService.prototype = { } catch (_) { return true; // No username == only allow FxA to be configured. } -#endif +*/ }, /** @@ -123,7 +126,8 @@ WeaveService.prototype = { */ get enabled() { let prefs = Services.prefs.getBranch(SYNC_PREFS_BRANCH); - return prefs.prefHasUserValue("username"); + return prefs.prefHasUserValue("username") && + prefs.prefHasUserValue("clusterURL"); }, observe: function (subject, topic, data) { |