From d626660023e6efb2ff957bd3b2fdbdac1a05cf45 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Tue, 16 Jul 2024 13:17:04 +0200
Subject: [PATCH] Fix crash in the room list after a forced log out in
 background (#3180)

---
 .../matrix/impl/roomlist/RoomListExtensions.kt         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
index ad987e5cae..df30159c09 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListExtensions.kt
@@ -31,7 +31,6 @@ import kotlinx.coroutines.flow.onEach
 import org.matrix.rustcomponents.sdk.RoomListEntriesDynamicFilterKind
 import org.matrix.rustcomponents.sdk.RoomListEntriesListener
 import org.matrix.rustcomponents.sdk.RoomListEntriesUpdate
-import org.matrix.rustcomponents.sdk.RoomListException
 import org.matrix.rustcomponents.sdk.RoomListInterface
 import org.matrix.rustcomponents.sdk.RoomListItem
 import org.matrix.rustcomponents.sdk.RoomListLoadingState
@@ -128,11 +127,10 @@ internal fun RoomListServiceInterface.syncIndicator(): Flow<RoomListServiceSyncI
         }
     }.buffer(Channel.UNLIMITED)
 
-internal suspend fun RoomListServiceInterface.roomOrNull(roomId: String): RoomListItem? {
-    return try {
+internal fun RoomListServiceInterface.roomOrNull(roomId: String): RoomListItem? {
+    return tryOrNull(
+        onError = { Timber.e(it, "Failed finding room with id=$roomId.") }
+    ) {
         room(roomId)
-    } catch (exception: RoomListException) {
-        Timber.d(exception, "Failed finding room with id=$roomId.")
-        return null
     }
 }