diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20cdafacd..717fe0108 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,16 +46,21 @@ + + + android:name=".ui.utils.CrashActivity" + android:theme="@android:style/Theme.DeviceDefault.Dialog" + android:label="@string/error_occurred" + android:windowSoftInputMode="stateAlwaysHidden" /> - diff --git a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt index 84ed4569d..54b8152d8 100644 --- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt +++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt @@ -26,6 +26,7 @@ import org.koitharu.kotatsu.core.parser.UserAgentInterceptor import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.domain.MangaLoaderContext import org.koitharu.kotatsu.ui.tracker.TrackerJobService +import org.koitharu.kotatsu.ui.utils.AppCrashHandler import org.koitharu.kotatsu.utils.CacheUtils import java.util.concurrent.TimeUnit @@ -43,9 +44,7 @@ class KotatsuApp : Application() { super.onCreate() initKoin() initCoil() - if (BuildConfig.DEBUG) { - initErrorHandler() - } + Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext)) TrackerJobService.setup(this) AppCompatDelegate.setDefaultNightMode(AppSettings(this).theme) } diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt index c988c710b..3644b7968 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt @@ -11,7 +11,6 @@ import moxy.MvpAppCompatActivity import org.koin.core.KoinComponent import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.R -import org.koitharu.kotatsu.ui.common.dialog.StorageSelectDialog abstract class BaseActivity : MvpAppCompatActivity(), KoinComponent { @@ -70,7 +69,7 @@ abstract class BaseActivity : MvpAppCompatActivity(), KoinComponent { return true } if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { - StorageSelectDialog.Builder(this).create().show() + throw StackOverflowError("test") return true } return super.onKeyDown(keyCode, event) diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/utils/AppCrashHandler.kt b/app/src/main/java/org/koitharu/kotatsu/ui/utils/AppCrashHandler.kt new file mode 100644 index 000000000..71a689f7d --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/ui/utils/AppCrashHandler.kt @@ -0,0 +1,27 @@ +package org.koitharu.kotatsu.ui.utils + +import android.content.Context +import android.content.Intent +import java.io.PrintWriter +import java.io.StringWriter +import kotlin.system.exitProcess + +class AppCrashHandler(private val applicationContext: Context) : Thread.UncaughtExceptionHandler { + + override fun uncaughtException(t: Thread, e: Throwable) { + val crashInfo = buildString { + val writer = StringWriter() + e.printStackTrace(PrintWriter(writer)) + append(writer.toString().trimIndent()) + } + val intent = Intent(applicationContext, CrashActivity::class.java) + intent.putExtra(Intent.EXTRA_TEXT, crashInfo) + intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + try { + applicationContext.startActivity(intent) + } catch (e: Throwable) { + e.printStackTrace() + } + exitProcess(1) + } +} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt new file mode 100644 index 000000000..78d6947f3 --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/ui/utils/CrashActivity.kt @@ -0,0 +1,34 @@ +package org.koitharu.kotatsu.ui.utils + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import android.view.View +import kotlinx.android.synthetic.main.activity_crash.* +import org.koitharu.kotatsu.R +import org.koitharu.kotatsu.ui.main.MainActivity + +class CrashActivity : Activity(), View.OnClickListener { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_crash) + textView.text = intent.getStringExtra(Intent.EXTRA_TEXT) + button_close.setOnClickListener(this) + button_restart.setOnClickListener(this) + } + + override fun onClick(v: View) { + when(v.id) { + R.id.button_close -> { + finish() + } + R.id.button_restart -> { + val intent = Intent(applicationContext, MainActivity::class.java) + intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) + startActivity(intent) + finish() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml new file mode 100644 index 000000000..b78120b28 --- /dev/null +++ b/app/src/main/res/layout/activity_crash.xml @@ -0,0 +1,45 @@ + + + + + + + + +