From 744e933036a83be6fbb4221ad67ede341942e94c Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Tue, 28 Jul 2020 03:53:20 +0200
Subject: [PATCH] Minor cleanups after #6424 (#6438)

* Minor cosmetic code cleanup
* String tweak
---
 frontend/ui/network/manager.lua         |  2 +-
 frontend/ui/network/networklistener.lua | 40 +++++++++++++------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/frontend/ui/network/manager.lua b/frontend/ui/network/manager.lua
index 271c5302c..d5a26891d 100644
--- a/frontend/ui/network/manager.lua
+++ b/frontend/ui/network/manager.lua
@@ -420,7 +420,7 @@ end
 
 function NetworkMgr:getPowersaveMenuTable()
     return {
-        text = _("Kill Wi-Fi connection when inactive"),
+        text = _("Disable Wi-Fi connection when inactive"),
         help_text = _([[This will automatically turn Wi-Fi off after a generous period of network inactivity, without disrupting workflows that require a network connection, so you can just keep reading without worrying about battery drain.]]),
         checked_func = function() return G_reader_settings:isTrue("auto_disable_wifi") end,
         enabled_func = function() return Device:hasWifiManager() and not Device:isEmulator() end,
diff --git a/frontend/ui/network/networklistener.lua b/frontend/ui/network/networklistener.lua
index 2f86214d6..13aa57c26 100644
--- a/frontend/ui/network/networklistener.lua
+++ b/frontend/ui/network/networklistener.lua
@@ -155,26 +155,28 @@ function NetworkListener:_scheduleActivityCheck()
         end
     end
 
-    -- If we've just killed Wi-Fi, onNetworkDisconnected will take care of unscheduling us
-    if keep_checking then
-        -- Update tracker for next iter
-        self._last_tx_packets = tx_packets
-
-        -- If it's already been scheduled, increase the delay until we hit the ceiling
-        if self._activity_check_delay then
-            self._activity_check_delay = self._activity_check_delay + default_network_timeout_seconds
-
-            if self._activity_check_delay > max_network_timeout_seconds then
-                self._activity_check_delay = max_network_timeout_seconds
-            end
-        else
-            self._activity_check_delay = default_network_timeout_seconds
-        end
-
-        UIManager:scheduleIn(self._activity_check_delay, self._scheduleActivityCheck, self)
-        self._activity_check_scheduled = true
-        logger.dbg("NetworkListener: network activity check scheduled in", self._activity_check_delay, "seconds")
+    -- If we've just killed Wi-Fi, onNetworkDisconnected will take care of unscheduling us, so we're done
+    if not keep_checking then
+        return
     end
+
+    -- Update tracker for next iter
+    self._last_tx_packets = tx_packets
+
+    -- If it's already been scheduled, increase the delay until we hit the ceiling
+    if self._activity_check_delay then
+        self._activity_check_delay = self._activity_check_delay + default_network_timeout_seconds
+
+        if self._activity_check_delay > max_network_timeout_seconds then
+            self._activity_check_delay = max_network_timeout_seconds
+        end
+    else
+        self._activity_check_delay = default_network_timeout_seconds
+    end
+
+    UIManager:scheduleIn(self._activity_check_delay, self._scheduleActivityCheck, self)
+    self._activity_check_scheduled = true
+    logger.dbg("NetworkListener: network activity check scheduled in", self._activity_check_delay, "seconds")
 end
 
 function NetworkListener:onNetworkConnected()