LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-12 08:31:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Look in /sdcard/lovegame too in Android 9 and earlier for backward compatibility.

Browse Source 
See #194 for further explanation about this change.
This commit is contained in:
Miku AuahDark
2020-12-25 23:06:41 +08:00
parent 71c07360a5
commit aaae1f4392
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/AndroidManifest.xml
+1 -1
View File
@@ -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 -->
love/src/main/java/org/love2d/android/GameActivity.java
+16 -3
View File
@@ -38,6 +38,7 @@ import android.content.Intent;
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 @@ public class GameActivity extends SDLActivity {
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 class GameActivity extends SDLActivity {
}
} else {
self.checkLovegameFolder();
if (gamePath.length() > 0)
return gamePath;
}
return "";
return gamePath;
}
public static DisplayMetrics getMetrics() {