diff options
author | kytwb <412895+kytwb@users.noreply.github.com> | 2021-07-23 10:04:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 11:04:43 +0200 |
commit | 012e55ebf87559f2d782e5400fb885df8b80a445 (patch) | |
tree | 1966e58defe2bcd9541ca9a3f4db67a95a6b4249 /src/containers/layout | |
parent | Removed references to 'premium' i18n keys that are no longer used. (diff) | |
download | ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.gz ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.zst ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.zip |
Fix hibernation mode (#1486)
* Use hibernation strategy from settings instead of hardcoded 5 minutes
* Fix conditions with isHibernationEnabled, previously disableHibernation
* Make service hibernation obey global setting
Also refactors hibernation to move some hibernation enablement logic
into the Service model
* Remove global hibernation enable switch
Implements option 4 from
https://github.com/getferdi/ferdi/pull/1486#issuecomment-860290992
according to
https://github.com/getferdi/ferdi/pull/1486#issuecomment-876558694
* Implements #865 : Add 'hibernate service' and 'wake up service' in the sidebar context menu.
* Removed 'hibernationEnabled' check on main settings screen
Since this is an (imo) incongruous behavior for the first time user.
They will see a message, but with no ability to choose the hibernation strategy.
* Autogenerated files from conflict fixes
Co-authored-by: Kristóf Marussy <kristof@marussy.com>
Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 9cdb20727..21be9d9d1 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -56,6 +56,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
56 | toggleAudio, | 56 | toggleAudio, |
57 | deleteService, | 57 | deleteService, |
58 | updateService, | 58 | updateService, |
59 | hibernate, | ||
60 | awake, | ||
59 | } = this.props.actions.service; | 61 | } = this.props.actions.service; |
60 | 62 | ||
61 | const { hide } = this.props.actions.news; | 63 | const { hide } = this.props.actions.news; |
@@ -109,6 +111,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
109 | toggleAudio={toggleAudio} | 111 | toggleAudio={toggleAudio} |
110 | deleteService={deleteService} | 112 | deleteService={deleteService} |
111 | updateService={updateService} | 113 | updateService={updateService} |
114 | hibernateService={hibernate} | ||
115 | wakeUpService={awake} | ||
112 | toggleMuteApp={toggleMuteApp} | 116 | toggleMuteApp={toggleMuteApp} |
113 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} | 117 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} |
114 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} | 118 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} |