Look in /sdcard/lovegame too in Android 9 and earlier for backward co…

…mpatibility. See #194 for further explanation about this change.
love2d · Dec 25, 2020 · aaae1f4 · aaae1f4
1 parent 71c0736
commit aaae1f4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
 
   <!-- OpenGL ES 2.0 -->

diff --git a/love/src/main/java/org/love2d/android/GameActivity.java b/love/src/main/java/org/love2d/android/GameActivity.java
@@ -38,6 +38,7 @@
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Vibrator;
 import android.util.Log;
 import android.util.DisplayMetrics;
@@ -251,7 +252,21 @@ protected void checkLovegameFolder() {
             File ext = getExternalFilesDir("games");
             if ((new File(ext, "/lovegame/main.lua")).exists()) {
                 gamePath = ext.getPath() + "/lovegame/";
+                storagePermissionUnnecessary = true;
+            } else if (android.os.Build.VERSION.SDK_INT <= 28) {
+                // Try to fallback to /sdcard/lovegame in Android 9 and earlier too.
+                if (hasExternalStoragePermission()) {
+                    ext = Environment.getExternalStorageDirectory();
+                    if ((new File(ext, "/lovegame/main.lua")).exists()) {
+                        gamePath = ext.getPath() + "/lovegame/";
+                        storagePermissionUnnecessary = false;
+                    }
+                } else {
+                    Log.d("GameActivity", "Cannot load game from /sdcard/lovegame: permission not granted");
+                }
             }
+
+            Log.d("GameActivity", "lovegame directory: " + gamePath);
         }
     }
 
@@ -308,11 +323,9 @@ public static String getGamePath() {
             }
         } else {
             self.checkLovegameFolder();
-            if (gamePath.length() > 0)
-                return gamePath;
         }
 
-        return "";
+        return gamePath;
     }
 
     public static DisplayMetrics getMetrics() {