From 1be9264a0cf0089bb7cf024f684306bce8bdf006 Mon Sep 17 00:00:00 2001
From: Hzj_jie <hzj_jie@hotmail.com>
Date: Sun, 17 Apr 2016 22:30:46 -0700
Subject: [PATCH] Resolve review comments

---
 defaults.lua                    |  2 --
 frontend/device/kobo/device.lua |  5 ++---
 frontend/ui/screensaver.lua     | 18 ++++++++++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/defaults.lua b/defaults.lua
index f546c9c65..5ab85c02c 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -178,8 +178,6 @@ KOBO_LIGHT_ON_START = -2           -- -1, -2 or 0-100. -1 leaves light as it
                                    -- sets light on start/wake up
 KOBO_SYNC_BRIGHTNESS_WITH_NICKEL = true  -- Save brightness set in KOreader
                                          -- with nickel's 'Kobo eReader.conf'
-KOBO_SCREEN_SAVER = ""             -- image or directory with pictures or empty
-KOBO_SCREEN_SAVER_LAST_BOOK = true -- get screensaver from last book if possible
 
 -- Network proxy settings
 -- proxy url should be a string in the format of "http://localhost:3128"
diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua
index ad5cb8384..bf8f5b580 100644
--- a/frontend/device/kobo/device.lua
+++ b/frontend/device/kobo/device.lua
@@ -15,6 +15,8 @@ local Kobo = Generic:new{
     touch_mirrored_x = true,
     -- enforce protrait mode on Kobos:
     isAlwaysPortrait = yes,
+    -- the internal storage mount point users can write to
+    internal_storage_mount_point = "/mnt/onboard/"
 }
 
 -- TODO: hasKeys for some devices?
@@ -79,9 +81,6 @@ local KoboAlyssum = Kobo:new{
 }
 
 function Kobo:init()
-    -- Default screensaver folder
-    KOBO_SCREEN_SAVER = "/mnt/onboard/screensaver"
-
     self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = dbg}
     self.powerd = require("device/kobo/powerd"):new{device = self}
     self.input = require("device/input"):new{
diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua
index 2f0e856ba..eefe551cb 100644
--- a/frontend/ui/screensaver.lua
+++ b/frontend/ui/screensaver.lua
@@ -1,6 +1,7 @@
 local DocumentRegistry = require("document/documentregistry")
 local UIManager = require("ui/uimanager")
-local Screen = require("device").screen
+local Device = require("device")
+local Screen = Device.screen
 local DocSettings = require("docsettings")
 local DEBUG = require("dbg")
 local _ = require("gettext")
@@ -84,7 +85,9 @@ function Screensaver:show()
     DEBUG("show screensaver")
     local InfoMessage = require("ui/widget/infomessage")
     -- first check book cover image
-    if KOBO_SCREEN_SAVER_LAST_BOOK then
+    screen_saver_last_book =
+        G_reader_settings:readSetting("use_lastfile_as_screensaver")
+    if screen_saver_last_book == nil or screen_saver_last_book then
         local lastfile = G_reader_settings:readSetting("lastfile")
         if lastfile then
             local data = DocSettings:open(lastfile)
@@ -96,8 +99,15 @@ function Screensaver:show()
     end
     -- then screensaver directory or file image
     if not self.suspend_msg then
-        if type(KOBO_SCREEN_SAVER) == "string" then
-            local file = KOBO_SCREEN_SAVER
+        local screen_saver_folder =
+            G_reader_settings:readSetting("screensaver_folder")
+        if screen_saver_folder == nil
+        and Device.internal_storage_mount_point ~= nil then
+            screen_saver_folder =
+                Device.internal_storage_mount_point .. "screensaver"
+        end
+        if screen_saver_folder then
+            local file = screen_saver_folder
             if lfs.attributes(file, "mode") == "directory" then
                 self.suspend_msg = getRandomImage(file)
             else