Merge branch 'release/5.4.0-beta.3' into fix/only-load-workspace-related-services

1 files changed, 26 insertions, 3 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 0398b7533..4a00cb294 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -27,7 +27,9 @@ import { sleep } from '../helpers/async-helpers';
 
 const debug = require('debug')('Franz:AppStore');
 
-const { app, systemPreferences, screen } = remote;
+const {
+  app, systemPreferences, screen, powerMonitor,
+} = remote;
 
 const mainWindow = remote.getCurrentWindow();
 
@@ -55,6 +57,8 @@ export default class AppStore extends Store {
 
   @observable isOnline = navigator.onLine;
 
+  @observable timeSuspensionStart;
+
   @observable timeOfflineStart;
 
   @observable updateStatus = null;
@@ -180,6 +184,27 @@ export default class AppStore extends Store {
       gaPage(pathname);
     });
 
+    powerMonitor.on('suspend', () => {
+      debug('System suspended starting timer');
+
+      this.timeSuspensionStart = moment();
+    });
+
+    powerMonitor.on('resume', () => {
+      debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
+
+      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
+        debug('Reloading services, user info and features');
+
+        this.actions.service.reloadAll();
+
+        this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
+        this.stores.features.featuresRequest.invalidate({ immediately: true });
+
+        statsEvent('resumed-app');
+      }
+    });
+
     statsEvent('app-start');
   }
 
@@ -279,8 +304,6 @@ export default class AppStore extends Store {
     if (isValidExternalURL(url)) {
       shell.openExternal(url);
     }
-
-    gaEvent('External URL', 'open', parsedUrl.host);
   }
 
   @action _checkForUpdates() {