From 2c8b2139114413d88fa2a5e939e752dbe6648a9d Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 5 Dec 2020 11:50:46 +0700 Subject: [PATCH] Another string change; Little smaller code --- .../main/java/net/kdt/pojavlaunch/PojavLoginActivity.java | 8 +++----- app/src/main/java/net/kdt/pojavlaunch/Tools.java | 4 ++-- app/src/main/res/values/strings.xml | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index 920cb6ae1..a466b4363 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -366,11 +366,9 @@ public class PojavLoginActivity extends BaseActivity } } else { FileInputStream fis = new FileInputStream(new File(Tools.MAIN_PATH + "/lwjgl3/version")); - byte[] release1 = new byte[is.available()]; - byte[] release2 = new byte[fis.available()]; - is.read(release1); - fis.read(release2); - if (!Arrays.equals(release1,release2)) { + String release1 = Tools.read(is); + String release2 = Tools.read(fis); + if (!release1.equals(release2)) { String[] lwjglFileList = am.list("components/lwjgl3"); for (String s : lwjglFileList) { Tools.copyAssetFile(this, "components/lwjgl3/" + s, Tools.MAIN_PATH+"/lwjgl3/",s, true); diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 5429b1057..874655086 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -375,7 +375,7 @@ public final class Tools throw new RuntimeException("Unable to copy " + fileName + " to " + output + "/" + outputName, th); } } - +/* public static void extractAssetFolder(Activity ctx, String path, String output) throws Exception { extractAssetFolder(ctx, path, output, false); } @@ -399,7 +399,7 @@ public final class Tools showError(ctx, e); } } - +*/ public static void showError(Context ctx, Throwable e) { showError(ctx, e, false); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a9859141e..b67249f3c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -182,12 +182,12 @@ Log output Input Debug Send custom keycode - + Edit %s - %s will be removed + Remove %s? Keycode Special Key