Merge pull request #595 from chrox/master

add multi-touch support for Android

frontend/apps/reader/modules/readerscreenshot.lua

@@ -18,7 +18,7 @@ function ReaderScreenshot:init()
         Screenshot = {
             GestureRange:new{
                 ges = "two_finger_tap",
-                scale = {diagonal - Screen:scaleByDPI(100), diagonal},
+                scale = {diagonal - Screen:scaleByDPI(200), diagonal},
                 rate = 1.0,
             }
         },
@@ -26,9 +26,8 @@ function ReaderScreenshot:init()
 end
 
 function ReaderScreenshot:onScreenshot()
-    if Device:getModel() ~= 'Kobo_phoenix' then
-        os.execute("screenshot")
-    else Screen.bb:invert() 
+    if os.execute("screenshot") ~= 0 then
+        Screen.bb:invert()
         local screenshot_name = os.date("screenshots/Screenshot_%Y-%B-%d_%Hh%M.pam")
         UIManager:show(InfoMessage:new{
             text = _("Writing screen to ")..screenshot_name,
@@ -36,7 +35,7 @@ function ReaderScreenshot:onScreenshot()
         })
         Screen.bb:writePAM(screenshot_name)
         DEBUG(screenshot_name)
-        Screen.bb:invert() 
+        Screen.bb:invert()
     end
     UIManager.full_refresh = true
     return true

frontend/ui/device.lua

@@ -33,7 +33,7 @@ function Device:getModel()
         self.model = "Emulator"
         return self.model
     end
-    self.model = nil
+    self.model = ""
     local kindle_sn = io.open("/proc/usid", "r")
     if kindle_sn then
         local kindle_devcode = string.sub(kindle_sn:read(),3,4)

koreader-base

@@ -1 +1 @@
-Subproject commit b74c59e886d4bbc316ac575bec06c1f15c428504
+Subproject commit 34a26b30c2fb85f4520c07a8b4cd3ead51297f18