Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Make sure any JoinedRustRoom is destroyed after use (#4678)

Browse source
This commit is contained in:
Jorge Martin Espinosa 2025-05-05 16:09:07 +02:00 • committed by GitHub
parent a7179b711c
commit 024aa49e60
5 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
View file

@ -241,7 +241,7 @@ class CallScreenPresenter @AssistedInject constructor(
private suspend fun MatrixClient.notifyCallStartIfNeeded(roomId: RoomId) { private suspend fun MatrixClient.notifyCallStartIfNeeded(roomId: RoomId) {
if (!notifiedCallStart) { if (!notifiedCallStart) {
getJoinedRoom(roomId)?.sendCallNotificationIfNeeded() getJoinedRoom(roomId)?.use { it.sendCallNotificationIfNeeded() }
?.onSuccess { notifiedCallStart = true } ?.onSuccess { notifiedCallStart = true }
} }
} }

5
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
View file

@ -47,8 +47,11 @@ class DefaultCallWidgetProvider @Inject constructor(
theme = theme, theme = theme,
).getOrThrow() ).getOrThrow()
val driver = room.getWidgetDriver(widgetSettings).getOrThrow()
room.destroy()
CallWidgetProvider.GetWidgetResult( CallWidgetProvider.GetWidgetResult(
driver = room.getWidgetDriver(widgetSettings).getOrThrow(), driver = driver,
url = callUrl, url = callUrl,
) )
} }

1
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
View file

@ -86,6 +86,7 @@ class SharePresenter @AssistedInject constructor(
).isSuccess ).isSuccess
} }
.all { it } .all { it }
.also { room.destroy() }
} }
.all { it } .all { it }
} }

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
View file

@ -639,9 +639,11 @@ class JoinedRustRoom(
} }
} }
override fun close() = destroy()
override fun destroy() { override fun destroy() {
baseRoom.destroy() baseRoom.destroy()
liveInnerTimeline.close() liveInnerTimeline.destroy()
roomCoroutineScope.cancel() roomCoroutineScope.cancel()
} }

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
View file

@ -94,6 +94,8 @@ class RustBaseRoom(
} }
} }
override fun close() = destroy()
override fun destroy() { override fun destroy() {
innerRoom.destroy() innerRoom.destroy()
} }