Update the SDK to 25.03.20. (#3925)

ElementX.xcodeproj/project.pbxproj

@@ -8557,7 +8557,7 @@
 			repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 25.03.13;
+				version = 25.03.20;
 			};
 		};
 		701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -149,8 +149,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/matrix-rust-components-swift",
       "state" : {
-        "revision" : "8f2da37eb65525a62b33c93edb41549ad94107e3",
+        "revision" : "d86698c49d66f2cc100a37d55e591f60b98c5bc4",
-        "version" : "25.3.13"
+        "version" : "25.3.20"
       }
     },
     {

ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift

@@ -46,11 +46,11 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
     open var abortOidcAuthAuthorizationDataCalled: Bool {
         return abortOidcAuthAuthorizationDataCallsCount > 0
     }
-    open var abortOidcAuthAuthorizationDataReceivedAuthorizationData: OidcAuthorizationData?
+    open var abortOidcAuthAuthorizationDataReceivedAuthorizationData: OAuthAuthorizationData?
-    open var abortOidcAuthAuthorizationDataReceivedInvocations: [OidcAuthorizationData] = []
+    open var abortOidcAuthAuthorizationDataReceivedInvocations: [OAuthAuthorizationData] = []
-    open var abortOidcAuthAuthorizationDataClosure: ((OidcAuthorizationData) async -> Void)?
+    open var abortOidcAuthAuthorizationDataClosure: ((OAuthAuthorizationData) async -> Void)?
 
-    open override func abortOidcAuth(authorizationData: OidcAuthorizationData) async {
+    open override func abortOidcAuth(authorizationData: OAuthAuthorizationData) async {
         abortOidcAuthAuthorizationDataCallsCount += 1
         abortOidcAuthAuthorizationDataReceivedAuthorizationData = authorizationData
         DispatchQueue.main.async {
@@ -2595,11 +2595,11 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
     open var loginWithOidcCallbackAuthorizationDataCallbackUrlCalled: Bool {
         return loginWithOidcCallbackAuthorizationDataCallbackUrlCallsCount > 0
     }
-    open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedArguments: (authorizationData: OidcAuthorizationData, callbackUrl: String)?
+    open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedArguments: (authorizationData: OAuthAuthorizationData, callbackUrl: String)?
-    open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedInvocations: [(authorizationData: OidcAuthorizationData, callbackUrl: String)] = []
+    open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedInvocations: [(authorizationData: OAuthAuthorizationData, callbackUrl: String)] = []
-    open var loginWithOidcCallbackAuthorizationDataCallbackUrlClosure: ((OidcAuthorizationData, String) async throws -> Void)?
+    open var loginWithOidcCallbackAuthorizationDataCallbackUrlClosure: ((OAuthAuthorizationData, String) async throws -> Void)?
 
-    open override func loginWithOidcCallback(authorizationData: OidcAuthorizationData, callbackUrl: String) async throws {
+    open override func loginWithOidcCallback(authorizationData: OAuthAuthorizationData, callbackUrl: String) async throws {
         if let error = loginWithOidcCallbackAuthorizationDataCallbackUrlThrowableError {
             throw error
         }
@@ -4189,13 +4189,13 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
     open var urlForOidcOidcConfigurationPromptReceivedArguments: (oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?)?
     open var urlForOidcOidcConfigurationPromptReceivedInvocations: [(oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?)] = []
 
-    var urlForOidcOidcConfigurationPromptUnderlyingReturnValue: OidcAuthorizationData!
+    var urlForOidcOidcConfigurationPromptUnderlyingReturnValue: OAuthAuthorizationData!
-    open var urlForOidcOidcConfigurationPromptReturnValue: OidcAuthorizationData! {
+    open var urlForOidcOidcConfigurationPromptReturnValue: OAuthAuthorizationData! {
         get {
             if Thread.isMainThread {
                 return urlForOidcOidcConfigurationPromptUnderlyingReturnValue
             } else {
-                var returnValue: OidcAuthorizationData? = nil
+                var returnValue: OAuthAuthorizationData? = nil
                 DispatchQueue.main.sync {
                     returnValue = urlForOidcOidcConfigurationPromptUnderlyingReturnValue
                 }
@@ -4213,9 +4213,9 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
             }
         }
     }
-    open var urlForOidcOidcConfigurationPromptClosure: ((OidcConfiguration, OidcPrompt?) async throws -> OidcAuthorizationData)?
+    open var urlForOidcOidcConfigurationPromptClosure: ((OidcConfiguration, OidcPrompt?) async throws -> OAuthAuthorizationData)?
 
-    open override func urlForOidc(oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?) async throws -> OidcAuthorizationData {
+    open override func urlForOidc(oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?) async throws -> OAuthAuthorizationData {
         if let error = urlForOidcOidcConfigurationPromptThrowableError {
             throw error
         }
@@ -9737,6 +9737,52 @@ open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unc
         try await setCallEnabledEnabledClosure?(enabled)
     }
 
+    //MARK: - setCustomPushRule
+
+    open var setCustomPushRuleRuleIdRuleKindActionsConditionsThrowableError: Error?
+    var setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount = 0
+    open var setCustomPushRuleRuleIdRuleKindActionsConditionsCallsCount: Int {
+        get {
+            if Thread.isMainThread {
+                return setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount
+            } else {
+                var returnValue: Int? = nil
+                DispatchQueue.main.sync {
+                    returnValue = setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount
+                }
+
+                return returnValue!
+            }
+        }
+        set {
+            if Thread.isMainThread {
+                setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount = newValue
+            } else {
+                DispatchQueue.main.sync {
+                    setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount = newValue
+                }
+            }
+        }
+    }
+    open var setCustomPushRuleRuleIdRuleKindActionsConditionsCalled: Bool {
+        return setCustomPushRuleRuleIdRuleKindActionsConditionsCallsCount > 0
+    }
+    open var setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedArguments: (ruleId: String, ruleKind: RuleKind, actions: [Action], conditions: [PushCondition])?
+    open var setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedInvocations: [(ruleId: String, ruleKind: RuleKind, actions: [Action], conditions: [PushCondition])] = []
+    open var setCustomPushRuleRuleIdRuleKindActionsConditionsClosure: ((String, RuleKind, [Action], [PushCondition]) async throws -> Void)?
+
+    open override func setCustomPushRule(ruleId: String, ruleKind: RuleKind, actions: [Action], conditions: [PushCondition]) async throws {
+        if let error = setCustomPushRuleRuleIdRuleKindActionsConditionsThrowableError {
+            throw error
+        }
+        setCustomPushRuleRuleIdRuleKindActionsConditionsCallsCount += 1
+        setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedArguments = (ruleId: ruleId, ruleKind: ruleKind, actions: actions, conditions: conditions)
+        DispatchQueue.main.async {
+            self.setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedInvocations.append((ruleId: ruleId, ruleKind: ruleKind, actions: actions, conditions: conditions))
+        }
+        try await setCustomPushRuleRuleIdRuleKindActionsConditionsClosure?(ruleId, ruleKind, actions, conditions)
+    }
+
     //MARK: - setDefaultRoomNotificationMode
 
     open var setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeThrowableError: Error?
@@ -10055,7 +10101,7 @@ open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unc
         try await unmuteRoomRoomIdIsEncryptedIsOneToOneClosure?(roomId, isEncrypted, isOneToOne)
     }
 }
-open class OidcAuthorizationDataSDKMock: MatrixRustSDK.OidcAuthorizationData, @unchecked Sendable {
+open class OAuthAuthorizationDataSDKMock: MatrixRustSDK.OAuthAuthorizationData, @unchecked Sendable {
     init() {
         super.init(noPointer: .init())
     }

ElementX/Sources/Mocks/SDK/ClientSDKMock.swift

@@ -42,7 +42,7 @@ extension ClientSDKMock {
         userIdServerNameThrowableError = MockError.generic
         serverReturnValue = "https://\(configuration.serverAddress)"
         getUrlUrlReturnValue = configuration.elementWellKnown
-        urlForOidcOidcConfigurationPromptReturnValue = OidcAuthorizationDataSDKMock(configuration: configuration)
+        urlForOidcOidcConfigurationPromptReturnValue = OAuthAuthorizationDataSDKMock(configuration: configuration)
         loginUsernamePasswordInitialDeviceNameDeviceIdClosure = { username, password, _, _ in
             guard username == configuration.validCredentials.username,
                   password == configuration.validCredentials.password else {
@@ -66,7 +66,7 @@ extension HomeserverLoginDetailsSDKMock {
     }
 }
 
-extension OidcAuthorizationDataSDKMock {
+extension OAuthAuthorizationDataSDKMock {
     convenience init(configuration: ClientSDKMock.Configuration) {
         self.init()
         

ElementX/Sources/Services/Authentication/AuthenticationServiceProtocol.swift

@@ -69,7 +69,7 @@ enum OIDCError: Error {
 }
 
 struct OIDCAuthorizationDataProxy: Equatable {
-    let underlyingData: OidcAuthorizationData
+    let underlyingData: OAuthAuthorizationData
     
     var url: URL {
         guard let url = URL(string: underlyingData.loginUrl()) else {
@@ -79,8 +79,8 @@ struct OIDCAuthorizationDataProxy: Equatable {
     }
 }
 
-extension OidcAuthorizationData: @retroactive Equatable {
+extension OAuthAuthorizationData: @retroactive Equatable {
-    public static func == (lhs: MatrixRustSDK.OidcAuthorizationData, rhs: MatrixRustSDK.OidcAuthorizationData) -> Bool {
+    public static func == (lhs: MatrixRustSDK.OAuthAuthorizationData, rhs: MatrixRustSDK.OAuthAuthorizationData) -> Bool {
         lhs.loginUrl() == rhs.loginUrl()
     }
 }

project.yml

@@ -59,7 +59,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/element-hq/matrix-rust-components-swift
-    exactVersion: 25.03.13
+    exactVersion: 25.03.20
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios