Merge pull request #1875 from Hzj-jie/master

E-ink optimization setting should be correctly set after restart.

frontend/device/generic/device.lua

@@ -52,6 +52,9 @@ function Device:init()
         error("screen/framebuffer must be implemented")
     end
 
+    local is_eink = G_reader_settings:readSetting("eink")
+    self.screen.eink = (is_eink == nil) or is_eink
+
     DEBUG("initializing for device", self.model)
     DEBUG("framebuffer resolution:", self.screen:getSize())
 

frontend/ui/screen.lua

@@ -1,8 +0,0 @@
--- compatibility wrapper
-local Screen = require("device").screen
-
--- set eink flag for this screen
-local is_eink = G_reader_settings:readSetting("eink")
-Screen.eink = (is_eink == nil) and true or is_eink
-
-return Screen

spec/unit/eink_optimization_spec.lua

@@ -0,0 +1,8 @@
+require("commonrequire")
+
+describe("eink optimization setting", function()
+    it("should be correctly loaded", function()
+        G_reader_settings:saveSetting("eink", true)
+        assert.Equals(require("device").screen.eink, true)
+    end)
+end)