From 2cef96b8fa4e29936f3b92bf6236710afac6c5d7 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Mon, 30 Nov 2020 19:31:02 +0700 Subject: [PATCH] Fix rumtime --- .github/workflows/android.yml | 2 +- .../main/java/net/kdt/pojavlaunch/PojavLoginActivity.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 923a081cb..8dcadd6b4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -26,7 +26,7 @@ jobs: - name: Build APK without runtime run: | - rm app/src/main/assets/components/jre/*.tar.xz + rm -r app/src/main/assets/components/jre ./gradlew assembleDebug mv app/build/outputs/apk/debug/app-debug.apk out/app-debug-noruntime.apk diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index c33990cdc..7adba7acd 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -306,12 +306,12 @@ public class PojavLoginActivity extends BaseActivity } private boolean isJavaRuntimeInstalled(AssetManager am) { + boolean prefValue = firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false); try { - - return firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false) && Tools.read(new FileInputStream(Tools.homeJreDir+"/version")).equals(Tools.read(am.open("components/jre/version"))); - }catch(IOException e) { + return prefValue && Tools.read(new FileInputStream(Tools.homeJreDir+"/version")).equals(Tools.read(am.open("components/jre/version"))); + } catch(IOException e) { Log.e("JVMCtl","failed to read file",e); - return firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false); + return prefValue; } }