renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #846 from gontofe/master

Browse Source 
Changes to networkmgr and otamanager to prevent call to checkUpdate if wifi not available
This commit is contained in:
Huang Xin
2014-08-26 13:50:15 +08:00
parent f2c2657cd9 d49153059d
commit b9a80c900d
2 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/ui/networkmgr.lua
View File

@@ -70,4 +70,12 @@ function NetworkMgr:promptWifiOff()
})
end
function NetworkMgr:getWifiStatus()
if os.execute("ping -c3 8.8.8.8") == 0 then
return true
else
return false
end
end
return NetworkMgr

60
frontend/ui/otamanager.lua
View File

@@ -65,10 +65,6 @@ function OTAManager:checkUpdate()
url = ota_zsync_file,
sink = ltn12.sink.file(io.open(local_zsync_file, "w"))}
-- prompt users to turn on Wifi if network is unreachable
if h == nil then
NetworkMgr:promptWifiOn()
return
end
if c ~= 200 then return end
-- parse OTA package version
local ota_package = nil
@@ -143,32 +139,36 @@ function OTAManager:getOTAMenuTable()
{
text = _("Check update"),
callback = function()
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
})
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
end
end
},