From 15e10da94b1090b0d445458b4c2c7a27b5541c40 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <frans@clevercast.com>
Date: Mon, 8 Apr 2024 22:12:18 +0200
Subject: [PATCH] Update leftover screensaver message, simplify
 Screensaver:chooseFile()

---
 frontend/ui/elements/screensaver_menu.lua |  2 +-
 frontend/ui/screensaver.lua               | 27 +++++++----------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/frontend/ui/elements/screensaver_menu.lua b/frontend/ui/elements/screensaver_menu.lua
index 43b61ad58..552c7eb44 100644
--- a/frontend/ui/elements/screensaver_menu.lua
+++ b/frontend/ui/elements/screensaver_menu.lua
@@ -91,7 +91,7 @@ return {
                         end,
                         keep_menu_open = true,
                         callback = function()
-                            Screensaver:chooseFile(true)
+                            Screensaver:chooseFile()
                         end,
                     },
                     {
diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua
index 0f78d5207..efa5facfb 100644
--- a/frontend/ui/screensaver.lua
+++ b/frontend/ui/screensaver.lua
@@ -261,26 +261,15 @@ function Screensaver:chooseFolder()
     filemanagerutil.showChooseDialog(title_header, caller_callback, current_path)
 end
 
-function Screensaver:chooseFile(document_cover)
+function Screensaver:chooseFile()
     local title_header, current_path, file_filter, caller_callback
-    if document_cover then
-        title_header = _("Current screensaver document cover:")
-        current_path = G_reader_settings:readSetting("screensaver_document_cover")
-        file_filter = function(filename)
-            return DocumentRegistry:hasProvider(filename)
-        end
-        caller_callback = function(path)
-            G_reader_settings:saveSetting("screensaver_document_cover", path)
-        end
-    else
-        title_header = _("Current screensaver image:")
-        current_path = G_reader_settings:readSetting("screensaver_image")
-        file_filter = function(filename)
-            return DocumentRegistry:isImageFile(filename)
-        end
-        caller_callback = function(path)
-            G_reader_settings:saveSetting("screensaver_image", path)
-        end
+    title_header = _("Current sleep screen image or document cover:")
+    current_path = G_reader_settings:readSetting("screensaver_document_cover")
+    file_filter = function(filename)
+        return DocumentRegistry:hasProvider(filename)
+    end
+    caller_callback = function(path)
+        G_reader_settings:saveSetting("screensaver_document_cover", path)
     end
     filemanagerutil.showChooseDialog(title_header, caller_callback, current_path, nil, file_filter)
 end