[fix] Let UIManager handle suspend logic

See <koreader#2431 (comment)>. Supersedes <koreader#5302>.
Frenzie · Sep 1, 2019 · 2600abe · 2600abe
1 parent 621f36b
commit 2600abe
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
@@ -198,12 +198,19 @@ function UIManager:init()
         self.event_handlers["PowerRelease"] = function()
             if not self._entered_poweroff_stage then
                 UIManager:unschedule(self.poweroff_action)
-                self:_beforeSuspend()
-                Device:intoScreenSaver()
-                Device:suspend()
+                -- resume if we were suspended
+                if Device.screen_saver_mode then
+                    self:resume()
+                else
+                    self:suspend()
+                end
             end
         end
-        self.event_handlers["Suspend"] = self.event_handlers["PowerRelease"]
+        self.event_handlers["Suspend"] = function()
+            self:_beforeSuspend()
+            Device:intoScreenSaver()
+            Device:suspend()
+        end
         self.event_handlers["Resume"] = function()
             Device:resume()
             Device:outofScreenSaver()
@@ -230,7 +237,12 @@ function UIManager:init()
         self.event_handlers["PowerRelease"] = function()
             if not self._entered_poweroff_stage then
                 UIManager:unschedule(self.poweroff_action)
-                self:suspend()
+                -- resume if we were suspended
+                if Device.screen_saver_mode then
+                    self:resume()
+                else
+                    self:suspend()
+                end
             end
         end
         self.event_handlers["Charging"] = function()