TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 09:07:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Account manager changes

Browse Source 
- Fix account parsing gives wrong behavior.
- Use popup menu to select/remove instead of click/hold.
This commit is contained in:
khanhduytran0 2020-12-23 15:51:25 +07:00
parent 9ef0ddde27
commit 3ff44f863f
7 changed files with 117 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCProfile.java
View File

@ -24,8 +24,8 @@ public class MCProfile
ctx.startActivity(intent); ctx.startActivity(intent);
} }
public static void updateTokens(final Activity ctx, final String pofFilePath, RefreshListener listen) throws Exception { public static void updateTokens(final Activity ctx, final String name, RefreshListener listen) throws Exception {
new RefreshTokenTask(ctx, listen).execute(pofFilePath); new RefreshTokenTask(ctx, listen).execute(Tools.DIR_ACCOUNT_NEW + "/" + name + ".json");
} }
public static String build(MCProfile.Builder builder) { public static String build(MCProfile.Builder builder) {

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
View File

@ -110,7 +110,9 @@ public class PojavLauncherActivity extends BaseLauncherActivity
if (tempProfile != null) { if (tempProfile != null) {
accountList.add(tempProfile.username); accountList.add(tempProfile.username);
} }
accountList.addAll(Arrays.asList(new File(Tools.DIR_ACCOUNT_OLD).list())); for (String s : new File(Tools.DIR_ACCOUNT_NEW).list()) {
accountList.add(s.substring(0, s.length() - 5));
}
ArrayAdapter<String> adapterAcc = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, accountList); ArrayAdapter<String> adapterAcc = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, accountList);
adapterAcc.setDropDownViewResource(android.R.layout.simple_list_item_single_choice); adapterAcc.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
@ -132,7 +134,7 @@ public class PojavLauncherActivity extends BaseLauncherActivity
if (tempProfile != null && position == 0) { if (tempProfile != null && position == 0) {
PojavProfile.setCurrentProfile(PojavLauncherActivity.this, tempProfile); PojavProfile.setCurrentProfile(PojavLauncherActivity.this, tempProfile);
} else { } else {
PojavProfile.setCurrentProfile(PojavLauncherActivity.this, Tools.DIR_ACCOUNT_OLD + "/" + accountList.get(position + (tempProfile != null ? 1 : 0))); PojavProfile.setCurrentProfile(PojavLauncherActivity.this, Tools.DIR_ACCOUNT_NEW + "/" + accountList.get(position + (tempProfile != null ? 1 : 0)) + ".json");
} }
pickAccount(); pickAccount();
} }

