Merge pull request #1696 from chrox/fix_flush_settings

fix FlushSettings event consumed by statistics plugin

frontend/ui/widget/container/inputcontainer.lua

@@ -52,7 +52,8 @@ end
 
 function InputContainer:paintTo(bb, x, y)
     if not self.dimen then
-        self.dimen = self[1]:getSize()
+        local content_size = self[1]:getSize()
+        self.dimen = Geom:new{w = content_size.w, h = content_size.h}
     end
     self.dimen.x = x
     self.dimen.y = y

plugins/statistics.koplugin/main.lua

@@ -92,7 +92,7 @@ function ReaderStatistics:getStatisticEnabledMenuTable()
             if self.is_enabled then
                 self:initData()
             end
-            self:onSaveSettings()
+            self:saveSettings()
         end,
     }
 end
@@ -138,7 +138,7 @@ function ReaderStatistics:updateSettings()
                     callback = function()
                         self.settings_dialog:onClose()
                         UIManager:close(self.settings_dialog)
-                        self:onSaveSettings(MultiInputDialog:getFields())
+                        self:saveSettings(MultiInputDialog:getFields())
                     end
                 },
             },
@@ -409,20 +409,18 @@ function ReaderStatistics:onAddNote()
 end
 
 -- in case when screensaver starts
-function ReaderStatistics:onFlushSettings()
-    self:onSaveSettings()
+function ReaderStatistics:onSaveSettings()
+    self:saveSettings()
     self:exportToFile()
     self.current_period = 0
-    return true
 end
 
 -- screensaver off
 function ReaderStatistics:onResume()
     self.current_period = 0
-    return true
 end
 
-function ReaderStatistics:onSaveSettings(fields)
+function ReaderStatistics:saveSettings(fields)
     if fields then
         self.page_min_read_sec = tonumber(fields[1])
         self.page_max_read_sec = tonumber(fields[2])