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/components/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/components/layout')
-rw-r--r-- | src/components/layout/Sidebar.js | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 802538eba..9f3cacd38 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -58,6 +58,18 @@ const messages = defineMessages({ | |||
58 | export default @inject('stores', 'actions') @observer class Sidebar extends Component { | 58 | export default @inject('stores', 'actions') @observer class Sidebar extends Component { |
59 | static propTypes = { | 59 | static propTypes = { |
60 | openSettings: PropTypes.func.isRequired, | 60 | openSettings: PropTypes.func.isRequired, |
61 | closeSettings: PropTypes.func.isRequired, | ||
62 | setActive: PropTypes.func.isRequired, | ||
63 | reorder: PropTypes.func.isRequired, | ||
64 | reload: PropTypes.func.isRequired, | ||
65 | toggleNotifications: PropTypes.func.isRequired, | ||
66 | toggleAudio: PropTypes.func.isRequired, | ||
67 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | ||
68 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | ||
69 | deleteService: PropTypes.func.isRequired, | ||
70 | updateService: PropTypes.func.isRequired, | ||
71 | hibernateService: PropTypes.func.isRequired, | ||
72 | wakeUpService: PropTypes.func.isRequired, | ||
61 | toggleMuteApp: PropTypes.func.isRequired, | 73 | toggleMuteApp: PropTypes.func.isRequired, |
62 | isAppMuted: PropTypes.bool.isRequired, | 74 | isAppMuted: PropTypes.bool.isRequired, |
63 | isWorkspaceDrawerOpen: PropTypes.bool.isRequired, | 75 | isWorkspaceDrawerOpen: PropTypes.bool.isRequired, |