ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11935 from nitanmarcel/patch-1 

Use getCacheDir if getExternalCacheDir returns null.
This commit is contained in:
JosJuice 2023-06-19 20:47:27 +02:00 committed by GitHub
parent cff3e22f84 cff7a4bfd2
commit 27db8d4123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -297,6 +297,8 @@ public final class NativeLibrary
public static native void SetCacheDirectory(String directory); public static native void SetCacheDirectory(String directory);
public static native String GetCacheDirectory();
public static native int DefaultCPUCore(); public static native int DefaultCPUCore();
public static native String GetDefaultGraphicsBackendName(); public static native String GetDefaultGraphicsBackendName();

9
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
View File

@ -122,7 +122,12 @@ public final class DirectoryInitialization
File cacheDir = context.getExternalCacheDir(); File cacheDir = context.getExternalCacheDir();
if (cacheDir == null) if (cacheDir == null)
return false; {
// In some custom ROMs getExternalCacheDir might return null for some reasons. If that is the case, fallback to getCacheDir which seems to work just fine.
cacheDir = context.getCacheDir();
if (cacheDir == null)
return false;
}
Log.debug("[DirectoryInitialization] Cache Dir: " + cacheDir.getPath()); Log.debug("[DirectoryInitialization] Cache Dir: " + cacheDir.getPath());
NativeLibrary.SetCacheDirectory(cacheDir.getPath()); NativeLibrary.SetCacheDirectory(cacheDir.getPath());
@ -236,7 +241,7 @@ public final class DirectoryInitialization
public static File getGameListCache(Context context) public static File getGameListCache(Context context)
{ {
return new File(context.getExternalCacheDir(), "gamelist.cache"); return new File(NativeLibrary.GetCacheDirectory(), "gamelist.cache");
} }
private static boolean copyAsset(String asset, File output, Context context) private static boolean copyAsset(String asset, File output, Context context)

6
Source/Android/jni/MainAndroid.cpp
View File

@ -382,6 +382,12 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetCacheDire
File::SetUserPath(D_CACHE_IDX, GetJString(env, jDirectory)); File::SetUserPath(D_CACHE_IDX, GetJString(env, jDirectory));
} }
JNIEXPORT jstring JNICALL
Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCacheDirectory(JNIEnv* env, jclass)
{
return ToJString(env, File::GetUserPath(D_CACHE_IDX));
}
JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_DefaultCPUCore(JNIEnv*, jclass) JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_DefaultCPUCore(JNIEnv*, jclass)
{ {
return static_cast<jint>(PowerPC::DefaultCPUCore()); return static_cast<jint>(PowerPC::DefaultCPUCore());