mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-18 16:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Version type release always checked. Little improve

Browse Source
This commit is contained in:
khanhduytran0
2020-05-12 05:49:59 +07:00
parent 4f5a750c12
commit 2075a70f85
7 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -8,8 +8,8 @@ android {
applicationId "net.kdt.pojavlaunch"
minSdkVersion 21
targetSdkVersion 25
versionCode 7
versionName "3.0.1_preview3_20200511"
versionCode 8
versionName "3.0.1_preview4_20200511"
}
buildTypes {

21
app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
View File

@@ -123,10 +123,8 @@ public class MCLauncherActivity extends AppCompatActivity
tvUsernameView.setText(profile.getUsername());
} catch(Exception e) {
//Tools.throwError(this, e);
e.printStackTrace();
toast(getStr(R.string.toast_login_error) + " " + e.getMessage());
finish();
Tools.showError(this, getStr(R.string.toast_login_error), e, true);
}
//showProfileInfo();
@@ -136,16 +134,15 @@ public class MCLauncherActivity extends AppCompatActivity
try {
if (fVers.listFiles().length < 1) {
throw new Exception(getStr(R.string.error_no_version));
versions.add(getStr(R.string.error_no_version));
}
for (File fVer : fVers.listFiles()) {
versions.add(fVer.getName());
}
} catch (Exception e) {
versions.add(getStr(R.string.global_error) + ":");
versions.add(e.getMessage());
} catch (Throwable th) {
th.printStackTrace();
Tools.showError(this, th);
} finally {
availableVersions = versions.toArray(new String[0]);
}
@@ -177,7 +174,7 @@ public class MCLauncherActivity extends AppCompatActivity
{
try{
versionList = gson.fromJson(DownloadUtils.downloadString("https://launchermeta.mojang.com/mc/game/version_manifest.json"), JMinecraftVersionList.class);
ArrayList<String> versionStringList = filter(versionList.versions, new File(Tools.versnDir).listFiles());
ArrayList<String> versionStringList = filterDuplicate(versionList.versions, new File(Tools.versnDir).listFiles());
return versionStringList;
} catch (Exception e){
@@ -275,14 +272,16 @@ public class MCLauncherActivity extends AppCompatActivity
return Tools.getVersionInfo(version);
}
private ArrayList<String> filter(JMinecraftVersionList.Version[] list1, File[] list2) {
private ArrayList<String> filterDuplicate(JMinecraftVersionList.Version[] list1, File[] list2) {
ArrayList<String> output = new ArrayList<String>();
for (JMinecraftVersionList.Version value1: list1) {
if ((value1.type.equals("release") && LauncherPreferences.PREF_VERTYPE_RELEASE) ||
(value1.type.equals("snapshot") && LauncherPreferences.PREF_VERTYPE_SNAPSHOT) ||
(value1.type.equals("old_alpha") && LauncherPreferences.PREF_VERTYPE_OLDALPHA) ||
(value1.type.equals("old_beta") && LauncherPreferences.PREF_VERTYPE_OLDBETA)) {
(value1.type.equals("old_beta") && LauncherPreferences.PREF_VERTYPE_OLDBETA) ||
// Should be it?
(value1.type.equals("custom"))) {
output.add(value1.id);
}
}

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

@@ -49,7 +49,7 @@ public class PojavLoginActivity extends MineActivity
super.onCreate(savedInstanceState, false);
// TODO remove after translations like Vietnamese are done.
Tools.setLocale(this, Locale.ENGLISH);
// Tools.setLocale(this, Locale.ENGLISH);
if (!isInitCalled) {
init();
@@ -231,22 +231,8 @@ public class PojavLoginActivity extends MineActivity
setPref(PREF_IS_INSTALLED_OPENJDK, true);
} catch (Throwable e) {
Throwable causedTh = e.getCause();
while (true) {
Throwable preCausedTh = causedTh.getCause();
if (preCausedTh == null) {
Throwable shellTh = new Throwable(shellLog.toString());
shellTh.setStackTrace(new StackTraceElement[0]);
causedTh.initCause(shellTh);
break;
} else {
causedTh = preCausedTh;
}
}
// Tools.dialogOnUiThread(PojavLoginActivity.this, "Error!", Log.getStackTraceString(e) + "\n\nShell log:\n" + shellLog);
Tools.showError(PojavLoginActivity.this, e, true);
Tools.dialogOnUiThread(PojavLoginActivity.this, "Error!", Log.getStackTraceString(e) + "\n\nShell log:\n" + shellLog);
// Tools.showError(PojavLoginActivity.this, e, true);
}
}

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

@@ -329,6 +329,13 @@ public final class Tools
.setTitle(title)
.setMessage(message)
.setPositiveButton(android.R.string.ok, null)
.setNegativeButton(android.R.string.copy, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2)
{
((android.content.ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE)).setText(message);
}
})
.show();
}
});

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

@@ -4,6 +4,7 @@ import android.os.*;
import net.kdt.pojavlaunch.*;
import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.SeekBarPreference;
import android.support.v7.preference.CheckBoxPreference;
public class LauncherPreferenceFragment extends PreferenceFragmentCompat
{
@@ -14,6 +15,9 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat
// Disable freeform mode in Android 6.0 or below.
findPreference("freeform").setEnabled(Build.VERSION.SDK_INT >= 24);
// Is Release always to be checked?
((CheckBoxPreference) findPreference("vertype_release")).setChecked(true);
SeekBarPreference seek2 = (SeekBarPreference) findPreference("timeLongPressTrigger");
seek2.setMin(100);
seek2.setMax(1000);

1
app/src/main/res/xml/pref_main.xml
View File

@@ -29,6 +29,7 @@
android:title="@string/mcl_setting_category_veroption">
<android.support.v7.preference.CheckBoxPreference
android:enabled="false"
android:defaultValue="true"
android:key="vertype_release"
android:title="@string/mcl_setting_veroption_release" />

0
app/src/main/res/values-vi/strings.xml → app/src/main/res_disabled/values-vi/strings.xml
View File