From 3bbec01507886c8777db50ba5e090784d8d7dff6 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 8 Aug 2020 16:04:51 +0700 Subject: [PATCH] Fatal error: show 'Unexpectedly crashed' instead of 'Fatal error' --- app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java | 3 ++- app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java b/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java index 907b1fc0b..1ed4e37f0 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java @@ -6,11 +6,12 @@ import android.support.v7.app.*; public class FatalErrorActivity extends AppCompatActivity { - public static void showError(Context ctx, Throwable th) { + public static void showError(Context ctx, boolean isFatalErr, Throwable th) { Intent ferrorIntent = new Intent(ctx, FatalErrorActivity.class); ferrorIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); ferrorIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); ferrorIntent.putExtra("throwable", th); + ferrorIntent.putExtra("isFatal", isFatalErr); ctx.startActivity(ferrorIntent); } diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java b/app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java index 9cda1f259..84e46ff8b 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java @@ -17,7 +17,7 @@ public class PojavApplication extends Application Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler(){ @Override public void uncaughtException(Thread thread, Throwable th) { - FatalErrorActivity.showError(PojavApplication.this, th); + FatalErrorActivity.showError(PojavApplication.this, true, th); android.os.Process.killProcess(android.os.Process.myPid()); } }); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9851059ee..e9a870973 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,7 +52,7 @@ Select OptiFine jar file - Fatal error + Unexpectedly crashed Error! Please check the log below: %s No version! Unable to load version %s