From 4cc9cf85e41d66163e49acbdd5b2fa4d35ec91ed Mon Sep 17 00:00:00 2001
From: Michael Hall <michaelrichardhall@gmail.com>
Date: Tue, 26 Aug 2014 20:21:18 +0100
Subject: [PATCH] Prevent promptWifiOn() needing to be called twice and
 refactor OTA update fetch/version check

---
 frontend/ui/networkmgr.lua |  1 +
 frontend/ui/otamanager.lua | 58 ++++++++++++++++++++------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/frontend/ui/networkmgr.lua b/frontend/ui/networkmgr.lua
index 9bd022303..e7bc98819 100644
--- a/frontend/ui/networkmgr.lua
+++ b/frontend/ui/networkmgr.lua
@@ -23,6 +23,7 @@ local function koboEnableWifi(toggle)
         local path = "/etc/wpa_supplicant/wpa_supplicant.conf"
         os.execute("insmod /drivers/ntx508/wifi/sdio_wifi_pwr.ko 2>/dev/null")
         os.execute("insmod /drivers/ntx508/wifi/dhd.ko")
+        os.execute("sleep 1")
         os.execute("ifconfig eth0 up")
         os.execute("wlarm_le -i eth0 up")
         os.execute("wpa_supplicant -s -i eth0 -c "..path.." -C /var/run/wpa_supplicant -B")
diff --git a/frontend/ui/otamanager.lua b/frontend/ui/otamanager.lua
index 4689ea59b..9acb47a32 100644
--- a/frontend/ui/otamanager.lua
+++ b/frontend/ui/otamanager.lua
@@ -90,6 +90,36 @@ function OTAManager:checkUpdate()
     end
 end
 
+function OTAManager:fetchAndProcessUpdate()
+    local ota_version = OTAManager:checkUpdate()
+    if ota_version == 0 then
+        UIManager:show(InfoMessage:new{
+            text = _("Your koreader is updated."),
+        })
+    elseif ota_version == nil then
+        UIManager:show(InfoMessage:new{
+            text = _("OTA server is not available."),
+        })
+    elseif ota_version then
+        UIManager:show(ConfirmBox:new{
+            text = _("Do you want to update to version ")..ota_version.."?",
+            ok_callback = function()
+                UIManager:show(InfoMessage:new{
+                    text = _("Downloading may take several minutes..."),
+                    timeout = 3,
+                })
+                UIManager:scheduleIn(1, function()
+                    if OTAManager:zsync() == 0 then
+                        UIManager:show(InfoMessage:new{
+                            text = _("Koreader will be updated on next restart."),
+                        })
+                    end
+                end)
+            end
+        })
+    end
+end
+
 function OTAManager:_buildLocalPackage()
     return os.execute(string.format(
         "./tar cvf %s -C .. -T %s --no-recursion",
@@ -142,33 +172,7 @@ function OTAManager:getOTAMenuTable()
                     if NetworkMgr:getWifiStatus() == false then
                         NetworkMgr:promptWifiOn()
                     else
-                        local ota_version = OTAManager:checkUpdate()
-                        if ota_version == 0 then
-                            UIManager:show(InfoMessage:new{
-                                text = _("Your koreader is updated."),
-                            })
-                        elseif ota_version == nil then
-                            UIManager:show(InfoMessage:new{
-                                text = _("OTA server is not available."),
-                            })
-                        elseif ota_version then
-                            UIManager:show(ConfirmBox:new{
-                                text = _("Do you want to update to version ")..ota_version.."?",
-                                ok_callback = function()
-                                    UIManager:show(InfoMessage:new{
-                                        text = _("Downloading may take several minutes..."),
-                                        timeout = 3,
-                                    })
-                                    UIManager:scheduleIn(1, function()
-                                        if OTAManager:zsync() == 0 then
-                                            UIManager:show(InfoMessage:new{
-                                                text = _("Koreader will be updated on next restart."),
-                                            })
-                                        end
-                                    end)
-                                end
-                            })
-                        end
+                        OTAManager.fetchAndProcessUpdate()
                     end
                 end
             },