6 files changed, 96 insertions, 53 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index e1c2a2d4f..5cd8bdb36 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -251,7 +251,10 @@ export default @observer class EditSettingsForm extends Component {
 
             <Toggle field={form.$('hibernate')} />
             {hibernationEnabled && (
-              <Select field={form.$('hibernationStrategy')} />
+              <>
+                <Select field={form.$('hibernationStrategy')} />
+                <Toggle field={form.$('hibernateOnStartup')} />
+              </>
             )}
             <p
               className="settings__message"
diff --git a/src/config.js b/src/config.js
index 45b840b0a..2467ab706 100644
--- a/src/config.js
+++ b/src/config.js
@@ -118,6 +118,7 @@ export const DEFAULT_APP_SETTINGS = {
   scheduledDNDStart: '17:00',
   scheduledDNDEnd: '09:00',
   hibernate: false,
+  hibernateOnStartup: true,
   hibernationStrategy: 300,
   inactivityLock: 0,
   automaticUpdates: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 74ec1909e..f6c2d4360 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -70,6 +70,10 @@ const messages = defineMessages({
     id: 'settings.app.form.hibernate',
     defaultMessage: '!!!Enable service hibernation',
   },
+  hibernateOnStartup: {
+    id: 'settings.app.form.hibernateOnStartup',
+    defaultMessage: '!!!Keep services in hibernation on startup',
+  },
   hibernationStrategy: {
     id: 'settings.app.form.hibernationStrategy',
     defaultMessage: '!!!Hibernation strategy',
@@ -208,6 +212,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
         sentry: settingsData.sentry,
         hibernate: settingsData.hibernate,
+        hibernateOnStartup: settingsData.hibernateOnStartup,
         hibernationStrategy: settingsData.hibernationStrategy,
         predefinedTodoServer: settingsData.predefinedTodoServer,
         customTodoServer: settingsData.customTodoServer,
@@ -361,6 +366,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.hibernate,
           default: DEFAULT_APP_SETTINGS.hibernate,
         },
+        hibernateOnStartup: {
+          label: intl.formatMessage(messages.hibernateOnStartup),
+          value: settings.all.app.hibernateOnStartup,
+          default: DEFAULT_APP_SETTINGS.hibernateOnStartup,
+        },
         hibernationStrategy: {
           label: intl.formatMessage(messages.hibernationStrategy),
           value: settings.all.app.hibernationStrategy,
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d1b01f884..b9c00fd73 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -291,6 +291,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.enableTodos": "Enable Ferdi Todos",
   "settings.app.form.hibernate": "Enable service hibernation",
+  "settings.app.form.hibernateOnStartup": "Keep services in hibernation on startup",
   "settings.app.form.hibernationStrategy": "Hibernation strategy",
   "settings.app.form.iconSize": "Service icon size",
   "settings.app.form.inactivityLock": "Lock after inactivity",
@@ -369,6 +370,9 @@
   "settings.service.form.customUrlPremiumInfo": "To add self hosted services, you need a Ferdi Premium Supporter Account.",
   "settings.service.form.customUrlUpgradeAccount": "Upgrade your account",
   "settings.service.form.customUrlValidationError": "Could not validate custom {name} server.",
+  "settings.service.form.darkReaderBrightness": "Brightness",
+  "settings.service.form.darkReaderContrast": "Contrast",
+  "settings.service.form.darkReaderSepia": "Sepia",
   "settings.service.form.deleteButton": "Delete service",
   "settings.service.form.disableHibernation": "Disable hibernation",
   "settings.service.form.disableHibernationInfo": "You currently have hibernation enabled but you can disable hibernation for individual services using this option.",
@@ -379,6 +383,7 @@
   "settings.service.form.enableNotification": "Enable notifications",
   "settings.service.form.enableService": "Enable service",
   "settings.service.form.headlineBadges": "Unread message badges",
+  "settings.service.form.headlineDarkReaderSettings": "Dark Reader Settings",
   "settings.service.form.headlineGeneral": "General",
   "settings.service.form.headlineNotifications": "Notifications",
   "settings.service.form.icon": "Custom icon",
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 42199503b..f6afe5246 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -143,15 +143,28 @@
     }
   },
   {
+    "id": "settings.app.form.hibernateOnStartup",
+    "defaultMessage": "!!!Keep services in hibernation on startup",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 73,
+      "column": 22
+    },
+    "end": {
+      "line": 76,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.hibernationStrategy",
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 73,
+      "line": 77,
       "column": 23
     },
     "end": {
-      "line": 76,
+      "line": 80,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 77,
+      "line": 81,
       "column": 24
     },
     "end": {
-      "line": 80,
+      "line": 84,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 81,
+      "line": 85,
       "column": 20
     },
     "end": {
-      "line": 84,
+      "line": 88,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 85,
+      "line": 89,
       "column": 14
     },
     "end": {
-      "line": 88,
+      "line": 92,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 89,
+      "line": 93,
       "column": 16
     },
     "end": {
-      "line": 92,
+      "line": 96,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 93,
+      "line": 97,
       "column": 22
     },
     "end": {
-      "line": 96,
+      "line": 100,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 97,
+      "line": 101,
       "column": 18
     },
     "end": {
-      "line": 100,
+      "line": 104,
       "column": 3
     }
   },
@@ -238,11 +251,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 101,
+      "line": 105,
       "column": 23
     },
     "end": {
-      "line": 104,
+      "line": 108,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 105,
+      "line": 109,
       "column": 21
     },
     "end": {
-      "line": 108,
+      "line": 112,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 109,
+      "line": 113,
       "column": 19
     },
     "end": {
-      "line": 112,
+      "line": 116,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 113,
+      "line": 117,
       "column": 12
     },
     "end": {
-      "line": 116,
+      "line": 120,
       "column": 3
     }
   },
