mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Thread sync throwing exception sometimes crashing app (#3634)

Browse source 
- 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.
This commit is contained in:
Joris Pelgröm 2023-07-07 17:30:33 +02:00 committed by GitHub
parent be022a5272
commit e53533ed4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/io/homeassistant/companion/android/settings/developer/DeveloperSettingsPresenterImpl.kt
View file

@ -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 -> {

3
app/src/main/java/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt
View file

@ -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