letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Favour network over homeserver reachability when computing the offline indicator. (#4805)

Browse Source 
For a whole host of reasons we don't support air-gapped operation anyway and as the SDK is super slow to tell us about the homeserver's reachability the indicator wasn't really working.
This commit is contained in:
Doug
2025-12-02 11:21:47 +00:00
committed by GitHub
parent 824a6b0f43
commit 27ce6d94df
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ElementX/Sources/Application/AppCoordinator.swift
View File

@@ -1077,7 +1077,8 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationFlowCoordinatorDeleg
switch state {
case .loading:
if self?.userSession?.clientProxy.homeserverReachabilityPublisher.value == .reachable {
if self?.userSession?.clientProxy.homeserverReachabilityPublisher.value == .reachable,
self?.appMediator.networkMonitor.reachabilityPublisher.value == .reachable {
ServiceLocator.shared.userIndicatorController.submitIndicator(.init(id: toastIdentifier, type: .toast(progress: .indeterminate), title: L10n.commonSyncing, persistent: true))
}
case .notLoading:

14
ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
View File

@@ -246,17 +246,17 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
MXLog.info("Homeserver reachability: \(homeserverReachability)")
guard let self else { return }
switch (homeserverReachability, networkReachability) {
case (.reachable, _):
switch (networkReachability, homeserverReachability) {
case (.reachable, .reachable):
flowParameters.userIndicatorController.retractIndicatorWithId(reachabilityNotificationID)
case (.unreachable, .unreachable):
flowParameters.userIndicatorController.submitIndicator(.init(id: reachabilityNotificationID,
title: L10n.commonOffline,
persistent: true))
case (.unreachable, .reachable):
case (.reachable, .unreachable):
flowParameters.userIndicatorController.submitIndicator(.init(id: reachabilityNotificationID,
title: L10n.commonServerUnreachable,
persistent: true))
case (.unreachable, _):
flowParameters.userIndicatorController.submitIndicator(.init(id: reachabilityNotificationID,
title: L10n.commonOffline,
persistent: true))
}
}
.store(in: &cancellables)

13
UnitTests/Sources/UserSessionFlowCoordinatorTests.swift
View File

@@ -196,17 +196,18 @@ class UserSessionFlowCoordinatorTests: XCTestCase {
homeserverReachabilitySubject.send(.reachable)
try await Task.sleep(for: .milliseconds(100))
// Then the indicator should be hidden even if the network isn't reachable.
XCTAssertEqual(userIndicatorController.submitIndicatorDelayCallsCount, 2)
XCTAssertEqual(retractReachabilityIndicatorCallsCount, 2)
// Then there should still be an offline indicator (as we don't yet support air-gapped servers on iOS).
XCTAssertEqual(userIndicatorController.submitIndicatorDelayCallsCount, 3)
XCTAssertEqual(userIndicatorController.submitIndicatorDelayReceivedArguments?.indicator.title, L10n.commonOffline)
XCTAssertEqual(retractReachabilityIndicatorCallsCount, 1)
// When the network becomes reachable again.
networkReachabilitySubject.send(.reachable)
try await Task.sleep(for: .milliseconds(100))
// Then nothing else should happen.
XCTAssertEqual(userIndicatorController.submitIndicatorDelayCallsCount, 2)
XCTAssertEqual(retractReachabilityIndicatorCallsCount, 3)
// Then the indicator should be hidden now as everything is back to normal
XCTAssertEqual(userIndicatorController.submitIndicatorDelayCallsCount, 3)
XCTAssertEqual(retractReachabilityIndicatorCallsCount, 2)
}
// MARK: - Helpers