From 50ce8d47cdd9433a4442c68d79ed01b1f35ebe98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= Date: Wed, 14 Aug 2019 13:40:42 +0200 Subject: [PATCH] do not request write settings permission at launch --- frontend/device/android/device.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua index f1a40dbe2..06902c550 100644 --- a/frontend/device/android/device.lua +++ b/frontend/device/android/device.lua @@ -173,7 +173,14 @@ function Device:init() android.setScreenOffTimeout(-1) else local timeout = G_reader_settings:readSetting("android_screen_timeout") - if timeout ~= nil and timeout ~= 0 then + if not timeout then return end + if timeout > 0 then + -- set a custom timeout if we already have write settings permission. + -- do not attempt to request permissions here. + if android.canWriteSettings() then + android.setScreenOffTimeout(timeout) + end + elseif timeout == -1 then android.setScreenOffTimeout(timeout) end end