mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-20 17:47:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable arm64 as it worked; Add option to uninstall java runtime

Browse Source
This commit is contained in:
khanhduytran0
2020-09-20 12:40:08 +07:00
parent c99aab0e80
commit e3435c3cef
8 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@@ -41,8 +41,7 @@ public class PojavLoginActivity extends AppCompatActivity
private SharedPreferences firstLaunchPrefs;
// private final String PREF_IS_DONOTSHOWAGAIN_WARN = "isWarnDoNotShowAgain";
private final String PREF_IS_INSTALLED_LIBRARIES = "isLibrariesExtracted2";
private final String PREF_IS_INSTALLED_JAVARUNTIME = "isJavaRuntimeInstalled";
public static final String PREF_IS_INSTALLED_JAVARUNTIME = "isJavaRuntimeInstalled";
private boolean isInitCalled = false;
@Override
@@ -294,10 +293,6 @@ public class PojavLoginActivity extends AppCompatActivity
private boolean isJavaRuntimeInstalled() {
return firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false);
}
private boolean isLibrariesExtracted() {
return firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_LIBRARIES, false);
}
private boolean setPref(String prefName, boolean value) {
return firstLaunchPrefs.edit().putBoolean(prefName, value).commit();

1
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@@ -665,7 +665,6 @@ public final class Tools
return out;
}
// Current Useless below but keep it for future usage.
public static void deleteRecursive(File fileOrDirectory) {
try {
if (fileOrDirectory.isDirectory()) {

7
app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
View File

@@ -12,14 +12,9 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat
public void onCreatePreferences(Bundle b, String str) {
addPreferencesFromResource(R.xml.pref_main);
// Disable freeform mode in Android 6.0 or below.
// Disable freeform mode in Android 6.0 and below.
findPreference("freeform").setEnabled(Build.VERSION.SDK_INT >= 24);
SeekBarPreference seek1 = (SeekBarPreference) findPreference("maxDxRefs");
seek1.setMin(0xFFF);
seek1.setMax(0xFFFF);
seek1.setValue(0xFFF);
SeekBarPreference seek2 = (SeekBarPreference) findPreference("timeLongPressTrigger");
seek2.setMin(100);
seek2.setMax(1000);

35
app/src/main/java/net/kdt/pojavlaunch/prefs/UninstallJREDialogPreference.java Normal file
View File

@@ -0,0 +1,35 @@
package net.kdt.pojavlaunch.prefs;
import android.content.*;
import android.support.v7.preference.*;
import android.util.*;
import java.io.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.R;
import android.widget.*;
public class UninstallJREDialogPreference extends DialogPreference implements DialogInterface.OnClickListener
{
public UninstallJREDialogPreference(Context ctx) {
this(ctx, null);
}
public UninstallJREDialogPreference(Context ctx, AttributeSet attrs) {
super(ctx, attrs);
setDialogMessage(R.string.mcl_setting_title_uninstalljre);
setPositiveButtonText(android.R.string.ok);
setNegativeButtonText(android.R.string.cancel);
}
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
Tools.deleteRecursive(new File(Tools.homeJreDir));
getContext().getSharedPreferences("pojav_extract", Context.MODE_PRIVATE)
.edit().putBoolean(PojavLoginActivity.PREF_IS_INSTALLED_JAVARUNTIME, false).commit();
Toast.makeText(getContext(), R.string.toast_uninstalljre_done, Toast.LENGTH_SHORT).show();
}
}
}