diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 74af04fb80..d353b2545e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -233,7 +233,10 @@ object StoresState { val overlay = java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.local/share/droiddeck/epic-overlay") if (overlay.exists()) Thread({ overlay.deleteRecursively(); Log.i(TAG, "removed the old EOS overlay download") }, "epic-overlay-cleanup").start() val app = context.applicationContext - Thread({ CloudSaves.uploadAllDirty(app, "recovery") }, "cloud-recovery").start() + Thread({ + runCatching { CloudSaves.uploadAllDirty(app, "recovery") } + .onFailure { Log.w(TAG, "cloud save recovery failed", it) } + }, "cloud-recovery").start() } internal fun post(block: () -> Unit) = main.post(block) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt new file mode 100644 index 0000000000..63beea565b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudRecoveryThreadTest.kt @@ -0,0 +1,40 @@ +package com.droiddeck.launcher.stores + +import android.content.Context +import android.content.ContextWrapper +import android.content.SharedPreferences +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE) +class CloudRecoveryThreadTest { + private val uncaught = mutableListOf() + private var previous: Thread.UncaughtExceptionHandler? = null + + @Before fun setUp() { + previous = Thread.getDefaultUncaughtExceptionHandler() + Thread.setDefaultUncaughtExceptionHandler { _, error -> synchronized(uncaught) { uncaught += error } } + } + + @After fun tearDown() { + Thread.setDefaultUncaughtExceptionHandler(previous) + } + + @Test fun aFailingRecoveryUploadDoesNotReachTheCrashHandler() { + val context = object : ContextWrapper(RuntimeEnvironment.getApplication()) { + override fun getApplicationContext(): Context = this + override fun getSharedPreferences(name: String, mode: Int): SharedPreferences = + if (name == "stores.cloud") throw IllegalStateException("preferences are gone") else super.getSharedPreferences(name, mode) + } + StoresState.init(context) + Thread.getAllStackTraces().keys.filter { it.name == "cloud-recovery" }.forEach { it.join(5000) } + assertEquals(emptyList(), synchronized(uncaught) { uncaught.toList() }) + } +}