fix crash by minifyEnabled release, extern sd card display

YuriSizuku · Feb 26, 2023 · ffab65d · ffab65d
1 parent 0d27099
commit ffab65d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/onsyuri_android/app/build.gradle b/src/onsyuri_android/app/build.gradle
@@ -50,7 +50,8 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled true // this may cause jni crash
+            debuggable false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }

diff --git a/src/onsyuri_android/app/java/com/yuri/onscripter/SafFile.java b/src/onsyuri_android/app/java/com/yuri/onscripter/SafFile.java
@@ -152,10 +152,10 @@ public static String uri2Path(@NonNull Uri uri){
         // uri format
         String scheme = uri.getScheme();
         if(scheme.equals("content")) {
-            String path = uri.getLastPathSegment();
-            if(!path.contains("primary:")) path = "/" + path.replace("%3A", "/");
+            String path = uri.getLastPathSegment(); //already decoded
+            if(!path.contains("primary:")) path = "/storage/" + path.replace(":", "/");
             else path = "/storage/emulated/0/" + path.replace("primary:", "");
-            return  Uri.decode(path);
+            return  path;
         } else if (scheme.equals("file")) {
             return Uri.decode(uri.getPath());
         }

diff --git a/src/onsyuri_android/app/proguard-rules.pro b/src/onsyuri_android/app/proguard-rules.pro
@@ -12,6 +12,14 @@
 #   public *;
 #}
 
+-keep class com.yuri.onscripter.ONScripter {
+    public *;
+}
+
+-keep class org.libsdl.app.** {
+    public *;
+}
+
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
 #-keepattributes SourceFile,LineNumberTable