From 3d9ed3245869520b78b218d3b219938bf62c2811 Mon Sep 17 00:00:00 2001 From: zwim <36999612+zwim@users.noreply.github.com> Date: Wed, 5 May 2021 20:41:14 +0200 Subject: [PATCH] Android: Send Suspend/Resume Events on STOP/START (#7630) * ReaderHeader: Refresh it *now* on Resume, instead of just re-scheduling an update if auto-refresh is enabled.. --- frontend/apps/reader/modules/readercoptlistener.lua | 4 ++-- frontend/device/android/device.lua | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/apps/reader/modules/readercoptlistener.lua b/frontend/apps/reader/modules/readercoptlistener.lua index b9f7ddf3b..741443491 100644 --- a/frontend/apps/reader/modules/readercoptlistener.lua +++ b/frontend/apps/reader/modules/readercoptlistener.lua @@ -134,7 +134,7 @@ function ReaderCoptListener:onResume() return end - ReaderCoptListener:rescheduleHeaderRefreshIfNeeded() + self:headerRefresh() end function ReaderCoptListener:onOutOfScreenSaver() @@ -143,7 +143,7 @@ function ReaderCoptListener:onOutOfScreenSaver() end self._delayed_screensaver = nil - ReaderCoptListener:rescheduleHeaderRefreshIfNeeded() + self:headerRefresh() end -- Unschedule on these events diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua index 61166d768..abf2cbe9f 100644 --- a/frontend/device/android/device.lua +++ b/frontend/device/android/device.lua @@ -168,6 +168,9 @@ function Device:init() end end -- to-do: keyboard connected, disconnected + elseif ev.code == C.APP_CMD_START then + local Event = require("ui/event") + UIManager:broadcastEvent(Event:new("Resume")) elseif ev.code == C.APP_CMD_RESUME then if external.when_back_callback then external.when_back_callback() @@ -201,6 +204,9 @@ function Device:init() end) end end + elseif ev.code == C.APP_CMD_STOP then + local Event = require("ui/event") + UIManager:broadcastEvent(Event:new("Suspend")) elseif ev.code == C.AEVENT_POWER_CONNECTED then local Event = require("ui/event") UIManager:broadcastEvent(Event:new("Charging"))