From 4bd35a10be88ccd855b495fcc031d8cd367bc707 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Thu, 10 Dec 2020 14:57:10 +0700 Subject: [PATCH] [MSA] Bug fix on obtaining code --- .../authenticator/microsoft/MicrosoftAuthenticator.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthenticator.java b/app/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthenticator.java index adbdf81a8..151e8f0c8 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthenticator.java +++ b/app/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthenticator.java @@ -43,13 +43,14 @@ public class MicrosoftAuthenticator extends AsyncTask { build.setMessage(ctx.getString(R.string.global_waiting)); build.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); build.setCancelable(false); + build.setMax(5); build.show(); } @Override public Object doInBackground(String... args) { try { - String authCode = args[1]; + String authCode = args[0]; publishProgress(); String msaAccessToken = acquireAccessToken(authCode); @@ -67,12 +68,14 @@ public class MicrosoftAuthenticator extends AsyncTask { // TODO migrate account format to json MinecraftAccount acc = checkMcProfile(mcAccessToken); - MCProfile.Builder profilePath = MCProfile.load(args[0]); + MCProfile.Builder profilePath = new MCProfile.Builder(); profilePath.setClientID("0" /* FIXME */); profilePath.setAccessToken(acc.accessToken); profilePath.setUsername(acc.username); profilePath.setProfileID(acc.profileId); + profilePath.setIsMojangAccount(false); + MCProfile.build(profilePath); return profilePath;