From e53533ed4a4f3a08d6112008b101cc4cd6de2807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= Date: Fri, 7 Jul 2023 17:30:33 +0200 Subject: [PATCH] Fix Thread sync throwing exception sometimes crashing app (#3634) - Thread credential syncing uses the provided CoroutineScope to run other functions that throw exceptions. When using a normal Job a thrown exception will mean that everything in that scope is cancelled and propagates, even if caught. That isn't wanted so use a SupervisorJob instead when running this function to make sure that when caught nothing else stops. --- .../settings/developer/DeveloperSettingsPresenterImpl.kt | 3 ++- .../companion/android/webview/WebViewPresenterImpl.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/homeassistant/companion/android/settings/developer/DeveloperSettingsPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/settings/developer/DeveloperSettingsPresenterImpl.kt index abbd229cc..467b64153 100644 --- a/app/src/main/java/io/homeassistant/companion/android/settings/developer/DeveloperSettingsPresenterImpl.kt +++ b/app/src/main/java/io/homeassistant/companion/android/settings/developer/DeveloperSettingsPresenterImpl.kt @@ -10,6 +10,7 @@ import io.homeassistant.companion.android.thread.ThreadManager import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job +import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -62,7 +63,7 @@ class DeveloperSettingsPresenterImpl @Inject constructor( override fun runThreadDebug(context: Context, serverId: Int) { mainScope.launch { try { - when (val syncResult = threadManager.syncPreferredDataset(context, serverId, this)) { + when (val syncResult = threadManager.syncPreferredDataset(context, serverId, CoroutineScope(coroutineContext + SupervisorJob()))) { is ThreadManager.SyncResult.ServerUnsupported -> view.onThreadDebugResult(context.getString(commonR.string.thread_debug_result_unsupported_server), false) is ThreadManager.SyncResult.OnlyOnServer -> { diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt index ea1414f8a..6e8cdaa05 100644 --- a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt +++ b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt @@ -19,6 +19,7 @@ import io.homeassistant.companion.android.util.UrlUtil import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job +import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow @@ -333,7 +334,7 @@ class WebViewPresenterImpl @Inject constructor( mainScope.launch { val deviceThreadIntent = try { - when (val result = threadUseCase.syncPreferredDataset(context, serverId, this)) { + when (val result = threadUseCase.syncPreferredDataset(context, serverId, CoroutineScope(coroutineContext + SupervisorJob()))) { is ThreadManager.SyncResult.OnlyOnDevice -> result.exportIntent is ThreadManager.SyncResult.AllHaveCredentials -> result.exportIntent else -> null