NetworkManager: Enable "before wifi action" support on every hasWifiToggle platform

frontend/device/cervantes/device.lua

@@ -32,6 +32,7 @@ local Cervantes = Generic:extend{
     hasFastWifiStatusQuery = yes,
     hasKeys = yes,
     hasWifiManager = yes,
+    hasWifiRestore = yes,
     canReboot = yes,
     canPowerOff = yes,
     canSuspend = yes,

frontend/device/generic/device.lua

@@ -46,6 +46,7 @@ local Device = {
     hasFewKeys = no,
     hasWifiToggle = yes,
     hasWifiManager = no,
+    hasWifiRestore = no,
     isDefaultFullscreen = yes,
     isHapticFeedbackEnabled = no,
     isDeprecated = no, -- device no longer receive OTA updates
@@ -278,13 +279,6 @@ function Device:onPowerEvent(ev)
             else
                 logger.dbg("Resuming...")
                 UIManager:unschedule(self.suspend)
-                if self:hasWifiManager() then
-                    local network_manager = require("ui/network/manager")
-                    if network_manager.wifi_was_on and G_reader_settings:isTrue("auto_restore_wifi") then
-                        network_manager:restoreWifiAsync()
-                        network_manager:scheduleConnectivityCheck()
-                    end
-                end
                 self:resume()
                 local widget_was_closed = Screensaver:close()
                 if widget_was_closed and self:needsScreenRefreshAfterResume() then
@@ -313,8 +307,7 @@ function Device:onPowerEvent(ev)
             if self:hasWifiToggle() then
                 local network_manager = require("ui/network/manager")
                 if network_manager:isWifiOn() then
-                    UIManager:broadcastEvent(Event:new("NetworkDisconnecting"))
-                    network_manager:turnOffWifi()
+                    network_manager:disableWifi()
                 end
             end
             self:rescheduleSuspend()
@@ -347,8 +340,7 @@ function Device:onPowerEvent(ev)
             --       because suspend will at best fail, and at worst deadlock the system if Wi-Fi is on,
             --       regardless of who enabled it!
             if network_manager:isWifiOn() then
-                UIManager:broadcastEvent(Event:new("NetworkDisconnecting"))
-                network_manager:turnOffWifi()
+                network_manager:disableWifi()
             end
         end
         -- Only turn off the frontlight *after* we've displayed the screensaver and dealt with Wi-Fi,

frontend/device/kindle/device.lua

@@ -138,6 +138,7 @@ local Kindle = Generic:extend{
     isSpecialOffers = isSpecialOffers(),
     hasOTAUpdates = yes,
     hasFastWifiStatusQuery = yes,
+    hasWifiRestore = yes,
     -- NOTE: HW inversion is generally safe on mxcfb Kindles
     canHWInvert = yes,
     -- NOTE: And the fb driver is generally sane on those, too
@@ -186,6 +187,10 @@ function Kindle:initNetworkManager(NetworkMgr)
         return "wlan0" -- so far, all Kindles appear to use wlan0
     end
 
+    function NetworkMgr:restoreWifiAsync()
+        kindleEnableWifi(1)
+    end
+
     NetworkMgr.isWifiOn = NetworkMgr.sysfsWifiOn
     NetworkMgr.isConnected = NetworkMgr.ifHasAnAddress
 end

frontend/device/kobo/device.lua

@@ -95,6 +95,7 @@ local Kobo = Generic:extend{
     hasOTAUpdates = yes,
     hasFastWifiStatusQuery = yes,
     hasWifiManager = yes,
+    hasWifiRestore = yes,
     canStandby = no, -- will get updated by checkStandby()
     canReboot = yes,
     canPowerOff = yes,

frontend/device/remarkable/device.lua

@@ -35,6 +35,8 @@ local Remarkable = Generic:extend{
     hasKeys = yes,
     needsScreenRefreshAfterResume = no,
     hasOTAUpdates = yes,
+    hasFastWifiStatusQuery = yes,
+    hasWifiManager = yes,
     canReboot = yes,
     canPowerOff = yes,
     canSuspend = yes,

frontend/device/sony-prstux/device.lua

@@ -168,10 +168,6 @@ function SonyPRSTUX:initNetworkManager(NetworkMgr)
         os.execute("dhclient -x wlan0")
     end
 
-    function NetworkMgr:restoreWifiAsync()
-        -- os.execute("./restore-wifi-async.sh")
-    end
-
     --[[
     function NetworkMgr:isWifiOn()
         return 0 == os.execute("wmiconfig -i wlan0 --wlan query | grep -q enabled")

frontend/ui/data/onetime_migration.lua

@@ -8,7 +8,7 @@ local logger = require("logger")
 local _ = require("gettext")
 
 -- Date at which the last migration snippet was added
-local CURRENT_MIGRATION_DATE = 20230707
+local CURRENT_MIGRATION_DATE = 20230710
 
 -- Retrieve the date of the previous migration, if any
 local last_migration_date = G_reader_settings:readSetting("last_migration_date", 0)
@@ -517,9 +517,36 @@ if last_migration_date < 20230531 then
     end
 end
 
--- 20230627, Migrate to a full settings table, and disable KOSync's auto sync mode if wifi_enable_action is not turn_on
-if last_migration_date < 20230627 then
-    logger.info("Performing one-time migration for 20230627")
+-- 20230703, FileChooser Sort by: "date modified" only
+if last_migration_date < 20230703 then
+    logger.info("Performing one-time migration for 20230703")
+    local collate = G_reader_settings:readSetting("collate")
+    if collate == "modification" or collate == "access" or collate == "change" then
+        G_reader_settings:saveSetting("collate", "date")
+    end
+end
+
+-- 20230707, OPDS, no more special calibre catalog
+if last_migration_date < 20230707 then
+    logger.info("Performing one-time migration for 20230707")
+
+    local calibre_opds = G_reader_settings:readSetting("calibre_opds")
+    if calibre_opds and calibre_opds.host and calibre_opds.port then
+        local opds_servers = G_reader_settings:readSetting("opds_servers") or {}
+        table.insert(opds_servers, 1, {
+            title    = _("Local calibre library"),
+            url      = string.format("http://%s:%d/opds", calibre_opds.host, calibre_opds.port),
+            username = calibre_opds.username,
+            password = calibre_opds.password,
+        })
+       G_reader_settings:saveSetting("opds_servers", opds_servers)
+       G_reader_settings:delSetting("calibre_opds")
+    end
+end
+
+-- 20230710, Migrate to a full settings table, and disable KOSync's auto sync mode if wifi_enable_action is not turn_on
+if last_migration_date < 20230710 then
+    logger.info("Performing one-time migration for 20230710")
 
     -- c.f., PluginLoader
     local package_path = package.path
@@ -549,7 +576,7 @@ if last_migration_date < 20230627 then
     end
 
     local Device = require("device")
-    if Device:hasWifiManager() and G_reader_settings:readSetting("wifi_enable_action") ~= "turn_on" then
+    if Device:hasWifiToggle() and G_reader_settings:readSetting("wifi_enable_action") ~= "turn_on" then
         local kosync = G_reader_settings:readSetting("kosync")
         if kosync and kosync.auto_sync then
             kosync.auto_sync = false
@@ -558,32 +585,5 @@ if last_migration_date < 20230627 then
     end
 end
 
--- 20230703, FileChooser Sort by: "date modified" only
-if last_migration_date < 20230703 then
-    logger.info("Performing one-time migration for 20230703")
-    local collate = G_reader_settings:readSetting("collate")
-    if collate == "modification" or collate == "access" or collate == "change" then
-        G_reader_settings:saveSetting("collate", "date")
-    end
-end
-
--- 20230707, OPDS, no more special calibre catalog
-if last_migration_date < 20230707 then
-    logger.info("Performing one-time migration for 20230707")
-
-    local calibre_opds = G_reader_settings:readSetting("calibre_opds")
-    if calibre_opds and calibre_opds.host and calibre_opds.port then
-        local opds_servers = G_reader_settings:readSetting("opds_servers") or {}
-        table.insert(opds_servers, 1, {
-            title    = _("Local calibre library"),
-            url      = string.format("http://%s:%d/opds", calibre_opds.host, calibre_opds.port),
-            username = calibre_opds.username,
-            password = calibre_opds.password,
-        })
-       G_reader_settings:saveSetting("opds_servers", opds_servers)
-       G_reader_settings:delSetting("calibre_opds")
-    end
-end
-
 -- We're done, store the current migration date
 G_reader_settings:saveSetting("last_migration_date", CURRENT_MIGRATION_DATE)