From 5bad6aca352506c722749fa6c1b5123ae722a071 Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 23 Aug 2023 23:57:54 +0200
Subject: [PATCH] fixed native crash handle

---
 .../com/lagradost/cloudstream3/AcraApplication.kt     | 11 ++++++++---
 .../com/lagradost/cloudstream3/NativeCrashHandler.kt  | 11 ++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index c14780d8..4b4747ae 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -104,13 +104,17 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
 }
 
 class AcraApplication : Application() {
+
     override fun onCreate() {
         super.onCreate()
         NativeCrashHandler.initCrashHandler()
-        Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(filesDir.resolve("last_error")) {
+        ExceptionHandler(filesDir.resolve("last_error")) {
             val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
             startActivity(Intent.makeRestartActivityTask(intent!!.component))
-        })
+        }.also {
+            exceptionHandler = it
+            Thread.setDefaultUncaughtExceptionHandler(it)
+        }
     }
 
     override fun attachBaseContext(base: Context?) {
@@ -138,6 +142,8 @@ class AcraApplication : Application() {
     }
 
     companion object {
+        var exceptionHandler: ExceptionHandler? = null
+
         /** Use to get activity from Context */
         tailrec fun Context.getActivity(): Activity? = this as? Activity
             ?: (this as? ContextWrapper)?.baseContext?.getActivity()
@@ -212,6 +218,5 @@ class AcraApplication : Application() {
                 activity?.supportFragmentManager?.fragments?.lastOrNull()
             )
         }
-
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
index e5cb2702..1fe00748 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
@@ -14,6 +14,12 @@ object NativeCrashHandler {
     private external fun getSignalStatus(): Int
 
     private fun initSignalPolling() = CoroutineScope(Dispatchers.IO).launch {
+
+        //launch {
+        //    delay(10000)
+        //    triggerNativeCrash()
+        //}
+
         while (true) {
             delay(10_000)
             val signal = getSignalStatus()
@@ -24,7 +30,10 @@ object NativeCrashHandler {
             if (lastError != null) continue
             if (checkSafeModeFile()) continue
 
-            throw RuntimeException("Native crash with code: $signal. Try uninstalling extensions.\n")
+            AcraApplication.exceptionHandler?.uncaughtException(
+                Thread.currentThread(),
+                RuntimeException("Native crash with code: $signal. Try uninstalling extensions.\n")
+            )
         }
     }