Merge pull request #1153 from chrox/fix_1149

fix #1149 by adding 'Network setting' in filemanager

frontend/apps/filemanager/filemanagermenu.lua

@@ -2,6 +2,7 @@ local CenterContainer = require("ui/widget/container/centercontainer")
 local InputContainer = require("ui/widget/container/inputcontainer")
 local ConfirmBox = require("ui/widget/confirmbox")
 local InfoMessage = require("ui/widget/infomessage")
+local NetworkMgr = require("ui/networkmgr")
 local OTAManager = require("ui/otamanager")
 local UIManager = require("ui/uimanager")
 local Device = require("device")
@@ -124,6 +125,13 @@ function FileManagerMenu:setUpdateItemTable()
             UIManager:getRefreshMenuTable(),
         },
     })
+    table.insert(self.tab_item_table.setting, {
+        text = _("Network settings"),
+        sub_item_table = {
+            NetworkMgr:getWifiMenuTable(),
+            NetworkMgr:getProxyMenuTable(),
+        }
+    })
     table.insert(self.tab_item_table.setting, {
         text = _("Night mode"),
         checked_func = function() return G_reader_settings:readSetting("night_mode") end,

frontend/apps/reader/modules/readermenu.lua

@@ -152,7 +152,7 @@ function ReaderMenu:setUpdateItemTable()
         end
     })
 
-    if KOBO_SCREEN_SAVER_LAST_BOOK then
+    if Device:isKobo() and KOBO_SCREEN_SAVER_LAST_BOOK then
         local excluded = function()
             return self.ui.doc_settings:readSetting("exclude_screensaver") or false
         end