Skip to content

Commit 8433e22

Browse files
committed
Fix unhandled crashes when network is not reacheable.
1 parent 2a5df54 commit 8433e22

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.sync.handler
1919
import androidx.work.BackoffPolicy
2020
import androidx.work.ExistingWorkPolicy
2121
import org.matrix.android.sdk.api.MatrixPatterns
22+
import org.matrix.android.sdk.api.extensions.tryOrNull
2223
import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorker
2324
import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorkerDataRepository
2425
import org.matrix.android.sdk.internal.di.SessionId
@@ -81,7 +82,9 @@ internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
8182
}
8283
}
8384
if (hasUpdate) {
84-
updateUserAccountDataTask.execute(UpdateUserAccountDataTask.DirectChatParams(directMessages = directChats))
85+
tryOrNull("Unable to update user account data") {
86+
updateUserAccountDataTask.execute(UpdateUserAccountDataTask.DirectChatParams(directMessages = directChats))
87+
}
8588
}
8689
}
8790

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import com.zhuinden.monarchy.Monarchy
2020
import io.realm.Realm
2121
import io.realm.RealmList
2222
import io.realm.kotlin.where
23+
import org.matrix.android.sdk.api.extensions.tryOrNull
2324
import org.matrix.android.sdk.api.failure.GlobalError
2425
import org.matrix.android.sdk.api.failure.InitialSyncRequestReason
2526
import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
@@ -122,7 +123,7 @@ internal class UserAccountDataSyncHandler @Inject constructor(
122123
val updateUserAccountParams = UpdateUserAccountDataTask.DirectChatParams(
123124
directMessages = directChats
124125
)
125-
updateUserAccountDataTask.execute(updateUserAccountParams)
126+
tryOrNull("Unable to update user account data") { updateUserAccountDataTask.execute(updateUserAccountParams) }
126127
}
127128
}
128129

0 commit comments

Comments
 (0)