From affd87427980f3c85d8f90e22898b072f8d461de Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 12 Jun 2023 22:10:28 +0200 Subject: [PATCH] Update existing fonts.mpq --- .../main/java/org/diasurgical/devilutionx/DataActivity.java | 4 ++-- .../org/diasurgical/devilutionx/DevilutionXSDLActivity.java | 3 +++ .../org/diasurgical/devilutionx/ExternalFilesManager.java | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/android-project/app/src/main/java/org/diasurgical/devilutionx/DataActivity.java b/android-project/app/src/main/java/org/diasurgical/devilutionx/DataActivity.java index 1a51e61e4..93266a5af 100644 --- a/android-project/app/src/main/java/org/diasurgical/devilutionx/DataActivity.java +++ b/android-project/app/src/main/java/org/diasurgical/devilutionx/DataActivity.java @@ -101,8 +101,8 @@ public class DataActivity extends Activity { return true; } - if (lang.startsWith("ko") || lang.startsWith("zh") || lang.startsWith("ja")) { - File fonts_mpq = fileManager.getFile("/fonts.mpq"); + File fonts_mpq = fileManager.getFile("/fonts.mpq"); + if (lang.startsWith("ko") || lang.startsWith("zh") || lang.startsWith("ja") || fonts_mpq.exists()) { if (!fonts_mpq.exists() || fonts_mpq.length() == 53991069 /* v2 */) { if (!isDownloadingFonts) { fonts_mpq.delete(); diff --git a/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java b/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java index 1d7d416a1..a2209217b 100644 --- a/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java +++ b/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java @@ -82,6 +82,9 @@ public class DevilutionXSDLActivity extends SDLActivity { if (!fileManager.hasFile("fonts.mpq")) return true; } + if (fileManager.fileSize("fonts.mpq") == 53991069 /* v2 */) { + return true; + } return !fileManager.hasFile("diabdat.mpq") && !fileManager.hasFile("DIABDAT.MPQ") && diff --git a/android-project/app/src/main/java/org/diasurgical/devilutionx/ExternalFilesManager.java b/android-project/app/src/main/java/org/diasurgical/devilutionx/ExternalFilesManager.java index 3d8d2643f..96d6f7ec3 100644 --- a/android-project/app/src/main/java/org/diasurgical/devilutionx/ExternalFilesManager.java +++ b/android-project/app/src/main/java/org/diasurgical/devilutionx/ExternalFilesManager.java @@ -28,6 +28,11 @@ public class ExternalFilesManager { return file.exists(); } + public long fileSize(String fileName) { + File file = getFile(fileName); + return file.length(); + } + public File getFile(String fileName) { return new File(externalFilesDirectory + "/" + fileName); }