From 584ba8efa1cfaac72fb94fe4ebd0c06b76ce3e74 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 19 Dec 2020 11:04:00 +0700 Subject: [PATCH] [JRE auto install] Fix a check --- .../java/net/kdt/pojavlaunch/PojavLoginActivity.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index 9b16da338..f677dbb4d 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -374,9 +374,10 @@ public class PojavLoginActivity extends BaseActivity if(!installRuntimeAutomatically(am)) { File jreTarFile = selectJreTarFile(); uncompressTarXZ(jreTarFile, new File(Tools.DIR_HOME_JRE)); + } else { + Tools.copyAssetFile(this, "components/jre/version", Tools.DIR_HOME_JRE + "/","version", true); } firstLaunchPrefs.edit().putBoolean(PREF_IS_INSTALLED_JAVARUNTIME, true).commit(); - Tools.copyAssetFile(this, "components/jre/version", Tools.DIR_HOME_JRE + "/","version", true); } JREUtils.relocateLibPath(this); @@ -395,7 +396,15 @@ public class PojavLoginActivity extends BaseActivity Tools.showError(this, e); } } + private boolean installRuntimeAutomatically(AssetManager am) { + try { + am.open("components/jre/version"); + } catch (IOException e) { + Log.e("JREAuto", "JRE was not included on this APK.", e); + return false; + } + File rtUniversal = new File(Tools.DIR_HOME_JRE+"/universal.tar.xz"); File rtPlatformDependent = new File(Tools.DIR_HOME_JRE+"/cust-bin.tar.xz"); if(!new File(Tools.DIR_HOME_JRE).exists()) new File(Tools.DIR_HOME_JRE).mkdirs(); else {