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/services/tabs/TabBarSortableList.js | |
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/services/tabs/TabBarSortableList.js')
-rw-r--r-- | src/components/services/tabs/TabBarSortableList.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 489027d57..f12d90602 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js | |||
@@ -17,6 +17,8 @@ class TabBarSortableList extends Component { | |||
17 | deleteService: PropTypes.func.isRequired, | 17 | deleteService: PropTypes.func.isRequired, |
18 | disableService: PropTypes.func.isRequired, | 18 | disableService: PropTypes.func.isRequired, |
19 | enableService: PropTypes.func.isRequired, | 19 | enableService: PropTypes.func.isRequired, |
20 | hibernateService: PropTypes.func.isRequired, | ||
21 | wakeUpService: PropTypes.func.isRequired, | ||
20 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 22 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
21 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 23 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
22 | } | 24 | } |
@@ -31,6 +33,8 @@ class TabBarSortableList extends Component { | |||
31 | deleteService, | 33 | deleteService, |
32 | disableService, | 34 | disableService, |
33 | enableService, | 35 | enableService, |
36 | hibernateService, | ||
37 | wakeUpService, | ||
34 | openSettings, | 38 | openSettings, |
35 | showMessageBadgeWhenMutedSetting, | 39 | showMessageBadgeWhenMutedSetting, |
36 | showMessageBadgesEvenWhenMuted, | 40 | showMessageBadgesEvenWhenMuted, |
@@ -53,6 +57,8 @@ class TabBarSortableList extends Component { | |||
53 | deleteService={() => deleteService({ serviceId: service.id })} | 57 | deleteService={() => deleteService({ serviceId: service.id })} |
54 | disableService={() => disableService({ serviceId: service.id })} | 58 | disableService={() => disableService({ serviceId: service.id })} |
55 | enableService={() => enableService({ serviceId: service.id })} | 59 | enableService={() => enableService({ serviceId: service.id })} |
60 | hibernateService={() => hibernateService({ serviceId: service.id })} | ||
61 | wakeUpService={() => wakeUpService({ serviceId: service.id })} | ||
56 | openSettings={openSettings} | 62 | openSettings={openSettings} |
57 | showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} | 63 | showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} |
58 | showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} | 64 | showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} |