swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-11 13:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Manually cancel timeline listeners when a RoomScreen is torn down instead of waiting for a delayed deinit

Browse Source
This commit is contained in:
Stefan Ceriu 2023-02-23 15:22:09 +02:00 committed by Stefan Ceriu
parent 698b0aea44
commit 99d6caed4e
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
View File

@ -60,6 +60,7 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
}
func stop() {
parameters.roomProxy.removeTimelineListener()
viewModel.context.send(viewAction: .markRoomAsRead)
}

4
ElementX/Sources/Services/Room/MockRoomProxy.swift
View File

@ -44,12 +44,12 @@ struct MockRoomProxy: RoomProxyProtocol {
.failure(.failedRetrievingMemberAvatarURL)
}
func startLiveEventListener() { }
func addTimelineListener(listener: TimelineListener) -> Result<[TimelineItem], RoomProxyError> {
.failure(.failedAddingTimelineListener)
}
func removeTimelineListener() { }
func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result<Void, RoomProxyError> {
.failure(.failedPaginatingBackwards)
}

11
ElementX/Sources/Services/Room/RoomProxy.swift
View File

@ -34,11 +34,7 @@ class RoomProxy: RoomProxyProtocol {
private(set) var displayName: String?
private var timelineObservationToken: StoppableSpawn?
deinit {
timelineObservationToken?.cancel()
}
init(slidingSyncRoom: SlidingSyncRoomProtocol,
room: RoomProtocol,
backgroundTaskService: BackgroundTaskServiceProtocol) {
@ -151,6 +147,11 @@ class RoomProxy: RoomProxyProtocol {
}
}
func removeTimelineListener() {
timelineObservationToken?.cancel()
timelineObservationToken = nil
}
func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result<Void, RoomProxyError> {
do {
try await Task.dispatch(on: .global()) {

2
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
View File

@ -60,6 +60,8 @@ protocol RoomProxyProtocol {
func addTimelineListener(listener: TimelineListener) -> Result<[TimelineItem], RoomProxyError>
func removeTimelineListener()
func paginateBackwards(requestSize: UInt, untilNumberOfItems: UInt) async -> Result<Void, RoomProxyError>
func sendReadReceipt(for eventID: String) async -> Result<Void, RoomProxyError>