diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-14 12:19:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 12:19:53 +0200 |
| commit | b24223c1788c2a898bc5154be919fca7cbfc20d4 (patch) | |
| tree | 33a8a5f7c0d73b78d7036e2acb198698e32a0057 /Source/Android | |
| parent | 5ab95d7f6a4f6c6cd4bd520b791466eeb8967abd (diff) | |
| parent | d64fc67b043e2950674cafe736324f6cf3928711 (diff) | |
Merge pull request #9135 from JosJuice/show-nkit
Show NKitness in file format string
Diffstat (limited to 'Source/Android')
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java index 17d04a6138..a6c0148032 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java @@ -90,7 +90,7 @@ public final class GameDetailsDialog extends DialogFragment long blockSize = gameFile.getBlockSize(); String compression = gameFile.getCompressionMethod(); - textFileFormat.setText(String.format("%1$s (%2$s)", gameFile.getBlobTypeString(), fileSize)); + textFileFormat.setText(String.format("%1$s (%2$s)", gameFile.getFileFormatName(), fileSize)); if (compression.isEmpty()) { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java index 9ac331c2b2..ad4c1b856a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java @@ -40,7 +40,7 @@ public class GameFile public native int getBlobType(); - public native String getBlobTypeString(); + public native String getFileFormatName(); public native long getBlockSize(); diff --git a/Source/Android/jni/GameList/GameFile.cpp b/Source/Android/jni/GameList/GameFile.cpp index 21e8aa24aa..bdb7f3d8bd 100644 --- a/Source/Android/jni/GameList/GameFile.cpp +++ b/Source/Android/jni/GameList/GameFile.cpp @@ -66,7 +66,7 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getRevision JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getBlobType(JNIEnv* env, jobject obj); JNIEXPORT jstring JNICALL -Java_org_dolphinemu_dolphinemu_model_GameFile_getBlobTypeString(JNIEnv* env, jobject obj); +Java_org_dolphinemu_dolphinemu_model_GameFile_getFileFormatName(JNIEnv* env, jobject obj); JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getBlockSize(JNIEnv* env, jobject obj); JNIEXPORT jstring JNICALL @@ -167,9 +167,9 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getBlobType } JNIEXPORT jstring JNICALL -Java_org_dolphinemu_dolphinemu_model_GameFile_getBlobTypeString(JNIEnv* env, jobject obj) +Java_org_dolphinemu_dolphinemu_model_GameFile_getFileFormatName(JNIEnv* env, jobject obj) { - return ToJString(env, DiscIO::GetName(GetRef(env, obj)->GetBlobType(), true)); + return ToJString(env, GetRef(env, obj)->GetFileFormatName()); } JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_getBlockSize(JNIEnv* env, |