[fix] isWifiEnabled and isFullscreen (koreader#73) (#3)

* Also fix callBoolean method typo
mwoz123 · Nov 4, 2017 · 04e553f · 04e553f
1 parent 415049e
commit 04e553f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/assets/android.lua b/assets/android.lua
@@ -1047,7 +1047,7 @@ function JNI:callBooleanMethod(object, method, signature, ...)
     local clazz = self.env[0].GetObjectClass(self.env, object)
     local methodID = self.env[0].GetMethodID(self.env, clazz, method, signature)
     self.env[0].DeleteLocalRef(self.env, clazz)
-    return self.env[0].callBooleanMethod(self.env, object, methodID, ...)
+    return self.env[0].CallBooleanMethod(self.env, object, methodID, ...)
 end
 
 function JNI:callStaticBooleanMethod(class, method, signature, ...)
@@ -1363,10 +1363,10 @@ local function run(android_app_state)
             local fullscreen = JNI:callIntMethod(
                 android.app.activity.clazz,
                 "isFullscreen",
-                "()Z"
+                "()I"
             )
             android.LOGI("is fullscreen =", fullscreen)
-            return fullscreen
+            return fullscreen == 1
         end)
     end
     android.setFullscreen = function(fullscreen)
@@ -1398,10 +1398,10 @@ local function run(android_app_state)
             local isWifiEnabled = JNI:callIntMethod(
                 android.app.activity.clazz,
                 "isWifiEnabled",
-                "()Z"
+                "()I"
             )
             android.LOGI("is WifiEnabled =", isWifiEnabled)
-            return isWifiEnabled
+            return isWifiEnabled == 1
         end)
     end
 

diff --git a/src/org/koreader/launcher/MainActivity.java b/src/org/koreader/launcher/MainActivity.java
@@ -158,17 +158,17 @@ public void run() {
         });
     }
 
-    public boolean isFullscreen() {
-    	return (getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;
+    public int isFullscreen() {
+    	return ((getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0) ? 1: 0;
     }
 
 
     public void setWifiEnabled(final boolean enabled) {
         this.getWifiManager().setWifiEnabled(enabled);
     }
 
-    public boolean isWifiEnabled() {
-        return this.getWifiManager().isWifiEnabled();
+    public int isWifiEnabled() {
+        return this.getWifiManager().isWifiEnabled() ? 1 : 0;
     }
 
     private WifiManager getWifiManager() {