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

Change to prevent OTA Server check before wifi enabled

Browse Source
This commit is contained in:
Michael Hall
2014-08-25 18:06:15 +01:00
parent 071a301edf
commit 7ea90b2dc9
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/ui/networkmgr.lua
View File

@@ -71,11 +71,10 @@ function NetworkMgr:promptWifiOff()
end
function NetworkMgr:getWifiStatus()
local wifi_status = os.execute("ping -c3 8.8.8.8")
if wifi_status == 2 then
return false
else
if os.execute("ping -c3 8.8.8.8") == 0 then
return true
else
return false
end
end

56
frontend/ui/otamanager.lua
View File

@@ -141,34 +141,34 @@ function OTAManager:getOTAMenuTable()
callback = function()
if NetworkMgr:getWifiStatus() == false then
NetworkMgr:promptWifiOn()
return
end
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
})
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
},