mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
37a01100b7
* Revamped most actions that require an internet connection to a new/fixed backend that allows forwarding the initial action and running it automatically once connected. (i.e., it'll allow you to set "Action when Wi-Fi is off" to "turn_on", and whatch stuff connect and do what you wanted automatically without having to re-click anywhere instead of showing you a Wi-Fi prompt and then not doing anything without any other feedback). * Speaking of, fixed the "turn_on" beforeWifi action to, well, actually work. It's no longer marked as experimental. * Consistently use "Wi-Fi" everywhere. * On Kobo/Cervantes/Sony, implemented a "Kill Wi-Fi connection when inactive" system that will automatically disconnect from Wi-Fi after sustained *network* inactivity (i.e., you can keep reading, it'll eventually turn off on its own). This should be smart and flexible enough not to murder Wi-Fi while you need it, while still not keeping it uselessly on and murdering your battery. (i.e., enable that + turn Wi-Fi on when off and enjoy never having to bother about Wi-Fi ever again). * Made sending `NetworkConnected` / `NetworkDisconnected` events consistent (they were only being sent... sometimes, which made relying on 'em somewhat problematic). * restoreWifiAsync is now only run when really needed (i.e., we no longer stomp on an existing working connection just for the hell of it). * We no longer attempt to kill a bogus non-existent Wi-Fi connection when going to suspend, we only do it when it's actually needed. * Every method of enabling Wi-Fi will now properly tear down Wi-Fi on failure, instead of leaving it in an undefined state. * Fixed an issue in the fancy crash screen on Kobo/reMarkable that could sometime lead to the log excerpt being missing. * Worked-around a number of sneaky issues related to low-level Wi-Fi/DHCP/DNS handling on Kobo (see the lengthy comments [below](https://github.com/koreader/koreader/pull/6424#issuecomment-663881059) for details). Fix #6421 Incidentally, this should also fix the inconsistencies experienced re: Wi-Fi behavior in Nickel when toggling between KOReader and Nickel (use NM/KFMon, and run a current FW for best results). * For developers, this involves various cleanups around NetworkMgr and NetworkListener. Documentation is in-line, above the concerned functions.
74 lines
1.9 KiB
Lua
74 lines
1.9 KiB
Lua
local Device = require("device")
|
|
|
|
local command
|
|
--- @todo (hzj-jie): Does pocketbook provide ntpdate?
|
|
if Device:isKobo() then
|
|
command = "ntpd -q -n -p pool.ntp.org"
|
|
elseif Device:isCervantes() or Device:isKindle() or Device:isPocketBook() then
|
|
command = "ntpdate pool.ntp.org"
|
|
else
|
|
return { disabled = true, }
|
|
end
|
|
|
|
local InfoMessage = require("ui/widget/infomessage")
|
|
local UIManager = require("ui/uimanager")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
local T = require("ffi/util").template
|
|
local _ = require("gettext")
|
|
local NetworkMgr = require("ui/network/manager")
|
|
|
|
local TimeSync = WidgetContainer:new{
|
|
name = "timesync",
|
|
}
|
|
|
|
local function currentTime()
|
|
local std_out = io.popen("date")
|
|
if std_out then
|
|
local result = std_out:read("*all")
|
|
std_out:close()
|
|
if result ~= nil then
|
|
result = result:gsub("\n", "")
|
|
return T(_("New time is %1."), result)
|
|
end
|
|
end
|
|
return _("Time synchronized.")
|
|
end
|
|
|
|
local function syncNTP()
|
|
local info = InfoMessage:new{
|
|
text = _("Synchronizing time. This may take several seconds.")
|
|
}
|
|
UIManager:show(info)
|
|
UIManager:forceRePaint()
|
|
local txt
|
|
if os.execute(command) ~= 0 then
|
|
txt = _("Failed to retrieve time from server. Please check your network configuration.")
|
|
else
|
|
txt = currentTime()
|
|
end
|
|
os.execute("hwclock -u -w")
|
|
UIManager:close(info)
|
|
UIManager:show(InfoMessage:new{
|
|
text = txt,
|
|
timeout = 3,
|
|
})
|
|
end
|
|
|
|
local menuItem = {
|
|
text = _("Synchronize time"),
|
|
keep_menu_open = true,
|
|
callback = function()
|
|
NetworkMgr:runWhenOnline(function() syncNTP() end)
|
|
end
|
|
}
|
|
|
|
function TimeSync:init()
|
|
self.ui.menu:registerToMainMenu(self)
|
|
end
|
|
|
|
function TimeSync:addToMainMenu(menu_items)
|
|
menu_items.synchronize_time = menuItem
|
|
end
|
|
|
|
return TimeSync
|