Merge pull request #23 from DerGoogler/1.6.3

1.6.3
DerGoogler · Sep 17, 2023 · 580cbe0 · 580cbe0
2 parents 031aaf1 + a2201bf
commit 580cbe0
Show file tree

Hide file tree

Showing 94 changed files with 27,281 additions and 10,782 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId 'com.dergoogler.mmrl'
         minSdk 26
         targetSdk 33
-        versionName '1.6.2'
-        versionCode 162
+        versionName '1.6.3'
+        versionCode 163
         externalNativeBuild {
             cmake {
                 cppFlags "-llog"

diff --git a/Android/app/release/output-metadata.json b/Android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 161,
-      "versionName": "1.6.1",
+      "versionCode": 163,
+      "versionName": "1.6.3",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <queries>
         <package android:name="com.topjohnwu.magisk" />
         <package android:name="io.github.huskydg.magisk" />
+        <package android:name="me.weishu.kernelsu" />
     </queries>
 
     <application

diff --git a/Android/app/src/main/java/com/dergoogler/core/NativeEnvironment.java b/Android/app/src/main/java/com/dergoogler/core/NativeEnvironment.java
@@ -0,0 +1,36 @@
+package com.dergoogler.core;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.os.Environment;
+import android.webkit.JavascriptInterface;
+
+public class NativeEnvironment {
+
+    private final Context ctx;
+
+    public NativeEnvironment(Context ctx) {
+        this.ctx = ctx;
+    }
+
+    @JavascriptInterface
+    public String getExternalStorageDir() {
+        return Environment.getExternalStorageDirectory().getAbsolutePath();
+    }
+
+    @JavascriptInterface
+    public String getPackageDataDir() {
+        return this.ctx.getExternalFilesDir(null).getAbsolutePath();
+    }
+
+    @JavascriptInterface
+    public String getPublicDir(String type) {
+        return Environment.getExternalStoragePublicDirectory(type).getAbsolutePath();
+    }
+
+    @JavascriptInterface
+    public String getDataDir() {
+        return new ContextWrapper(this.ctx).getFilesDir().getPath();
+    }
+
+}
diff --git a/Android/app/src/main/java/com/dergoogler/core/NativeFs.java b/Android/app/src/main/java/com/dergoogler/core/NativeFs.java
diff --git a/Android/app/src/main/java/com/dergoogler/core/NativeShell.java b/Android/app/src/main/java/com/dergoogler/core/NativeShell.java
@@ -7,6 +7,7 @@
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
 
+import java.io.IOException;
 import java.util.ArrayList;
 
 
@@ -28,6 +29,27 @@ public String result(String command) {
         return ShellUtils.fastCmd(command);
     }
 
+    @JavascriptInterface
+    public void isSuccess(String command) {
+        Shell.cmd(command).exec().isSuccess();
+    }
+
+    @JavascriptInterface
+    public void getCode(String command) {
+        Shell.cmd(command).exec().getCode();
+    }
+
+    @JavascriptInterface
+    public boolean isSuAvailable() {
+        try {
+            Runtime.getRuntime().exec("su --version");
+            return true;
+        } catch (IOException e) {
+            // java.io.IOException: Cannot run program "su": error=2, No such file or directory
+            return false;
+        }
+    }
+
     @JavascriptInterface
     public boolean isAppGrantedRoot() {
         return Shell.cmd("if grep ' / ' /proc/mounts | grep -q '/dev/root' &> /dev/null; " +