refactor

Author: Itsusinn

app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
+        android:name=".Application"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/rs/clash/android/App.kt …/main/java/rs/clash/android/AppScreen.ktapp/src/main/java/rs/clash/android/App.kt renamed to app/src/main/java/rs/clash/android/AppScreen.kt app/src/main/java/rs/clash/android/App.kt renamed to app/src/main/java/rs/clash/android/AppScreen.kt

@@ -1,26 +1,50 @@
 package rs.clash.android
 
-import android.app.Application
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
+import android.util.Log
 import kotlinx.coroutines.flow.MutableStateFlow
+import uniffi.clash_android_ffi.EyreException
+import uniffi.clash_android_ffi.formatEyreError
+import android.app.Application as AndroidApplication
 
-object Global : CoroutineScope by CoroutineScope(Dispatchers.IO) {
-	val application: Application
-		get() = applicationInstance
-
-	private lateinit var applicationInstance: Application
+class Application : AndroidApplication() {
+	override fun onCreate() {
+		super.onCreate()
+		// Setup uncaught exception handler
+		setupUncaughtExceptionHandler()
+		Global.application = this
+	}
+}
 
+object Global {
 	var profilePath: String = ""
-
 	val isServiceRunning = MutableStateFlow(false)
+	lateinit var application: Application
+}
 
-	fun init(application: Application) {
-		this.applicationInstance = application
-	}
+private fun setupUncaughtExceptionHandler() {
+	val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
+
+	Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
+		try {
+			// Check if the exception is EyreException
+			if (throwable is EyreException) {
+				val errorMessage = formatEyreError(throwable)
+				Log.e("Clash", "Uncaught EyreException on thread ${thread.name}:")
+				Log.e("Clash", errorMessage)
 
-	fun destroy() {
-		cancel()
+				// Also print to stderr
+				System.err.println("Uncaught EyreException on thread ${thread.name}:")
+				System.err.println(errorMessage)
+			} else {
+				// For other exceptions, log normally
+				Log.e("Clash", "Uncaught exception on thread ${thread.name}:", throwable)
+			}
+		} catch (e: Exception) {
+			// If something goes wrong in our handler, log it
+			Log.e("Clash", "Error in exception handler:", e)
+		} finally {
+			// Call the default handler to let the system handle the crash
+			defaultHandler?.uncaughtException(thread, throwable)
+		}
 	}
 }

app/src/main/java/rs/clash/android/Global.kt

@@ -34,7 +34,6 @@ class MainActivity : ComponentActivity() {
 		super.onCreate(savedInstanceState)
 		System.loadLibrary("clash_android_ffi")
 		javaInit()
-		Global.init(application)
 
 		// Apply language preference
 		applyLanguagePreference()