Merge pull request #122 from education/catchUpdaterErrors

Catch Errors on Updater

Author: srinjoym

app/main-process/letsMove.js

@@ -5,7 +5,7 @@ const log = require("electron-log")
 const Store = require("electron-store")
 
 export const moveToApplicationsFolder = () => {
-  if (!app.isInApplicationsFolder() && !isDev && shouldRemindUser()) {
+  if (!app.isInApplicationsFolder() && !isDev && !userOptedOut()) {
     dialog.showMessageBox({
       type: "question",
       buttons: ["Move to Applications", "Do Not Move"],
@@ -26,18 +26,18 @@ export const moveToApplicationsFolder = () => {
 
       if (checkboxChecked) {
         // Don't remind user again
-        setReminder(false)
+        optOutReminder()
       }
     })
   }
 }
 
-const shouldRemindUser = () => {
+const userOptedOut = () => {
   const store = new Store()
-  return !store.get("classroom-assistant-move-to-app-folder")
+  return store.get("classroom-assistant-opt-out-move")
 }
 
-const setReminder = (value) => {
+const optOutReminder = () => {
   const store = new Store()
-  store.set("classroom-assistant-move-to-app-folder", !value)
+  store.set("classroom-assistant-opt-out-move", true)
 }

app/main-process/updater.js

@@ -22,33 +22,38 @@ module.exports = {
   start (app, interval) {
     log.info("starting auto-updater")
     const platform = os.platform() + "_" + os.arch()
-    autoUpdater.setFeedURL(`${UPDATES_SERVER_URL}/update/${platform}/${app.getVersion()}`)
 
-    // Fire callbacks on events for notification purposes
-    autoUpdater.on("error", (err) => {
-      log.error(err)
-    })
+    try {
+      autoUpdater.setFeedURL(`${UPDATES_SERVER_URL}/update/${platform}/${app.getVersion()}`)
 
-    autoUpdater.on("update-downloaded", (releaseNotes, releaseName) => {
-      log.info("Application update downloaded")
+      // Fire callbacks on events for notification purposes
+      autoUpdater.on("error", (err) => {
+        log.error(err)
+      })
+
+      autoUpdater.on("update-downloaded", (releaseNotes, releaseName) => {
+        log.info("Application update downloaded")
 
-      const updateDialogOpts = {
-        type: "info",
-        buttons: ["Restart", "Later"],
-        title: "Application Update",
-        message: "An update for this Classroom Assistant has been downloaded. Please restart the application to apply the updates."
-      }
+        const updateDialogOpts = {
+          type: "info",
+          buttons: ["Restart", "Later"],
+          title: "Application Update",
+          message: "An update for this Classroom Assistant has been downloaded. Please restart the application to apply the updates."
+        }
 
-      dialog.showMessageBox(updateDialogOpts, (response) => {
-        if (response === 0) autoUpdater.quitAndInstall()
+        dialog.showMessageBox(updateDialogOpts, (response) => {
+          if (response === 0) autoUpdater.quitAndInstall()
+        })
       })
-    })
 
-    log.info("checking for updates..")
-    autoUpdater.checkForUpdates()
-    setInterval(() => {
       log.info("checking for updates..")
       autoUpdater.checkForUpdates()
-    }, interval)
+      setInterval(() => {
+        log.info("checking for updates..")
+        autoUpdater.checkForUpdates()
+      }, interval)
+    } catch (err) {
+      log.warn(`Failed to initialize updater ${err}`)
+    }
   }
 }