close #227

Author: mymindstorm

src/popup.ts

@@ -63,64 +63,7 @@ async function init() {
         clientTime - localStorage.lastRemindingBackupTime >= 30 ||
         clientTime - localStorage.lastRemindingBackupTime < 0) {
       // backup to cloud
-      if (authenticator.dropboxToken) {
-        chrome.permissions.contains(
-            {origins: ['https://*.dropboxapi.com/*']},
-            async (hasPermission) => {
-              if (hasPermission) {
-                try {
-                  const dropbox = new Dropbox();
-                  const res = await dropbox.upload(authenticator.encryption);
-                  if (res) {
-                    // we have uploaded backup to Dropbox
-                    // no need to remind
-                    localStorage.lastRemindingBackupTime = clientTime;
-                    return;
-                  } else if (localStorage.dropboxRevoked === 'true') {
-                    authenticator.alert(String(authenticator.i18n.token_revoked)
-                                            .replace(/\${service}/, 'Dropbox'));
-                    localStorage.removeItem('dropboxRevoked');
-                  }
-                } catch (error) {
-                  // ignore
-                }
-              }
-              authenticator.alert(authenticator.i18n.remind_backup);
-              localStorage.lastRemindingBackupTime = clientTime;
-            });
-      } else if (authenticator.driveToken) {
-        chrome.permissions.contains(
-            {
-              origins: [
-                'https://www.googleapis.com/*',
-                'https://accounts.google.com/o/oauth2/revoke'
-              ]
-            },
-            async (hasPermission) => {
-              if (hasPermission) {
-                try {
-                  const drive = new Drive();
-                  const res = await drive.upload(authenticator.encryption);
-                  if (res) {
-                    localStorage.lastRemindingBackupTime = clientTime;
-                    return;
-                  } else if (localStorage.driveRevoked === 'true') {
-                    authenticator.alert(
-                        String(authenticator.i18n.token_revoked)
-                            .replace(/\${service}/, 'Google Drive'));
-                    localStorage.removeItem('driveRevoked');
-                  }
-                } catch (error) {
-                  // ignore
-                }
-              }
-              authenticator.alert(authenticator.i18n.remind_backup);
-              localStorage.lastRemindingBackupTime = clientTime;
-            });
-      } else {
-        authenticator.alert(authenticator.i18n.remind_backup);
-        localStorage.lastRemindingBackupTime = clientTime;
-      }
+      authenticator.runScheduledBackup(clientTime);
     }
     return;
   }, 1000);

src/ui/backup.ts

@@ -91,6 +91,69 @@ async function backup(_ui: UI) {
       getBackupToken: (service: string) => {
         chrome.runtime.sendMessage({action: service});
       },
+      runScheduledBackup: (clientTime: number) => {
+        if (_ui.instance.dropboxToken) {
+          chrome.permissions.contains(
+              {origins: ['https://*.dropboxapi.com/*']},
+              async (hasPermission) => {
+                if (hasPermission) {
+                  try {
+                    const dropbox = new Dropbox();
+                    const res = await dropbox.upload(_ui.instance.encryption);
+                    if (res) {
+                      // we have uploaded backup to Dropbox
+                      // no need to remind
+                      localStorage.lastRemindingBackupTime = clientTime;
+                      return;
+                    } else if (localStorage.dropboxRevoked === 'true') {
+                      _ui.instance.alert(
+                          String(_ui.instance.i18n.token_revoked)
+                              .replace(/\${service}/, 'Dropbox'));
+                      localStorage.removeItem('dropboxRevoked');
+                    }
+                  } catch (error) {
+                    // ignore
+                  }
+                }
+                _ui.instance.alert(_ui.instance.i18n.remind_backup);
+                localStorage.lastRemindingBackupTime = clientTime;
+              });
+        }
+        if (_ui.instance.driveToken) {
+          chrome.permissions.contains(
+              {
+                origins: [
+                  'https://www.googleapis.com/*',
+                  'https://accounts.google.com/o/oauth2/revoke'
+                ]
+              },
+              async (hasPermission) => {
+                if (hasPermission) {
+                  try {
+                    const drive = new Drive();
+                    const res = await drive.upload(_ui.instance.encryption);
+                    if (res) {
+                      localStorage.lastRemindingBackupTime = clientTime;
+                      return;
+                    } else if (localStorage.driveRevoked === 'true') {
+                      _ui.instance.alert(
+                          String(_ui.instance.i18n.token_revoked)
+                              .replace(/\${service}/, 'Google Drive'));
+                      localStorage.removeItem('driveRevoked');
+                    }
+                  } catch (error) {
+                    // ignore
+                  }
+                }
+                _ui.instance.alert(_ui.instance.i18n.remind_backup);
+                localStorage.lastRemindingBackupTime = clientTime;
+              });
+        }
+        if (!_ui.instance.driveToken && !_ui.instance.dropboxToken) {
+          _ui.instance.alert(_ui.instance.i18n.remind_backup);
+          localStorage.lastRemindingBackupTime = clientTime;
+        }
+      }
     }
   };