fix: [#865] issue adding a second account

.vscode/settings.json

@@ -6,7 +6,7 @@
     },
     "[java]": {
         "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
         }
     },
     "[github-actions-workflow]": {

CHANGELOG.md

@@ -10,6 +10,7 @@ This changelog only contains the changes that are unreleased. For changes for in
 ### Fixes
 - Creating pack not resetting modloader when switched back to none
 - Issue with file downloads for non third party enabled files on CurseForge not working
+- Issue adding a second account [#865]
 
 ### Misc
 - Remove old FTB pack installing code

src/main/java/com/atlauncher/data/AbstractAccount.java

@@ -228,10 +228,6 @@ public abstract class AbstractAccount implements Serializable {
         File file = FileSystem.SKINS.resolve((this.uuid == null ? "default" : this.getUUIDNoDashes()) + ".png")
                 .toFile();
 
-        if (!file.exists()) {
-            this.updateSkin(); // Download/update the users skin
-        }
-
         // If the file doesn't exist then use the default Minecraft skin.
         if (file == null || !file.exists()) {
             return SkinUtils.getDefaultHead();
@@ -248,10 +244,6 @@ public abstract class AbstractAccount implements Serializable {
     public ImageIcon getMinecraftSkin() {
         File file = FileSystem.SKINS.resolve(this.getUUIDNoDashes() + ".png").toFile();
 
-        if (!file.exists()) {
-            this.updateSkin(); // Download/update the users skin
-        }
-
         // If the file doesn't exist then use the default Minecraft skin.
         if (file == null || !file.exists()) {
             return SkinUtils.getDefaultSkin();

src/main/java/com/atlauncher/gui/dialogs/LoginWithMicrosoftDialog.java

@@ -62,7 +62,7 @@ public final class LoginWithMicrosoftDialog extends JDialog {
     private static final HTTPServer server = new HTTPServer(Constants.MICROSOFT_LOGIN_REDIRECT_PORT);
     private static final VirtualHost host = server.getVirtualHost(null);
 
-    private MicrosoftAccount account = null;
+    public MicrosoftAccount account = null;
 
     public LoginWithMicrosoftDialog() {
         this(null);
@@ -192,6 +192,7 @@ public final class LoginWithMicrosoftDialog extends JDialog {
                     profile);
 
             AccountManager.addAccount(account);
+            this.account = account;
         }
     }
 

src/main/java/com/atlauncher/gui/tabs/accounts/AccountsTab.java

@@ -54,15 +54,15 @@ import com.atlauncher.evnt.manager.RelocalizationManager;
 import com.atlauncher.gui.dialogs.LoginWithMicrosoftDialog;
 import com.atlauncher.gui.dialogs.ProgressDialog;
 import com.atlauncher.gui.tabs.Tab;
-import com.atlauncher.viewmodel.base.IAccountsViewModel;
-import com.atlauncher.viewmodel.base.IAccountsViewModel.LoginPostResult;
-import com.atlauncher.viewmodel.base.IAccountsViewModel.LoginPreCheckResult;
 import com.atlauncher.managers.AccountManager;
 import com.atlauncher.managers.DialogManager;
 import com.atlauncher.managers.LogManager;
 import com.atlauncher.utils.ComboItem;
 import com.atlauncher.utils.OS;
 import com.atlauncher.utils.SkinUtils;
+import com.atlauncher.viewmodel.base.IAccountsViewModel;
+import com.atlauncher.viewmodel.base.IAccountsViewModel.LoginPostResult;
+import com.atlauncher.viewmodel.base.IAccountsViewModel.LoginPreCheckResult;
 import com.atlauncher.viewmodel.impl.AccountsViewModel;
 
 public class AccountsTab extends JPanel implements Tab, RelocalizationListener {
@@ -262,9 +262,14 @@ public class AccountsTab extends JPanel implements Tab, RelocalizationListener {
         loginWithMicrosoftButton.addActionListener(e -> {
             // TODO This should be handled by some reaction via listener
             int numberOfAccountsBefore = viewModel.accountCount();
-            new LoginWithMicrosoftDialog();
+            LoginWithMicrosoftDialog dialog = new LoginWithMicrosoftDialog();
 
             if (numberOfAccountsBefore != viewModel.accountCount()) {
+                // account was added, so get the skin
+                if (dialog.account != null) {
+                    dialog.account.updateSkin();
+                }
+
                 viewModel.pushNewAccounts();
                 accountsComboBox.setSelectedItem(AccountManager.getSelectedAccount());
             }

src/main/java/com/atlauncher/managers/AccountManager.java

@@ -226,8 +226,6 @@ public class AccountManager {
         accounts.add(account);
         ACCOUNTS.onNext(accounts);
 
-        account.updateSkin();
-
         if (accounts.size() > 1) {
             // not first account? ask if they want to switch to it
             int ret = DialogManager.optionDialog().setTitle(GetText.tr("Account Added"))