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

Add initial sync loading toast indicator

Browse Source
This commit is contained in:
Stefan Ceriu
2023-05-10 19:26:59 +03:00
committed by Stefan Ceriu
parent 48bea54822
commit a28e686c8d
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Application/AppCoordinator.swift
+29 -13
View File
@@ -30,11 +30,12 @@ class AppCoordinator: AppCoordinatorProtocol {
private var userSession: UserSessionProtocol! { private var userSession: UserSessionProtocol! {
didSet { didSet {
userSessionCancellables.removeAll() userSessionObserver?.cancel()
if userSession != nil { if userSession != nil {
configureNotificationManager() configureNotificationManager()
observeUserSessionChanges() observeUserSessionChanges()
startSync()
} }
} }
} }
@@ -44,8 +45,11 @@ class AppCoordinator: AppCoordinatorProtocol {
private let backgroundTaskService: BackgroundTaskServiceProtocol private let backgroundTaskService: BackgroundTaskServiceProtocol
private var userSessionCancellables = Set<AnyCancellable>() private var appDelegateObserver: AnyCancellable?
private var cancellables = Set<AnyCancellable>() private var userSessionObserver: AnyCancellable?
private var networkMonitorObserver: AnyCancellable?
private var initialSyncObserver: AnyCancellable?
let notificationManager: NotificationManagerProtocol let notificationManager: NotificationManagerProtocol
@Consumable private var storedAppRoute: AppRoute? @Consumable private var storedAppRoute: AppRoute?
@@ -310,7 +314,7 @@ class AppCoordinator: AppCoordinatorProtocol {
notificationManager.requestAuthorization() notificationManager.requestAuthorization()
if let appDelegate = AppDelegate.shared { if let appDelegate = AppDelegate.shared {
appDelegate.callbacks appDelegateObserver = appDelegate.callbacks
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] callback in .sink { [weak self] callback in
switch callback { switch callback {
@@ -320,14 +324,13 @@ class AppCoordinator: AppCoordinatorProtocol {
self?.notificationManager.registrationFailed(with: error) self?.notificationManager.registrationFailed(with: error)
} }
} }
.store(in: &cancellables)
} else { } else {
MXLog.error("Couldn't register to AppDelegate callbacks") MXLog.error("Couldn't register to AppDelegate callbacks")
} }
} }
private func observeUserSessionChanges() { private func observeUserSessionChanges() {
userSession.callbacks userSessionObserver = userSession.callbacks
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] callback in .sink { [weak self] callback in
guard let self else { return } guard let self else { return }
@@ -338,7 +341,6 @@ class AppCoordinator: AppCoordinatorProtocol {
break break
} }
} }
.store(in: &userSessionCancellables)
} }
// MARK: Toasts and loading indicators // MARK: Toasts and loading indicators
@@ -362,12 +364,26 @@ class AppCoordinator: AppCoordinatorProtocol {
// MARK: - Application State // MARK: - Application State
private func pause() { private func stopSync() {
userSession?.clientProxy.stopSync() userSession?.clientProxy.stopSync()
} }
private func resume() { private func startSync() {
userSession?.clientProxy.startSync() userSession?.clientProxy.startSync()
let identifier = "StaleDataIndicator"
ServiceLocator.shared.userIndicatorController.submitIndicator(.init(id: identifier, type: .toast, title: L10n.commonLoading, persistent: true))
initialSyncObserver = userSession.clientProxy
.callbacks
.receive(on: DispatchQueue.main)
.sink { [weak self] callback in
if case .receivedSyncUpdate = callback {
ServiceLocator.shared.userIndicatorController.retractIndicatorWithId(identifier)
self?.initialSyncObserver?.cancel()
}
}
} }
private func observeApplicationState() { private func observeApplicationState() {
@@ -390,7 +406,7 @@ class AppCoordinator: AppCoordinatorProtocol {
} }
backgroundTask = backgroundTaskService.startBackgroundTask(withName: "SuspendApp: \(UUID().uuidString)") { [weak self] in backgroundTask = backgroundTaskService.startBackgroundTask(withName: "SuspendApp: \(UUID().uuidString)") { [weak self] in
self?.pause() self?.stopSync()
self?.backgroundTask = nil self?.backgroundTask = nil
self?.isSuspended = true self?.isSuspended = true
@@ -406,13 +422,13 @@ class AppCoordinator: AppCoordinatorProtocol {
if isSuspended { if isSuspended {
isSuspended = false isSuspended = false
resume() startSync()
} }
} }
private func observeNetworkState() { private func observeNetworkState() {
let reachabilityNotificationIdentifier = "io.element.elementx.reachability.notification" let reachabilityNotificationIdentifier = "io.element.elementx.reachability.notification"
ServiceLocator.shared.networkMonitor.reachabilityPublisher.sink { reachable in networkMonitorObserver = ServiceLocator.shared.networkMonitor.reachabilityPublisher.sink { reachable in
MXLog.info("Reachability changed to \(reachable)") MXLog.info("Reachability changed to \(reachable)")
if reachable { if reachable {
@@ -422,7 +438,7 @@ class AppCoordinator: AppCoordinatorProtocol {
title: L10n.commonOffline, title: L10n.commonOffline,
persistent: true)) persistent: true))
} }
}.store(in: &cancellables) }
} }
private func handleAppRoute(_ appRoute: AppRoute) { private func handleAppRoute(_ appRoute: AppRoute) {
ElementX/Sources/Services/UserSession/UserSessionFlowCoordinator.swift
-2
View File
@@ -144,8 +144,6 @@ class UserSessionFlowCoordinator: CoordinatorProtocol {
} }
private func presentHomeScreen() { private func presentHomeScreen() {
userSession.clientProxy.startSync()
let parameters = HomeScreenCoordinatorParameters(userSession: userSession, let parameters = HomeScreenCoordinatorParameters(userSession: userSession,
attributedStringBuilder: AttributedStringBuilder(), attributedStringBuilder: AttributedStringBuilder(),
bugReportService: bugReportService, bugReportService: bugReportService,