mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix automatic syncing when no legacy password

Browse source
This commit is contained in:
Dan Stillman 2016-09-21 00:46:28 -04:00
parent dc0bb68f04
commit 6139f7045e
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -54,6 +54,20 @@ Zotero.Sync.Data.Local = {
}),
/**
* Check for an API key or a legacy username/password (which may or may not be valid)
*/
hasCredentials: function () {
var login = this._getAPIKeyLoginInfo();
if (login) {
return true;
}
// If no API key, check for legacy login
var username = Zotero.Prefs.get('sync.server.username');
return username && !!this.getLegacyPassword(username)
},
setAPIKey: function (apiKey) {
var loginManager = Components.classes["@mozilla.org/login-manager;1"]
.getService(Components.interfaces.nsILoginManager);

4
chrome/content/zotero/xpcom/sync/syncRunner.js
View file

@ -35,9 +35,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
Zotero.defineProperty(this, 'enabled', {
get: () => {
if (_apiKey) return true;
var username = Zotero.Prefs.get('sync.server.username');
return username && Zotero.Sync.Data.Local.getLegacyPassword(username);
return _apiKey || Zotero.Sync.Data.Local.hasCredentials();
}
});
Zotero.defineProperty(this, 'syncInProgress', { get: () => _syncInProgress });