Configure SDK to use the global/OS proxy (#2493)

ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift

@@ -46,11 +46,12 @@ class AuthenticationServiceProxy: AuthenticationServiceProxyProtocol {
                                                   policyUri: appSettings.privacyURL.absoluteString,
                                                   contacts: [appSettings.supportEmailAddress],
                                                   staticRegistrations: appSettings.oidcStaticRegistrations.mapKeys { $0.absoluteString })
-        
+               
         authenticationService = AuthenticationService(basePath: userSessionStore.baseDirectory.path,
                                                       passphrase: passphrase,
                                                       userAgent: UserAgentBuilder.makeASCIIUserAgent(),
                                                       additionalRootCertificates: [],
+                                                      proxy: appSettings.websiteURL.globalProxy,
                                                       oidcConfiguration: oidcConfiguration,
                                                       customSlidingSyncProxy: appSettings.slidingSyncProxyURL?.absoluteString,
                                                       sessionDelegate: userSessionStore.clientSessionDelegate,

ElementX/Sources/Services/Room/RoomProxy.swift

@@ -242,13 +242,11 @@ class RoomProxy: RoomProxyProtocol {
             sendMessageBackgroundTask?.stop()
         }
         
-        return await Task.dispatch(on: userInitiatedDispatchQueue) {
-            do {
-                try self.room.ignoreUser(userId: userID)
-                return .success(())
-            } catch {
-                return .failure(.failedReportingContent)
-            }
+        do {
+            try await room.ignoreUser(userId: userID)
+            return .success(())
+        } catch {
+            return .failure(.failedIgnoringUser)
         }
     }
 

ElementX/Sources/Services/Room/RoomProxyProtocol.swift

@@ -21,6 +21,7 @@ import MatrixRustSDK
 enum RoomProxyError: Error, Equatable {
     case failedRedactingEvent
     case failedReportingContent
+    case failedIgnoringUser
     case failedRetrievingMember
     case failedLeavingRoom
     case failedAcceptingInvite

ElementX/Sources/Services/UserSession/UserSessionStore.swift

@@ -115,19 +115,28 @@ class UserSessionStore: UserSessionStoreProtocol {
         if credentials.restorationToken.passphrase != nil {
             MXLog.info("Restoring client with encrypted store.")
         }
-        let builder = ClientBuilder()
+        
+        let homeserverURL = credentials.restorationToken.session.homeserverUrl
+        
+        var builder = ClientBuilder()
             .basePath(path: baseDirectory.path)
             .username(username: credentials.userID)
-            .homeserverUrl(url: credentials.restorationToken.session.homeserverUrl)
+            .homeserverUrl(url: homeserverURL)
             .passphrase(passphrase: credentials.restorationToken.passphrase)
             .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent())
             .enableCrossProcessRefreshLock(processId: InfoPlistReader.main.bundleIdentifier,
                                            sessionDelegate: keychainController)
             .serverVersions(versions: ["v1.0", "v1.1", "v1.2", "v1.3", "v1.4", "v1.5"]) // FIXME: Quick and dirty fix for stopping version requests on startup https://github.com/matrix-org/matrix-rust-sdk/pull/1376
-
+        
+        if let homeserverURL = URL(string: homeserverURL),
+           let proxy = homeserverURL.globalProxy {
+            builder = builder.proxy(url: proxy)
+        }
+        let completeBuilder = builder
+        
         do {
             let client: Client = try await Task.dispatch(on: .global()) {
-                let client = try builder.build()
+                let client = try completeBuilder.build()
                 try client.restoreSession(session: credentials.restorationToken.session)
                 return client
             }