mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
Don't show the server unreachable banner while the client is suspended
homeserverReachabilityPublisher now reports unreachable while suspended so media loading parks instead of failing against a closed store. The reachability banner was keyed off the same publisher, so pausing the client would surface a spurious "Server unreachable" message. Expose a separate homeserverConnectivityPublisher derived from the sync service state alone (it stays reachable while suspended) and key the banner off that, keeping the suspend-aware publisher for gating work that needs an open store.
This commit is contained in:
@@ -180,11 +180,21 @@ 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> {
|
||||
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()
|
||||
@@ -1200,6 +1210,8 @@ class ClientProxy: ClientProxyProtocol {
|
||||
}
|
||||
|
||||
private func updateHomeserverReachability() {
|
||||
homeserverConnectivitySubject.send(syncServiceState == .offline ? .unreachable : .reachable)
|
||||
|
||||
let reachability: NetworkMonitorReachability = if desiredServiceState == .running, syncServiceState != .offline {
|
||||
.reachable
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user