averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-24 12:14:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

KOSync: Kill Wi-Fi once we're done on suspend

Browse Source 
Most older NTX boards will horribly implode when attempting to suspend
with the Wi-Fi chip powered on.

And the others may do very dumb things re: power management anyway.

(This falls outside of the existing machinery that deals with this case,
as it happens *before* sending the Suspend Event).

Fix #12614
This commit is contained in:
NiLuJe
2024-10-09 21:31:19 +02:00
parent f143f5f8b1
commit 49cfd80f9a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/kosync.koplugin/main.lua
View File

@@ -626,7 +626,7 @@ function KOSync:syncToProgress(progress)
end end
end end
function KOSync:updateProgress(ensure_networking, interactive, refresh_on_success) function KOSync:updateProgress(ensure_networking, interactive, on_suspend)
if not self.settings.username or not self.settings.userkey then if not self.settings.username or not self.settings.userkey then
if interactive then if interactive then
promptLogin() promptLogin()
@@ -640,7 +640,7 @@ function KOSync:updateProgress(ensure_networking, interactive, refresh_on_succes
return return
end end
if ensure_networking and NetworkMgr:willRerunWhenOnline(function() self:updateProgress(ensure_networking, interactive, refresh_on_success) end) then if ensure_networking and NetworkMgr:willRerunWhenOnline(function() self:updateProgress(ensure_networking, interactive, on_suspend) end) then
return return
end end
@@ -680,7 +680,7 @@ function KOSync:updateProgress(ensure_networking, interactive, refresh_on_succes
if err then logger.dbg("err:", err) end if err then logger.dbg("err:", err) end
else else
-- This is solely for onSuspend's sake, to clear the ghosting left by the "Connected" InfoMessage -- This is solely for onSuspend's sake, to clear the ghosting left by the "Connected" InfoMessage
if refresh_on_success then if on_suspend then
-- Our top-level widget should be the "Connected to network" InfoMessage from NetworkMgr's reconnectOrShowNetworkMenu -- Our top-level widget should be the "Connected to network" InfoMessage from NetworkMgr's reconnectOrShowNetworkMenu
local widget = UIManager:getTopmostVisibleWidget() local widget = UIManager:getTopmostVisibleWidget()
if widget and widget.modal and widget.tag == "NetworkMgr" and not widget.dismiss_callback then if widget and widget.modal and widget.tag == "NetworkMgr" and not widget.dismiss_callback then
@@ -693,6 +693,15 @@ function KOSync:updateProgress(ensure_networking, interactive, refresh_on_succes
end end
end end
if on_suspend then
-- NOTE: We want to murder Wi-Fi once we're done in this specific case (i.e., Suspend),
-- because some of our hasWifiManager targets will horribly implode when attempting to suspend with the Wi-Fi chip powered on,
-- and they'll have attempted to kill Wi-Fi well before *we* run (e.g., in `Device:onPowerEvent`, *before* actually sending the Suspend Event)...
if Device:hasWifiManager() then
NetworkMgr:disableWifi()
end
end
self.push_timestamp = now self.push_timestamp = now
end end