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

Bump SDK to v1.0.107-alpha. Simplify syncService state handling

Browse Source
This commit is contained in:
Stefan Ceriu
2023-08-16 13:24:43 +03:00
committed by Stefan Ceriu
parent 8d409e7817
commit 5400910855
8 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Client/ClientProxy.swift
+16 -32
View File
@@ -53,7 +53,7 @@ class ClientProxy: ClientProxyProtocol {
deinit {
client.setDelegate(delegate: nil)
pauseSync()
stopSync()
}
let callbacks = PassthroughSubject<ClientProxyCallback, Never>()
@@ -109,37 +109,23 @@ class ClientProxy: ClientProxyProtocol {
}
}
var isSyncing: Bool {
isStartingSync || syncService?.currentState() == .running
}
/// Ensure we don't call start sync whilst awaiting a previous call.
private var isStartingSync = false
func startSync() {
guard !isSyncing else { return }
MXLog.info("Starting sync")
isStartingSync = true
Task {
do {
try await syncService?.start()
} catch {
MXLog.error("Failed starting app service with error: \(error)")
}
isStartingSync = false
await syncService?.start()
}
}
func pauseSync() {
func stopSync() {
MXLog.info("Stopping sync")
do {
try syncService?.pause()
} catch {
MXLog.error("Failed pausing app service with error: \(error)")
Task {
do {
try await syncService?.stop()
} catch {
MXLog.error("Failed stopping the sync service with error: \(error)")
}
}
}
@@ -367,19 +353,17 @@ class ClientProxy: ClientProxyProtocol {
// MARK: Private
private func restartSync(delay: Duration = .zero) {
isStartingSync = true
Task {
try await Task.sleep(for: delay)
do {
MXLog.info("Restart the app service.")
try await self.syncService?.start()
MXLog.info("Restarting the sync service.")
try await self.syncService?.stop()
} catch {
MXLog.error("Failed restarting app service after error.")
MXLog.error("Failed restarting the sync service with error: \(error)")
}
self.isStartingSync = false
await self.syncService?.start()
}
}
@@ -437,7 +421,7 @@ class ClientProxy: ClientProxyProtocol {
syncService.state(listener: SyncServiceStateObserverProxy { [weak self] state in
guard let self else { return }
MXLog.info("Received app service update: \(state)")
MXLog.info("Received sync service update: \(state)")
switch state {
case .running, .terminated, .idle:
@@ -454,7 +438,7 @@ class ClientProxy: ClientProxyProtocol {
guard let self,
state != .error,
state != .terminated else {
// The app service is responsible of handling error and termination
// The sync service is responsible of handling error and termination
return
}
ElementX/Sources/Services/Client/ClientProxyProtocol.swift
+1 -3
View File
@@ -79,12 +79,10 @@ protocol ClientProxyProtocol: AnyObject, MediaLoaderProtocol {
var roomSummaryProvider: RoomSummaryProviderProtocol? { get }
var inviteSummaryProvider: RoomSummaryProviderProtocol? { get }
var isSyncing: Bool { get }
func startSync()
func pauseSync()
func stopSync()
func directRoomForUserID(_ userID: String) async -> Result<String?, ClientProxyError>
ElementX/Sources/Services/Client/MockClientProxy.swift
+1 -3
View File
@@ -32,8 +32,6 @@ class MockClientProxy: ClientProxyProtocol {
var avatarURLPublisher: AnyPublisher<URL?, Never> { Empty().eraseToAnyPublisher() }
var isSyncing: Bool { false }
init(userID: String, deviceID: String? = nil, roomSummaryProvider: RoomSummaryProviderProtocol? = MockRoomSummaryProvider()) {
self.userID = userID
self.deviceID = deviceID
@@ -46,7 +44,7 @@ class MockClientProxy: ClientProxyProtocol {
func stopSync(completionHandler: () -> Void) { }
func pauseSync() { }
func stopSync() { }
func directRoomForUserID(_ userID: String) async -> Result<String?, ClientProxyError> {
.failure(.failedRetrievingDirectRoom)