prompt users to turn on Wifi in OTA update and Wikipedia lookup

pull/818/head
chrox 10 years ago
parent 9d6a5b8e7d
commit 557c29a7d9

@ -1,5 +1,6 @@
local ReaderDictionary = require("apps/reader/modules/readerdictionary")
local EventListener = require("ui/widget/eventlistener")
local NetworkMgr = require("ui/networkmgr")
local Translator = require("ui/translator")
local Wikipedia = require("ui/wikipedia")
local UIManager = require("ui/uimanager")
@ -17,7 +18,12 @@ local ReaderWikipedia = ReaderDictionary:new{
}
function ReaderWikipedia:onLookupWikipedia(word, box)
local lang = Translator:detect(word) or "en"
local ok, lang = pcall(Translator.detect, Translator, word)
-- prompt users to turn on Wifi if network is unreachable
if not ok and lang and lang:find("Network is unreachable") then
NetworkMgr:promptWifiOn()
return
end
-- convert "zh-CN" and "zh-TW" to "zh"
lang = lang:match("(.*)-") or lang
local results = {}

@ -1,5 +1,6 @@
local InfoMessage = require("ui/widget/infomessage")
local ConfirmBox = require("ui/widget/confirmbox")
local NetworkMgr = require("ui/networkmgr")
local UIManager = require("ui/uimanager")
local Device = require("ui/device")
local DEBUG = require("dbg")
@ -63,8 +64,13 @@ function OTAManager:checkUpdate()
local r, c, h = http.request{
url = ota_zsync_file,
sink = ltn12.sink.file(io.open(local_zsync_file, "w"))}
-- parse OTA package version
-- 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
local zsync = io.open(local_zsync_file, "r")
if zsync then

@ -79,6 +79,8 @@ function Translator:detect(text)
local src_lang = result.src
DEBUG("detected language:", src_lang)
return src_lang
else
return self.default_lang
end
end

Loading…
Cancel
Save