ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay setting up subscriptions until the RoomListService is running in order to avoid cancelling in flight initial sync requests

Browse Source
This commit is contained in:
Stefan Ceriu
2024-09-05 15:06:59 +03:00
committed by Stefan Ceriu
parent dc85cb10ed
commit b43797f4bf
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Client/ClientProxy.swift
+10 -2
View File
@@ -92,6 +92,8 @@ class ClientProxy: ClientProxyProtocol {
.asCurrentValuePublisher()
}
private let roomListServiceStateSubject = CurrentValueSubject<RoomListServiceState, Never>(.initial)
private var cancellables = Set<AnyCancellable>()
/// Will be `true` whilst the app cleans up and forces a logout. Prevents the sync service from restarting
@@ -759,6 +761,7 @@ class ClientProxy: ClientProxyProtocol {
shouldPrefixSenderName: true)
roomSummaryProvider = RoomSummaryProvider(roomListService: roomListService,
roomListServiceStatePublisher: roomListServiceStateSubject.asCurrentValuePublisher(),
eventStringBuilder: eventStringBuilder,
name: "AllRooms",
shouldUpdateVisibleRange: true,
@@ -767,6 +770,7 @@ class ClientProxy: ClientProxyProtocol {
try await roomSummaryProvider?.setRoomList(roomListService.allRooms())
alternateRoomSummaryProvider = RoomSummaryProvider(roomListService: roomListService,
roomListServiceStatePublisher: roomListServiceStateSubject.asCurrentValuePublisher(),
eventStringBuilder: eventStringBuilder,
name: "MessageForwarding",
notificationSettings: notificationSettings,
@@ -802,9 +806,13 @@ class ClientProxy: ClientProxyProtocol {
private func createRoomListServiceObserver(_ roomListService: RoomListService) -> TaskHandle {
roomListService.state(listener: RoomListStateListenerProxy { [weak self] state in
guard let self else { return }
MXLog.info("Received room list update: \(state)")
guard let self,
state != .error,
roomListServiceStateSubject.send(state)
guard state != .error,
state != .terminated else {
// The sync service is responsible of handling error and termination
return