open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't stop the sync if the first sync is not triggered by the user

Browse Source
This commit is contained in:
eight 2019-10-12 18:15:15 +08:00
parent 6ef85820f1
commit 785dcfb619
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
background/sync.js
View File

@ -137,7 +137,7 @@ const sync = (() => {
msg.broadcastExtension({method: 'syncStatusUpdate', status}); msg.broadcastExtension({method: 'syncStatusUpdate', status});
} }
function start(name) { function start(name, fromPref = false) {
if (currentDrive) { if (currentDrive) {
return Promise.resolve(); return Promise.resolve();
} }
@ -146,25 +146,29 @@ const sync = (() => {
status.state = 'connecting'; status.state = 'connecting';
status.currentDriveName = currentDrive.name; status.currentDriveName = currentDrive.name;
emitStatusChange(); emitStatusChange();
return tokenManager.getToken(name) return withFinally(
tokenManager.getToken(name)
.catch(err => { .catch(err => {
if (/Authorization page could not be loaded/i.test(err.message)) { if (/Authorization page could not be loaded/i.test(err.message)) {
// FIXME: Chrome always fail at the first login so we try again // FIXME: Chrome always fails at the first login so we try again
return tokenManager.getToken(name); return tokenManager.getToken(name);
} }
throw err; throw err;
}) })
.catch(handle401Error) .catch(handle401Error)
.then(() => syncNow()) .then(() => syncNow()),
.then(() => { err => {
// FIXME: should we move this logic to options.js?
if (err && !fromPref) {
console.error(err);
return stop();
}
prefs.set('sync.enabled', name); prefs.set('sync.enabled', name);
chrome.alarms.create('syncNow', {periodInMinutes: SYNC_INTERVAL}); chrome.alarms.create('syncNow', {periodInMinutes: SYNC_INTERVAL});
status.state = 'connected'; status.state = 'connected';
emitStatusChange(); emitStatusChange();
}, err => { }
console.error(err); );
return stop();
});
} }
function getDrive(name) { function getDrive(name) {
@ -173,8 +177,6 @@ const sync = (() => {
getAccessToken: () => tokenManager.getToken(name) getAccessToken: () => tokenManager.getToken(name)
}); });
} }
throw new Error(`unknown cloud name: ${name}`); throw new Error(`unknown cloud name: ${name}`);
} }