192
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -290,7 +290,9 @@ public class PojavLoginActivity extends BaseActivity
private boolean isJavaRuntimeInstalled(AssetManager am) { private boolean isJavaRuntimeInstalled(AssetManager am) {
boolean prefValue = firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false); boolean prefValue = firstLaunchPrefs.getBoolean(PREF_IS_INSTALLED_JAVARUNTIME, false);
try { try {
return prefValue && (am.open("components/jre/bin-" + Tools.CURRENT_ARCHITECTURE.split("/")[0] + ".tar.xz") == null || Tools.read(new FileInputStream(Tools.DIR_HOME_JRE+"/version")).equals(Tools.read(am.open("components/jre/version")))); return prefValue && (
am.open("components/jre/bin-" + Tools.CURRENT_ARCHITECTURE.split("/")[0] + ".tar.xz") == null ||
Tools.read(new FileInputStream(Tools.DIR_HOME_JRE+"/version")).equals(Tools.read(am.open("components/jre/version"))));
} catch(IOException e) { } catch(IOException e) {
Log.e("JVMCtl","failed to read file",e); Log.e("JVMCtl","failed to read file",e);
return prefValue; return prefValue;
@ -330,7 +332,8 @@ public class PojavLoginActivity extends BaseActivity
try { try {
new CustomControls(this).save(Tools.CTRLDEF_FILE); new CustomControls(this).save(Tools.CTRLDEF_FILE);
Tools.copyAssetFile(this, "components/ForgeInstallerHeadless/forge-installer-headless-1.0.1.jar", Tools.DIR_GAME_NEW + "/config", "forge-installer-headless.jar", true); Tools.copyAssetFile(this, "components/ForgeInstallerHeadless/forge-installer-headless-1.0.1.jar",
Tools.DIR_GAME_NEW + "/config", "forge-installer-headless.jar", true);
Tools.copyAssetFile(this, "components/security/pro-grade.jar", Tools.DIR_DATA, true); Tools.copyAssetFile(this, "components/security/pro-grade.jar", Tools.DIR_DATA, true);
Tools.copyAssetFile(this, "components/security/java_sandbox.policy", Tools.DIR_DATA, true); Tools.copyAssetFile(this, "components/security/java_sandbox.policy", Tools.DIR_DATA, true);
Tools.copyAssetFile(this, "options.txt", Tools.DIR_GAME_NEW, false); Tools.copyAssetFile(this, "options.txt", Tools.DIR_GAME_NEW, false);
@ -440,7 +443,8 @@ public class PojavLoginActivity extends BaseActivity
os.close(); os.close();
uncompressTarXZ(rtPlatformDependent, new File(Tools.DIR_HOME_JRE)); uncompressTarXZ(rtPlatformDependent, new File(Tools.DIR_HOME_JRE));
} catch (IOException e) { } catch (IOException e) {
//Something's very wrong, or user's using an unsupported arch (MIPS phone? ARMv6 phone?), in both cases, redirecting to manual install, and removing the universal stuff // Something's very wrong, or user's using an unsupported arch (MIPS phone? ARMv6 phone?),
// in both cases, redirecting to manual install, and removing the universal stuff
for (File f : new File(Tools.DIR_HOME_JRE).listFiles()) { for (File f : new File(Tools.DIR_HOME_JRE).listFiles()) {
if (f.isDirectory()){ if (f.isDirectory()){
try { try {
@ -608,7 +612,12 @@ public class PojavLoginActivity extends BaseActivity
*/ */
public void loginMicrosoft(View view) { public void loginMicrosoft(View view) {
CustomTabs.openTab(this, "https://login.live.com/oauth20_authorize.srf?client_id=00000000402b5328&response_type=code&scope=service%3A%3Auser.auth.xboxlive.com%3A%3AMBI_SSL&redirect_url=https%3A%2F%2Flogin.live.com%2Foauth20_desktop.srf"); CustomTabs.openTab(this,
"https://login.live.com/oauth20_authorize.srf" +
"?client_id=00000000402b5328" +
"&response_type=code" +
"&scope=service%3A%3Auser.auth.xboxlive.com%3A%3AMBI_SSL" +
"&redirect_url=https%3A%2F%2Flogin.live.com%2Foauth20_desktop.srf");
} }
@Override @Override
@ -644,6 +653,18 @@ public class PojavLoginActivity extends BaseActivity
} }
} }
private View getViewFromList(int pos, ListView listView) {
final int firstItemPos = listView.getFirstVisiblePosition();
final int lastItemPos = firstItemPos + listView.getChildCount() - 1;
if (pos < firstItemPos || pos > lastItemPos ) {
return listView.getAdapter().getView(pos, null, listView);
} else {
final int childIndex = pos - firstItemPos;
return listView.getChildAt(childIndex);
}
}
public void loginSavedAcc(View view) { public void loginSavedAcc(View view) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
@ -660,105 +681,80 @@ public class PojavLoginActivity extends BaseActivity
}); });
} }
final ArrayAdapter<String> listAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
for (String s : new File(Tools.DIR_ACCOUNT_NEW).list()) {
listAdapter.add(s.substring(0, s.length() - 5));
}
builder.setPositiveButton(android.R.string.cancel, null); builder.setPositiveButton(android.R.string.cancel, null);
builder.setTitle(this.getString(R.string.login_select_account)); builder.setTitle(this.getString(R.string.login_select_account));
final AlertDialog dialog = builder.create(); builder.setMessage(R.string.hint_select_account);
builder.setSingleChoiceItems(listAdapter, 0, new DialogInterface.OnClickListener(){
/*
LinearLayout.LayoutParams lpHint, lpFlv;
lpHint = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
lpFlv = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
lpHint.weight = 1;
lpFlv.weight = 1;
*/
dialog.setTitle(this.getString(R.string.login_select_account));
System.out.println("Setting title...");
LinearLayout dialay = new LinearLayout(this);
dialay.setOrientation(LinearLayout.VERTICAL);
TextView fhint = new TextView(this);
fhint.setText(R.string.hint_select_account);
// fhint.setLayoutParams(lpHint);
final FileListView flv = new FileListView(dialog);
// flv.setLayoutParams(lpFlv);
flv.lockPathAt(Tools.DIR_ACCOUNT_NEW);
flv.setFileSelectedListener(new FileSelectedListener(){
@Override @Override
public void onFileLongClick(final File file, String path) public void onClick(final DialogInterface di, final int selectedIndex) {
{ PopupMenu popup = new PopupMenu(PojavLoginActivity.this, getViewFromList(selectedIndex, ((AlertDialog) di).getListView()));
AlertDialog.Builder builder2 = new AlertDialog.Builder(PojavLoginActivity.this); popup.inflate(R.menu.menu_options_account);
builder2.setTitle(file.getName()); popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
builder2.setMessage(R.string.warning_remove_account);
builder2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@Override @Override
public void onClick(DialogInterface p1, int p2) { public boolean onMenuItemClick(MenuItem item) {
new InvalidateTokenTask(PojavLoginActivity.this).execute(file.getAbsolutePath()); final String selectedAccName = listAdapter.getItem(selectedIndex);
flv.refreshPath(); switch (item.getItemId()) {
} case R.id.menu_account_select:
});
builder2.setNegativeButton(android.R.string.cancel, null);
builder2.show();
}
@Override
public void onFileSelected(File file, final String path) {
try {
MinecraftAccount acc = MinecraftAccount.load(path);
if (acc.isMicrosoft){
new MicrosoftAuthTask(PojavLoginActivity.this, new RefreshListener(){
@Override
public void onFailed(Throwable e) {
Tools.showError(PojavLoginActivity.this, e);
}
@Override
public void onSuccess(MinecraftAccount b) {
mProfile = b;
playProfile(true);
}
}).execute("true", acc.msaRefreshToken);
} else if (acc.accessToken.length() >= 5) {
MCProfile.updateTokens(PojavLoginActivity.this, path, new RefreshListener(){
@Override
public void onFailed(Throwable e)
{
Tools.showError(PojavLoginActivity.this, e);
}
@Override
public void onSuccess(MinecraftAccount unused)
{
try { try {
mProfile = MinecraftAccount.load(path); RefreshListener authListener = new RefreshListener(){
playProfile(true); @Override
} catch (Throwable e) { public void onFailed(Throwable e) {
Tools.showError(PojavLoginActivity.this, e);
}
@Override
public void onSuccess(MinecraftAccount out) {
di.dismiss();
mProfile = out;
playProfile(true);
}
};
MinecraftAccount acc = MinecraftAccount.load(selectedAccName);
if (acc.isMicrosoft){
new MicrosoftAuthTask(PojavLoginActivity.this, authListener)
.execute("true", acc.msaRefreshToken);
} else if (acc.accessToken.length() >= 5) {
MCProfile.updateTokens(PojavLoginActivity.this, selectedAccName, authListener);
} else {
di.dismiss();
MCProfile.launch(PojavLoginActivity.this, selectedAccName);
}
} catch (Exception e) {
Tools.showError(PojavLoginActivity.this, e); Tools.showError(PojavLoginActivity.this, e);
} }
} break;
});
} else { case R.id.menu_account_remove:
MCProfile.launch(PojavLoginActivity.this, path); AlertDialog.Builder builder2 = new AlertDialog.Builder(PojavLoginActivity.this);
} builder2.setTitle(selectedAccName);
builder2.setMessage(R.string.warning_remove_account);
dialog.hide(); builder2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
//Tools.throwError(MCLoginActivity.this, new Exception(builder.getAccessToken() + "," + builder.getUUID() + "," + builder.getNickname() + "," + builder.getEmail() + "," + builder.getPassword()));
} @Override
catch (Exception e) public void onClick(DialogInterface p1, int p2) {
{ new InvalidateTokenTask(PojavLoginActivity.this)
Tools.showError(PojavLoginActivity.this, e); .execute(Tools.DIR_ACCOUNT_NEW + "/" + selectedAccName + ".json");
} listAdapter.remove(selectedAccName);
listAdapter.notifyDataSetChanged();
}
});
builder2.setNegativeButton(android.R.string.cancel, null);
builder2.show();
break;
}
return true;
}
});
popup.show();
} }
}); });
dialay.addView(fhint); builder.show();
dialay.addView(flv);
dialog.setView(dialay);
dialog.setTitle(this.getString(R.string.login_select_account));
dialog.show();
} }
private MinecraftAccount loginOffline() { private MinecraftAccount loginOffline() {
@ -769,7 +765,7 @@ public class PojavLoginActivity extends BaseActivity
edit2.setError(getResources().getString(R.string.global_error_field_empty)); edit2.setError(getResources().getString(R.string.global_error_field_empty));
} else if(text.length() <= 2){ } else if(text.length() <= 2){
edit2.setError(getResources().getString(R.string.login_error_short_username)); edit2.setError(getResources().getString(R.string.login_error_short_username));
} else if(new File(Tools.DIR_ACCOUNT_OLD + "/" + text).exists()){ } else if(new File(Tools.DIR_ACCOUNT_NEW + "/" + text + ".json").exists()){
edit2.setError(getResources().getString(R.string.login_error_exist_username)); edit2.setError(getResources().getString(R.string.login_error_exist_username));
} else{ } else{
MinecraftAccount builder = new MinecraftAccount(); MinecraftAccount builder = new MinecraftAccount();
@ -805,7 +801,8 @@ public class PojavLoginActivity extends BaseActivity
@Override @Override
public void onLoginDone(String[] result) { public void onLoginDone(String[] result) {
if(result[0].equals("ERROR")){ if(result[0].equals("ERROR")){
Tools.dialogOnUiThread(PojavLoginActivity.this, getResources().getString(R.string.global_error), strArrToString(result)); Tools.dialogOnUiThread(PojavLoginActivity.this,
getResources().getString(R.string.global_error), strArrToString(result));
} else{ } else{
MinecraftAccount builder = new MinecraftAccount(); MinecraftAccount builder = new MinecraftAccount();
builder.accessToken = result[1]; builder.accessToken = result[1];
@ -863,7 +860,8 @@ public class PojavLoginActivity extends BaseActivity
//Requesting permission //Requesting permission
private void requestStoragePermission() private void requestStoragePermission()
{ {
ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_STORAGE_REQUEST_CODE); ActivityCompat.requestPermissions(this, new String[]{
Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, REQUEST_STORAGE_REQUEST_CODE);
} }
// This method will be called when the user will tap on allow or deny // This method will be called when the user will tap on allow or deny

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java
View File

@ -41,7 +41,11 @@ public class PojavProfile
Tools.showError(ctx, e); Tools.showError(ctx, e);
} }
} else if (obj instanceof String) { } else if (obj instanceof String) {
pref.putString(PROFILE_PREF_FILE, (String) obj); String acc = (String) obj;
pref.putString(PROFILE_PREF_FILE,
acc.startsWith("/") ?
acc :
Tools.DIR_ACCOUNT_NEW + "/" + acc + ".json");
MinecraftAccount.clearTempAccount(); MinecraftAccount.clearTempAccount();
} else if (obj == null) { } else if (obj == null) {
pref.putString(PROFILE_PREF_FILE, ""); pref.putString(PROFILE_PREF_FILE, "");

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
View File

@ -26,8 +26,8 @@ public class MinecraftAccount
return Tools.GLOBAL_GSON.fromJson(content, MinecraftAccount.class); return Tools.GLOBAL_GSON.fromJson(content, MinecraftAccount.class);
} }
public static MinecraftAccount load(String path) throws IOException, JsonSyntaxException { public static MinecraftAccount load(String name) throws IOException, JsonSyntaxException {
MinecraftAccount acc = parse(Tools.read(path)); MinecraftAccount acc = parse(Tools.read(Tools.DIR_ACCOUNT_NEW + "/" + name + ".json"));
if (acc.accessToken == null) { if (acc.accessToken == null) {
acc.accessToken = "0"; acc.accessToken = "0";
} if (acc.profileId == null) { } if (acc.profileId == null) {

9
app_pojavlauncher/src/main/res/menu/menu_options_account.xml Normal file
View File

@ -0,0 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_account_select"
android:title="@string/login_select_account"/>
<item
android:id="@+id/menu_account_remove"
android:title="@string/global_remove"/>
</menu>

1
app_pojavlauncher/src/main/res/values/strings.xml
View File

@ -33,7 +33,6 @@
<string name="login_select_account">Select account</string> <string name="login_select_account">Select account</string>
<!-- Hint --> <!-- Hint -->
<string name="hint_select_account">To select, click it. To delete an account, hold it.</string>
<string name="hint_control_mapping">"Swipe from right to left to open menu ◀\nHold a button to customize: edit, resize or delete."</string> <string name="hint_control_mapping">"Swipe from right to left to open menu ◀\nHold a button to customize: edit, resize or delete."</string>
<!-- Warnings --> <!-- Warnings -->