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

Minor reformat and fix.

Browse Source
This commit is contained in:
Miku AuahDark
2024-01-26 23:18:54 +08:00
parent fc6053974f
commit a712164440
4 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/love2d/android/GameActivity.java
+25 -23
View File
@@ -20,11 +20,6 @@
package org.love2d.android;
import androidx.annotation.Keep;
import androidx.core.app.ActivityCompat;
import org.libsdl.app.SDLActivity;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
@@ -43,6 +38,11 @@ import android.util.Log;
import android.view.DisplayCutout;
import android.view.WindowManager;
import androidx.annotation.Keep;
import androidx.core.app.ActivityCompat;
import org.libsdl.app.SDLActivity;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -75,7 +75,7 @@ public class GameActivity extends SDLActivity {
@Override
protected String[] getLibraries() {
return new String[] {
return new String[]{
"c++_shared",
"SDL2",
"oboe",
@@ -193,15 +193,12 @@ public class GameActivity extends SDLActivity {
}
}
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException e) {
// Ignored
}
try {
inputStream.close();
} catch (IOException ignored) {
}
return inputStream != null;
return true;
}
@Keep
@@ -235,7 +232,7 @@ public class GameActivity extends SDLActivity {
HashMap<String, Boolean> map = buildFileTree(getAssets(), "", new HashMap<>());
ArrayList<String> result = new ArrayList<>();
for (Map.Entry<String, Boolean> data: map.entrySet()) {
for (Map.Entry<String, Boolean> data : map.entrySet()) {
result.add((data.getValue() ? "d" : "f") + data.getKey());
}
@@ -418,13 +415,12 @@ public class GameActivity extends SDLActivity {
// Mark as file
map.put(dir, true);
// This Object comparison is intentional.
if (strippedDir != dir) {
if (!strippedDir.equals(dir)) {
map.put(strippedDir, true);
}
if (list != null) {
for (String path: list) {
for (String path : list) {
buildFileTree(assetManager, dir + path + "/", map);
}
}
@@ -440,6 +436,10 @@ public class GameActivity extends SDLActivity {
try {
ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r");
if (pfd == null) {
throw new RuntimeException("pfd is null");
}
fd = pfd.dup().detachFd();
pfd.close();
} catch (Exception e) {
@@ -453,12 +453,14 @@ public class GameActivity extends SDLActivity {
String scheme = game.getScheme();
String path = game.getPath();
if (scheme.equals("content")) {
// Convert the URI to file descriptor.
args = new String[] {"/love2d://fd/" + convertToFileDescriptor(game)};
} else if (scheme.equals("file")) {
// Regular file, pass as-is.
args = new String[] {path};
if (scheme != null) {
if (scheme.equals("content")) {
// Convert the URI to file descriptor.
args = new String[]{"/love2d://fd/" + convertToFileDescriptor(game)};
} else if (scheme.equals("file")) {
// Regular file, pass as-is.
args = new String[]{path};
}
}
}
}