Keep default DefaultUncaughtExceptionHandler

Author: Crustack

app/src/main/java/com/philkes/notallyx/presentation/activity/LockedActivity.kt

@@ -80,43 +80,47 @@ abstract class LockedActivity<T : ViewBinding> : AppCompatActivity() {
     }
 
     private fun setupGlobalExceptionHandler() {
-        Thread.setDefaultUncaughtExceptionHandler { _, throwable ->
-            lifecycleScope.launch {
-                EXCEPTION_HANDLER_MUTEX.withLock {
-                    val time = System.currentTimeMillis()
-                    if (
-                        isExceptionAlreadyBeingHandled(time) &&
-                            (throwable is SQLiteBlobTooBigException ||
-                                throwable.cause is SQLiteBlobTooBigException)
-                    ) {
-                        EXCEPTION_HANDLER_MUTEX_LAST_TIMESTAMP = time
-                        val migrationProgress =
-                            MutableLiveData<MigrationProgress>().apply {
-                                setupProgressDialog(this@LockedActivity)
-                                postValue(
-                                    MigrationProgress(
-                                        R.string.migration_splitting_notes,
-                                        indeterminate = true,
+        val previousHandler = Thread.getDefaultUncaughtExceptionHandler()
+        Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
+            if (
+                throwable is SQLiteBlobTooBigException ||
+                    throwable.cause is SQLiteBlobTooBigException
+            ) {
+                lifecycleScope.launch {
+                    EXCEPTION_HANDLER_MUTEX.withLock {
+                        val time = System.currentTimeMillis()
+                        if (!isExceptionAlreadyBeingHandled(time)) {
+                            EXCEPTION_HANDLER_MUTEX_LAST_TIMESTAMP = time
+                            val migrationProgress =
+                                MutableLiveData<MigrationProgress>().apply {
+                                    setupProgressDialog(this@LockedActivity)
+                                    postValue(
+                                        MigrationProgress(
+                                            R.string.migration_splitting_notes,
+                                            indeterminate = true,
+                                        )
                                     )
-                                )
-                            }
-                        log(
-                            TAG,
-                            msg =
-                                "SQLiteBlobTooBigException occurred, trying to fix broken notes...",
-                        )
-                        withContext(Dispatchers.IO) { application.splitOversizedNotes() }
-                        migrationProgress.postValue(
-                            MigrationProgress(R.string.migrating_data, inProgress = false)
-                        )
+                                }
+                            log(
+                                TAG,
+                                msg =
+                                    "SQLiteBlobTooBigException occurred, trying to fix broken notes...",
+                            )
+                            withContext(Dispatchers.IO) { application.splitOversizedNotes() }
+                            migrationProgress.postValue(
+                                MigrationProgress(R.string.migrating_data, inProgress = false)
+                            )
+                        }
                     }
                 }
+            } else {
+                previousHandler?.uncaughtException(thread, throwable)
             }
         }
     }
 
     private fun isExceptionAlreadyBeingHandled(time: Long): Boolean =
-        EXCEPTION_HANDLER_MUTEX_LAST_TIMESTAMP?.let { it.secondsBetween(time) > 20 } ?: true
+        EXCEPTION_HANDLER_MUTEX_LAST_TIMESTAMP?.let { it.secondsBetween(time) < 20 } ?: false
 
     override fun onResume() {
         if (preferences.isLockEnabled) {

app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt

@@ -114,9 +114,9 @@ class BaseNoteModel(private val app: Application) : AndroidViewModel(app) {
     var reminders: LiveData<List<NoteReminder>> = NotNullLiveData(mutableListOf())
     private var allNotes: LiveData<List<BaseNote>>? = NotNullLiveData(mutableListOf())
     private var allNotesObserver: Observer<List<BaseNote>>? = null
-    var baseNotes: Content? = Content(MutableLiveData(), { t -> t })
-    var deletedNotes: Content? = Content(MutableLiveData(), { t -> t })
-    var archivedNotes: Content? = Content(MutableLiveData(), { t -> t })
+    var baseNotes: Content? = Content(MutableLiveData(), ::transform)
+    var deletedNotes: Content? = Content(MutableLiveData(), ::transform)
+    var archivedNotes: Content? = Content(MutableLiveData(), ::transform)
 
     val folder = NotNullLiveData(Folder.NOTES)