From 49cfd80f9ac1efe99e3e72b7548e5c20ed3d9c85 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Wed, 9 Oct 2024 21:31:19 +0200
Subject: [PATCH] KOSync: Kill Wi-Fi once we're done on suspend

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
---
 plugins/kosync.koplugin/main.lua | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/kosync.koplugin/main.lua b/plugins/kosync.koplugin/main.lua
index 8a6b75843..2240fca8a 100644
--- a/plugins/kosync.koplugin/main.lua
+++ b/plugins/kosync.koplugin/main.lua
@@ -626,7 +626,7 @@ function KOSync:syncToProgress(progress)
     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 interactive then
             promptLogin()
@@ -640,7 +640,7 @@ function KOSync:updateProgress(ensure_networking, interactive, refresh_on_succes
         return
     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
     end
 
@@ -680,7 +680,7 @@ function KOSync:updateProgress(ensure_networking, interactive, refresh_on_succes
         if err then logger.dbg("err:", err) end
     else
         -- 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
             local widget = UIManager:getTopmostVisibleWidget()
             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
 
+    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
 end