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

Fix[msa]: handle PresentedExceptions without a set cause

Browse Source
This commit is contained in:
artdeell 2023-12-10 14:51:27 +03:00
parent 1e8e1757ab
commit af4ae5e919
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java
View File

@ -99,9 +99,15 @@ public class mcAccountSpinner extends AppCompatSpinner implements AdapterView.On
private final ErrorListener mErrorListener = errorMessage -> { private final ErrorListener mErrorListener = errorMessage -> {
mLoginBarPaint.setColor(Color.RED); mLoginBarPaint.setColor(Color.RED);
Context context = getContext();
if(errorMessage instanceof PresentedException) { if(errorMessage instanceof PresentedException) {
PresentedException exception = (PresentedException) errorMessage; PresentedException exception = (PresentedException) errorMessage;
Tools.showError(getContext(), exception.toString(getContext()), exception.getCause()); Throwable cause = exception.getCause();
if(cause == null) {
Tools.dialog(context, context.getString(R.string.global_error), exception.toString(context));
}else {
Tools.showError(context, exception.toString(context), exception.getCause());
}
}else { }else {
Tools.showError(getContext(), errorMessage); Tools.showError(getContext(), errorMessage);
} }

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java
View File

@ -104,7 +104,7 @@ public class MicrosoftBackgroundLogin {
} }
}catch (Exception e){ }catch (Exception e){
Log.e("MicroAuth", e.toString()); Log.e("MicroAuth", "Exception thrown during authentication", e);
if(errorListener != null) if(errorListener != null)
Tools.runOnUiThread(() -> errorListener.onLoginError(e)); Tools.runOnUiThread(() -> errorListener.onLoginError(e));
} }