From 791afe14c94a24c78c4f74e023aceabe9bb7134c Mon Sep 17 00:00:00 2001
From: alexytomi <60690056+alexytomi@users.noreply.github.com>
Date: Mon, 30 Jun 2025 18:53:04 +0800
Subject: [PATCH] qol[mcAccountSpinner]: Make pickaccount() workaround more
 explicit to the user

---
 .../java/com/kdt/mcgui/mcAccountSpinner.java  | 20 ++++++++++++++-----
 .../src/main/res/values/strings.xml           |  3 +++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java b/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java
index 5f5d637e4..479390e64 100644
--- a/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java
+++ b/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java
@@ -48,6 +48,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 import fr.spse.extended_view.ExtendedTextView;
 
@@ -301,14 +302,23 @@ public class mcAccountSpinner extends AppCompatSpinner implements AdapterView.On
             PojavProfile.setCurrentProfile(getContext(), mAccountList.get(position));
             selectedAccount = PojavProfile.getCurrentProfileContent(getContext(), mAccountList.get(position));
 
-
             // WORKAROUND
             // Account file corrupted due to previous versions having improper encoding
             if (selectedAccount == null){
-                removeCurrentAccount();
-                pickAccount(-1);
-                setSelection(0);
-                return;
+                Context ctx = Objects.requireNonNull(getContext());
+
+                new AlertDialog.Builder(ctx)
+                        .setCancelable(false)
+                        .setTitle(R.string.account_corrupted)
+                        .setMessage(R.string.login_again)
+                        .setPositiveButton(R.string.delete_account_and_login, (dialog, which) -> {
+                            removeCurrentAccount();
+                            pickAccount(-1);
+                            setSelection(0);
+                        })
+                        .show();
+
+
             }
             setSelection(position);
         }else {
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index 8e2fe4f52..587aa5a6e 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -450,4 +450,7 @@
     <string name="change_account">Please change accounts to use this function</string>
     <string name="no_minecraft_account_found">No Minecraft Account Found</string>
     <string name="feature_requires_java_account">This feature requires a Microsoft account that owns Minecraft Java Edition.</string>
+    <string name="delete_account_and_login">Delete account and log in</string>
+    <string name="login_again">Please log in again</string>
+    <string name="account_corrupted">Selected account is corrupted</string>
 </resources>