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

Run SwiftFormat.

Browse Source
This commit is contained in:
Doug
2026-05-27 14:38:50 +01:00
committed by Doug
parent 5138e05e47
commit fa67713726
573 changed files with 2426 additions and 2426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Client/ClientProxy.swift
+25 -25
View File
@@ -27,7 +27,7 @@ class ClientProxy: ClientProxyProtocol {
private var roomListStateUpdateTaskHandle: TaskHandle?
// periphery: ignore - only for retain
private var roomListStateLoadingStateUpdateTaskHandle: TaskHandle?
private var syncService: SyncService
// periphery: ignore - only for retain
private var syncServiceStateUpdateTaskHandle: TaskHandle?
@@ -46,7 +46,7 @@ class ClientProxy: ClientProxyProtocol {
// periphery:ignore - required for instance retention in the rust codebase
private var mediaPreviewConfigListenerTaskHandle: TaskHandle?
// periphery:ignore - required for instance retention in the rust codebase
private var liveLocationOwnInfoUpdatesListenerTaskHandle: TaskHandle?
@@ -60,7 +60,7 @@ class ClientProxy: ClientProxyProtocol {
private(set) var staticRoomSummaryProvider: StaticRoomSummaryProviderProtocol
let notificationSettings: NotificationSettingsProxyProtocol
let secureBackupController: SecureBackupControllerProtocol
private(set) var sessionVerificationController: SessionVerificationControllerProxyProtocol?
@@ -128,7 +128,7 @@ class ClientProxy: ClientProxyProtocol {
users: [:],
events: [:])
}
private var loadCachedAvatarURLTask: Task<Void, Never>?
private let userAvatarURLSubject = CurrentValueSubject<URL?, Never>(nil)
var userAvatarURLPublisher: CurrentValuePublisher<URL?, Never> {
@@ -191,12 +191,12 @@ class ClientProxy: ClientProxyProtocol {
}
var roomsToAwait: Set<String> = []
private let liveLocationOwnInfoUpdatesSubject = PassthroughSubject<LiveLocationOwnInfoUpdate, Never>()
var liveLocationOwnInfoUpdatesPublisher: AnyPublisher<LiveLocationOwnInfoUpdate, Never> {
liveLocationOwnInfoUpdatesSubject.eraseToAnyPublisher()
}
private let sendQueueStatusSubject = CurrentValueSubject<Bool, Never>(false)
init(client: ClientProtocol,
@@ -240,7 +240,7 @@ class ClientProxy: ClientProxyProtocol {
syncServiceStateUpdateTaskHandle = createSyncServiceStateObserver(syncService)
roomListStateUpdateTaskHandle = createRoomListServiceObserver(roomListService)
roomListStateLoadingStateUpdateTaskHandle = createRoomListLoadingStateUpdateObserver(roomListService)
delegateHandle = try client.setDelegate(delegate: ClientDelegateWrapper { [weak self] isSoftLogout in
self?.hasEncounteredAuthError = true
self?.actionsSubject.send(.receivedAuthError(isSoftLogout: isSoftLogout))
@@ -278,7 +278,7 @@ class ClientProxy: ClientProxyProtocol {
Task {
mediaPreviewConfigListenerTaskHandle = await createMediaPreviewConfigObserver()
}
liveLocationOwnInfoUpdatesListenerTaskHandle = createLiveLocationOwnInfoUpdatesObserver()
}
@@ -290,7 +290,7 @@ class ClientProxy: ClientProxyProtocol {
return "Unknown user identifier"
}
}
var deviceID: String? {
do {
return try client.deviceId()
@@ -299,7 +299,7 @@ class ClientProxy: ClientProxyProtocol {
return nil
}
}
var homeserver: String {
client.homeserver()
}
@@ -360,7 +360,7 @@ class ClientProxy: ClientProxyProtocol {
}
}
}
private(set) lazy var pusherNotificationClientIdentifier: String? = {
// NOTE: The result is stored as part of the restoration token. Any changes
// here would require a migration to correctly match incoming notifications.
@@ -378,7 +378,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(.sdkError(error))
}
}
func hasDevicesToVerifyAgainst() async -> Result<Bool, ClientProxyError> {
do {
let result = try await client.encryption().hasDevicesToVerifyAgainst()
@@ -388,7 +388,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(.sdkError(error))
}
}
func startSync() {
guard !hasEncounteredAuthError else {
MXLog.warning("Ignoring request, this client has an unknown token.")
@@ -566,7 +566,7 @@ class ClientProxy: ClientProxyProtocol {
func joinRoom(_ roomID: String, via: [String]) async -> Result<Void, ClientProxyError> {
do {
let _ = try await client.joinRoomByIdOrAlias(roomIdOrAlias: roomID, serverNames: via)
await waitForRoomToSync(roomID: roomID, timeout: .seconds(30))
return .success(())
@@ -652,7 +652,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(ClientProxyError.sdkError(error))
}
}
func roomForIdentifier(_ identifier: String) async -> RoomProxyType? {
let shouldAwait = roomsToAwait.remove(identifier) != nil
@@ -706,7 +706,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(.sdkError(error))
}
}
func loadUserDisplayName() async -> Result<Void, ClientProxyError> {
do {
let displayName = try await client.displayName()
@@ -730,7 +730,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(.sdkError(error))
}
}
func loadUserAvatarURL() async -> Result<Void, ClientProxyError> {
do {
let urlString = try await client.avatarUrl()
@@ -748,7 +748,7 @@ class ClientProxy: ClientProxyProtocol {
MXLog.error("Failed uploading, invalid media: \(media)")
return .failure(.invalidMedia)
}
do {
let data = try Data(contentsOf: imageURL)
try await client.uploadAvatar(mimeType: mimeType, data: data)
@@ -875,7 +875,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(.sdkError(error))
}
}
func markAllRoomsAsRead() async -> Result<Void, ClientProxyError> {
do {
return try await .success(client.markAllRoomsAsRead())
@@ -903,7 +903,7 @@ class ClientProxy: ClientProxyProtocol {
return .failure(.sdkError(error))
}
}
// MARK: Ignored users
func ignoreUser(_ userID: String) async -> Result<Void, ClientProxyError> {
@@ -1123,7 +1123,7 @@ class ClientProxy: ClientProxyProtocol {
MXLog.error("Failed retrieving session verification controller proxy with error: \(error)")
}
}
private func loadUserAvatarURLFromCache() {
loadCachedAvatarURLTask = Task {
do {
@@ -1172,7 +1172,7 @@ class ClientProxy: ClientProxyProtocol {
return nil
}
}
private func createLiveLocationOwnInfoUpdatesObserver() -> TaskHandle? {
do {
return try client.subscribeToOwnBeaconInfoUpdates(listener: SDKListener { [weak self] update in
@@ -1187,7 +1187,7 @@ class ClientProxy: ClientProxyProtocol {
return nil
}
}
private func createRoomListServiceObserver(_ roomListService: RoomListService) -> TaskHandle {
roomListService.state(listener: SDKListener { [weak self] state in
guard let self else { return }
@@ -1272,7 +1272,7 @@ class ClientProxy: ClientProxyProtocol {
MXLog.info("Wait for \(roomID) failed: \(error)")
}
}
private func updateIgnoredUsers() {
Task {
do {
@@ -1355,7 +1355,7 @@ private final class ClientDelegateWrapper: ClientDelegate {
}
// MARK: - ClientDelegate
func didReceiveAuthError(isSoftLogout: Bool) {
MXLog.error("Received authentication error, softlogout=\(isSoftLogout)")
authErrorCallback(isSoftLogout)
ElementX/Sources/Services/Client/ClientProxyProtocol.swift
+12 -12
View File
@@ -111,9 +111,9 @@ protocol ClientProxyProtocol: AnyObject {
var homeserverReachabilityPublisher: CurrentValuePublisher<NetworkMonitorReachability, Never> { get }
var userID: String { get }
var deviceID: String? { get }
var homeserver: String { get }
var canDeactivateAccount: Bool { get }
@@ -121,9 +121,9 @@ protocol ClientProxyProtocol: AnyObject {
var userIDServerName: String? { get }
var userDisplayNamePublisher: CurrentValuePublisher<String?, Never> { get }
var userAvatarURLPublisher: CurrentValuePublisher<URL?, Never> { get }
/// We delay fetching this until after the first sync. Nil until then
var ignoredUsersPublisher: CurrentValuePublisher<[String]?, Never> { get }
@@ -170,13 +170,13 @@ protocol ClientProxyProtocol: AnyObject {
func hasDevicesToVerifyAgainst() async -> Result<Bool, ClientProxyError>
func startSync()
func stopSync()
func stopSync(completion: (() -> Void)?) // Hopefully this will become async once we get SE-0371.
func expireSyncSessions() async
func accountURL(action: AccountManagementAction) async -> URL?
func directRoomForUserID(_ userID: String) -> Result<String?, ClientProxyError>
@@ -217,7 +217,7 @@ protocol ClientProxyProtocol: AnyObject {
@discardableResult func loadUserDisplayName() async -> Result<Void, ClientProxyError>
func setUserDisplayName(_ name: String) async -> Result<Void, ClientProxyError>
@discardableResult func loadUserAvatarURL() async -> Result<Void, ClientProxyError>
func setUserAvatar(media: MediaInfo) async -> Result<Void, ClientProxyError>
@@ -229,7 +229,7 @@ protocol ClientProxyProtocol: AnyObject {
func deactivateAccount(password: String?, eraseData: Bool) async -> Result<Void, ClientProxyError>
func logout() async
func setPusher(with configuration: PusherConfiguration) async throws
func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError>
@@ -245,13 +245,13 @@ protocol ClientProxyProtocol: AnyObject {
@discardableResult func clearCaches() async -> Result<Void, ClientProxyError>
@discardableResult func optimizeStores() async -> Result<Void, ClientProxyError>
@discardableResult func markAllRoomsAsRead() async -> Result<Void, ClientProxyError>
func storeSizes() async -> Result<StoreSizes, ClientProxyError>
func fetchMediaPreviewConfiguration() async -> Result<MediaPreviewConfig?, ClientProxyError>
// MARK: - Ignored users
func ignoreUser(_ userID: String) async -> Result<Void, ClientProxyError>
@@ -277,10 +277,10 @@ protocol ClientProxyProtocol: AnyObject {
func userIdentity(for userID: String, fallBackToServer: Bool) async -> Result<UserIdentityProxyProtocol?, ClientProxyError>
// MARK: - Live Location
/// Publishes updates about the current user's own live location beacon info state changes (start/stop) as echoed by the server.
var liveLocationOwnInfoUpdatesPublisher: AnyPublisher<LiveLocationOwnInfoUpdate, Never> { get }
// MARK: - Moderation & Safety
func setTimelineMediaVisibility(_ value: TimelineMediaVisibility) async -> Result<Void, ClientProxyError>