ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to a custom HomeserverReachability instead of different publishers

Browse Source
This commit is contained in:
Stefan Ceriu
2026-06-24 19:14:27 +03:00
parent 3ccaa04554
commit 0bd32d24fd
15 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Client/ClientProxy.swift
+7 -17
View File
@@ -180,21 +180,11 @@ class ClientProxy: ClientProxyProtocol {
verificationStateSubject.asCurrentValuePublisher()
}
/// Reports unreachable while suspended (the store is closed) as well as when offline. Use this to gate
/// work that needs an open store, such as media loading.
private let homeserverReachabilitySubject = CurrentValueSubject<NetworkMonitorReachability, Never>(.reachable)
var homeserverReachabilityPublisher: CurrentValuePublisher<NetworkMonitorReachability, Never> {
private let homeserverReachabilitySubject = CurrentValueSubject<HomeserverReachability, Never>(.reachable)
var homeserverReachabilityPublisher: CurrentValuePublisher<HomeserverReachability, Never> {
homeserverReachabilitySubject.asCurrentValuePublisher()
}
/// The homeserver's reachability derived from the sync service alone, i.e. it stays reachable while the
/// client is suspended. Use this for user-facing messaging so we don't claim the server is unreachable
/// when we've simply paused syncing.
private let homeserverConnectivitySubject = CurrentValueSubject<NetworkMonitorReachability, Never>(.reachable)
var homeserverConnectivityPublisher: CurrentValuePublisher<NetworkMonitorReachability, Never> {
homeserverConnectivitySubject.asCurrentValuePublisher()
}
private let timelineMediaVisibilitySubject = CurrentValueSubject<TimelineMediaVisibility, Never>(.always)
var timelineMediaVisibilityPublisher: CurrentValuePublisher<TimelineMediaVisibility, Never> {
timelineMediaVisibilitySubject.asCurrentValuePublisher()
@@ -1210,12 +1200,12 @@ class ClientProxy: ClientProxyProtocol {
}
private func updateHomeserverReachability() {
homeserverConnectivitySubject.send(syncServiceState == .offline ? .unreachable : .reachable)
let reachability: NetworkMonitorReachability = if desiredServiceState == .running, syncServiceState != .offline {
.reachable
} else {
let reachability: HomeserverReachability = if desiredServiceState != .running {
.suspended
} else if syncServiceState == .offline {
.unreachable
} else {
.reachable
}
homeserverReachabilitySubject.send(reachability)