From 310b1ad69b5c8d4190b165eb0c92779465d49329 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:43:05 +0600 Subject: [PATCH] Pass uncaught exception to default handler in GlobalExceptionHandler Fixes #1347 (cherry picked from commit f3a2f566c8a09ab862758ae69b43da2a2cd8f1db) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/crash/GlobalExceptionHandler.kt --- .../tachiyomi/crash/GlobalExceptionHandler.kt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/crash/GlobalExceptionHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/crash/GlobalExceptionHandler.kt index 4670c1318..cb08371b2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/crash/GlobalExceptionHandler.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/crash/GlobalExceptionHandler.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.crash import android.content.Context import android.content.Intent -import com.google.firebase.crashlytics.ktx.crashlytics -import com.google.firebase.ktx.Firebase import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor @@ -13,7 +11,6 @@ import kotlinx.serialization.encoding.Encoder import kotlinx.serialization.json.Json import logcat.LogPriority import tachiyomi.core.common.util.system.logcat -import kotlin.system.exitProcess class GlobalExceptionHandler private constructor( private val applicationContext: Context, @@ -33,14 +30,9 @@ class GlobalExceptionHandler private constructor( } override fun uncaughtException(thread: Thread, exception: Throwable) { - try { - logcat(priority = LogPriority.ERROR, throwable = exception) - Firebase.crashlytics.recordException(exception) - launchActivity(applicationContext, activityToBeLaunched, exception) - exitProcess(0) - } catch (_: Exception) { - defaultHandler.uncaughtException(thread, exception) - } + logcat(priority = LogPriority.ERROR, throwable = exception) + launchActivity(applicationContext, activityToBeLaunched, exception) + defaultHandler.uncaughtException(thread, exception) } private fun launchActivity(