Fix crash when calling Client.predecessorRoom when the room is destroyed

jmartinesp · jmartinesp · commit 3cb72caaaac1 · 2025-12-12T08:06:15.000+01:00
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
@@ -85,7 +85,9 @@ class RustBaseRoom(
     }.stateIn(roomCoroutineScope, started = SharingStarted.Lazily, initialValue = initialRoomInfo)
 
     override fun predecessorRoom(): PredecessorRoom? {
-        return innerRoom.predecessorRoom()?.map()
+        return runCatchingExceptions { innerRoom.predecessorRoom()?.map() }
+            .onFailure { Timber.e(it, "Could not get predecessor room") }
+            .getOrNull()
     }
 
     override suspend fun subscribeToSync() = roomSyncSubscriber.subscribe(roomId)

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,9 @@ class RustBaseRoom(`
`85`	`85`	`}.stateIn(roomCoroutineScope, started = SharingStarted.Lazily, initialValue = initialRoomInfo)`
`86`	`86`
`87`	`87`	`override fun predecessorRoom(): PredecessorRoom? {`
`88`		`- return innerRoom.predecessorRoom()?.map()`
	`88`	`+ return runCatchingExceptions { innerRoom.predecessorRoom()?.map() }`
	`89`	`+ .onFailure { Timber.e(it, "Could not get predecessor room") }`
	`90`	`+ .getOrNull()`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`override suspend fun subscribeToSync() = roomSyncSubscriber.subscribe(roomId)`