wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 554427 - Move syncID from clients.js to service.js [r=mconnor]

Browse Source 
Switch from Clients.syncID to this.syncID for service.js. Don't special case resetSyncID and just use = "".
This commit is contained in:
Edward Lee 2010-03-25 16:52:45 +00:00
parent e73dbf06b9
commit 15e1f02e87
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/sync/modules/engines/clients.js
View File

@ -87,18 +87,6 @@ ClientEngine.prototype = {
return Svc.Prefs.get("client.GUID"); return Svc.Prefs.get("client.GUID");
}, },
get syncID() {
if (!Svc.Prefs.get("client.syncID"))
Svc.Prefs.set("client.syncID", Utils.makeGUID());
return Svc.Prefs.get("client.syncID");
},
set syncID(value) {
Svc.Prefs.set("client.syncID", value);
},
resetSyncID: function ClientEngine_resetSyncID() {
Svc.Prefs.reset("client.syncID");
},
get clientName() { get clientName() {
if (Svc.Prefs.isSet("client.name")) if (Svc.Prefs.isSet("client.name"))
return Svc.Prefs.get("client.name"); return Svc.Prefs.get("client.name");

22
services/sync/modules/service.js
View File

@ -165,6 +165,15 @@ WeaveSvc.prototype = {
return user + "1/"; return user + "1/";
}, },
get syncID() {
// Generate a random syncID id we don't have one
let syncID = Svc.Prefs.get("client.syncID", "");
return syncID == "" ? this.syncID = Utils.makeGUID() : syncID;
},
set syncID(value) {
Svc.Prefs.set("client.syncID", value);
},
get isLoggedIn() { return this._loggedIn; }, get isLoggedIn() { return this._loggedIn; },
get keyGenEnabled() { return this._keyGenEnabled; }, get keyGenEnabled() { return this._keyGenEnabled; },
@ -865,10 +874,11 @@ WeaveSvc.prototype = {
Status.sync = VERSION_OUT_OF_DATE; Status.sync = VERSION_OUT_OF_DATE;
this._log.warn("Upgrade required to access newer storage version."); this._log.warn("Upgrade required to access newer storage version.");
return false; return false;
} else if (meta.payload.syncID != Clients.syncID) { }
else if (meta.payload.syncID != this.syncID) {
this.resetService(); this.resetService();
Clients.syncID = meta.payload.syncID; this.syncID = meta.payload.syncID;
this._log.debug("Clear cached values and take syncId: " + Clients.syncID); this._log.debug("Clear cached values and take syncId: " + this.syncID);
// XXX Bug 531005 Wait long enough to allow potentially another concurrent // XXX Bug 531005 Wait long enough to allow potentially another concurrent
// sync to finish generating the keypair and uploading them // sync to finish generating the keypair and uploading them
@ -1237,7 +1247,7 @@ WeaveSvc.prototype = {
this.resetClient(); this.resetClient();
let meta = new WBORecord(this.metaURL); let meta = new WBORecord(this.metaURL);
meta.payload.syncID = Clients.syncID; meta.payload.syncID = this.syncID;
meta.payload.storageVersion = STORAGE_VERSION; meta.payload.storageVersion = STORAGE_VERSION;
this._log.debug("New metadata record: " + JSON.stringify(meta.payload)); this._log.debug("New metadata record: " + JSON.stringify(meta.payload));
@ -1338,7 +1348,7 @@ WeaveSvc.prototype = {
wipeRemote: function WeaveSvc_wipeRemote(engines) wipeRemote: function WeaveSvc_wipeRemote(engines)
this._catch(this._notify("wipe-remote", "", function() { this._catch(this._notify("wipe-remote", "", function() {
// Make sure stuff gets uploaded // Make sure stuff gets uploaded
Clients.resetSyncID(); this.syncID = "";
// Clear out any server data // Clear out any server data
this.wipeServer(engines); this.wipeServer(engines);
@ -1364,7 +1374,7 @@ WeaveSvc.prototype = {
this._log.info("Logs reinitialized for service reset"); this._log.info("Logs reinitialized for service reset");
// Pretend we've never synced to the server and drop cached data // Pretend we've never synced to the server and drop cached data
Clients.resetSyncID(); this.syncID = "";
Svc.Prefs.reset("lastSync"); Svc.Prefs.reset("lastSync");
for each (let cache in [PubKeys, PrivKeys, CryptoMetas, Records]) for each (let cache in [PubKeys, PrivKeys, CryptoMetas, Records])
cache.clearCache(); cache.clearCache();