@@ -290,11 +303,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 117,
+      "line": 121,
       "column": 12
     },
     "end": {
-      "line": 120,
+      "line": 124,
       "column": 3
     }
   },
@@ -303,11 +316,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 121,
+      "line": 125,
       "column": 21
     },
     "end": {
-      "line": 124,
+      "line": 128,
       "column": 3
     }
   },
@@ -316,11 +329,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 125,
+      "line": 129,
       "column": 21
     },
     "end": {
-      "line": 128,
+      "line": 132,
       "column": 3
     }
   },
@@ -329,11 +342,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 129,
+      "line": 133,
       "column": 22
     },
     "end": {
-      "line": 132,
+      "line": 136,
       "column": 3
     }
   },
@@ -342,11 +355,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 133,
+      "line": 137,
       "column": 12
     },
     "end": {
-      "line": 136,
+      "line": 140,
       "column": 3
     }
   },
@@ -355,11 +368,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 137,
+      "line": 141,
       "column": 15
     },
     "end": {
-      "line": 140,
+      "line": 144,
       "column": 3
     }
   },
@@ -368,11 +381,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 141,
+      "line": 145,
       "column": 24
     },
     "end": {
-      "line": 144,
+      "line": 148,
       "column": 3
     }
   },
@@ -381,11 +394,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 145,
+      "line": 149,
       "column": 29
     },
     "end": {
-      "line": 148,
+      "line": 152,
       "column": 3
     }
   },
@@ -394,11 +407,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 149,
+      "line": 153,
       "column": 16
     },
     "end": {
-      "line": 152,
+      "line": 156,
       "column": 3
     }
   },
@@ -407,11 +420,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 153,
+      "line": 157,
       "column": 23
     },
     "end": {
-      "line": 156,
+      "line": 160,
       "column": 3
     }
   },
@@ -420,11 +433,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 157,
+      "line": 161,
       "column": 25
     },
     "end": {
-      "line": 160,
+      "line": 164,
       "column": 3
     }
   },
@@ -433,11 +446,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 161,
+      "line": 165,
       "column": 8
     },
     "end": {
-      "line": 164,
+      "line": 168,
       "column": 3
     }
   },
@@ -446,11 +459,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 165,
+      "line": 169,
       "column": 20
     },
     "end": {
-      "line": 168,
+      "line": 172,
       "column": 3
     }
   },
@@ -459,11 +472,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 169,
+      "line": 173,
       "column": 15
     },
     "end": {
-      "line": 172,
+      "line": 176,
       "column": 3
     }
   },
@@ -472,11 +485,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 173,
+      "line": 177,
       "column": 27
     },
     "end": {
-      "line": 176,
+      "line": 180,
       "column": 3
     }
   }
diff --git a/src/models/Service.js b/src/models/Service.js
index dc8febe0b..2f2b4572d 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -139,6 +139,17 @@ export default class Service {
 
     this.recipe = recipe;
 
+    // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
+    const {
+      hibernate,
+      hibernateOnStartup,
+    } = window.ferdi.stores.settings.app;
+    // The service store is probably not loaded yet so we need to use localStorage data to get active service
+    const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
+    if (hibernate && hibernateOnStartup && !isActive) {
+      this.isHibernating = true;
+    }
+
     autorun(() => {
       if (!this.isEnabled) {
         this.webview = null;