Use a pref for supported Sync server API levels

This commit is contained in:
wolfbeast 2018-06-09 11:45:32 +02:00 • committed by Roy Tam
commit 867de19f7e
3 changed files with 27 additions and 24 deletions

View file

@ -115,6 +115,7 @@ pref("image.mem.decode_bytes_at_a_time", 65536); //larger chunks
// Sync server URL // Sync server URL
pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/"); pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");
pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/"); pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");
pref("services.sync.APILevel", 1); // FSyncMS doesn't support info/configuration
// ============================================================================ // ============================================================================

View file

@ -1067,8 +1067,9 @@ Sync11Service.prototype = {
// Note: returns false if we failed for a reason other than the server not yet // Note: returns false if we failed for a reason other than the server not yet
// supporting the api. // supporting the api.
_fetchServerConfiguration() { _fetchServerConfiguration() {
#if 0 // FSyncMS doesn't support this and it will break auth if left enabled! if (Svc.Prefs.get("APILevel") >= 2) {
// This is similar to _fetchInfo, but with different error handling. // This is similar to _fetchInfo, but with different error handling.
// Only supported by later sync implementations.
let infoURL = this.userBaseURL + "info/configuration"; let infoURL = this.userBaseURL + "info/configuration";
this._log.debug("Fetching server configuration", infoURL); this._log.debug("Fetching server configuration", infoURL);
@ -1093,7 +1094,7 @@ Sync11Service.prototype = {
this.serverConfiguration = configResponse.obj; this.serverConfiguration = configResponse.obj;
} }
this._log.trace("info/configuration for this server", this.serverConfiguration); this._log.trace("info/configuration for this server", this.serverConfiguration);
#endif }
return true; return true;
}, },

View file

@ -12,6 +12,7 @@ pref("services.sync.syncKeyHelpURL", "https://services.mozilla.com/help/synckey"
pref("services.sync.lastversion", "firstrun"); pref("services.sync.lastversion", "firstrun");
pref("services.sync.sendVersionInfo", true); pref("services.sync.sendVersionInfo", true);
pref("services.sync.APILevel", 2);
pref("services.sync.scheduler.eolInterval", 604800); // 1 week pref("services.sync.scheduler.eolInterval", 604800); // 1 week
pref("services.sync.scheduler.idleInterval", 3600); // 1 hour pref("services.sync.scheduler.idleInterval", 3600); // 1 hour