From 012e55ebf87559f2d782e5400fb885df8b80a445 Mon Sep 17 00:00:00 2001 From: kytwb <412895+kytwb@users.noreply.github.com> Date: Fri, 23 Jul 2021 10:04:43 +0100 Subject: Fix hibernation mode (#1486) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Co-authored-by: Vijay A --- src/containers/layout/AppLayoutContainer.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/containers/layout/AppLayoutContainer.js') 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 toggleAudio, deleteService, updateService, + hibernate, + awake, } = this.props.actions.service; const { hide } = this.props.actions.news; @@ -109,6 +111,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e toggleAudio={toggleAudio} deleteService={deleteService} updateService={updateService} + hibernateService={hibernate} + wakeUpService={awake} toggleMuteApp={toggleMuteApp} toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} -- cgit v1.2.3-70-g09d2