Skip to content

Commit 8e9e657

Browse files
pixlwavepixlwave
authored
Update the SDK to 25.03.20. (#3925)
1 parent 015e235 commit 8e9e657

File tree

7 files changed

+70
-24
lines changed

7 files changed

+70
-24
lines changed

‎ElementX.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8557,7 +8557,7 @@
85578557
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
85588558
requirement = {
85598559
kind = exactVersion;
8560-
version = 25.03.13;
8560+
version = 25.03.20;
85618561
};
85628562
};
85638563
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift

Lines changed: 60 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
4646
open var abortOidcAuthAuthorizationDataCalled: Bool {
4747
return abortOidcAuthAuthorizationDataCallsCount > 0
4848
}
49-
open var abortOidcAuthAuthorizationDataReceivedAuthorizationData: OidcAuthorizationData?
50-
open var abortOidcAuthAuthorizationDataReceivedInvocations: [OidcAuthorizationData] = []
51-
open var abortOidcAuthAuthorizationDataClosure: ((OidcAuthorizationData) async -> Void)?
49+
open var abortOidcAuthAuthorizationDataReceivedAuthorizationData: OAuthAuthorizationData?
50+
open var abortOidcAuthAuthorizationDataReceivedInvocations: [OAuthAuthorizationData] = []
51+
open var abortOidcAuthAuthorizationDataClosure: ((OAuthAuthorizationData) async -> Void)?
5252

53-
open override func abortOidcAuth(authorizationData: OidcAuthorizationData) async {
53+
open override func abortOidcAuth(authorizationData: OAuthAuthorizationData) async {
5454
abortOidcAuthAuthorizationDataCallsCount += 1
5555
abortOidcAuthAuthorizationDataReceivedAuthorizationData = authorizationData
5656
DispatchQueue.main.async {
@@ -2595,11 +2595,11 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
25952595
open var loginWithOidcCallbackAuthorizationDataCallbackUrlCalled: Bool {
25962596
return loginWithOidcCallbackAuthorizationDataCallbackUrlCallsCount > 0
25972597
}
2598-
open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedArguments: (authorizationData: OidcAuthorizationData, callbackUrl: String)?
2599-
open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedInvocations: [(authorizationData: OidcAuthorizationData, callbackUrl: String)] = []
2600-
open var loginWithOidcCallbackAuthorizationDataCallbackUrlClosure: ((OidcAuthorizationData, String) async throws -> Void)?
2598+
open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedArguments: (authorizationData: OAuthAuthorizationData, callbackUrl: String)?
2599+
open var loginWithOidcCallbackAuthorizationDataCallbackUrlReceivedInvocations: [(authorizationData: OAuthAuthorizationData, callbackUrl: String)] = []
2600+
open var loginWithOidcCallbackAuthorizationDataCallbackUrlClosure: ((OAuthAuthorizationData, String) async throws -> Void)?
26012601

2602-
open override func loginWithOidcCallback(authorizationData: OidcAuthorizationData, callbackUrl: String) async throws {
2602+
open override func loginWithOidcCallback(authorizationData: OAuthAuthorizationData, callbackUrl: String) async throws {
26032603
if let error = loginWithOidcCallbackAuthorizationDataCallbackUrlThrowableError {
26042604
throw error
26052605
}
@@ -4189,13 +4189,13 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
41894189
open var urlForOidcOidcConfigurationPromptReceivedArguments: (oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?)?
41904190
open var urlForOidcOidcConfigurationPromptReceivedInvocations: [(oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?)] = []
41914191

4192-
var urlForOidcOidcConfigurationPromptUnderlyingReturnValue: OidcAuthorizationData!
4193-
open var urlForOidcOidcConfigurationPromptReturnValue: OidcAuthorizationData! {
4192+
var urlForOidcOidcConfigurationPromptUnderlyingReturnValue: OAuthAuthorizationData!
4193+
open var urlForOidcOidcConfigurationPromptReturnValue: OAuthAuthorizationData! {
41944194
get {
41954195
if Thread.isMainThread {
41964196
return urlForOidcOidcConfigurationPromptUnderlyingReturnValue
41974197
} else {
4198-
var returnValue: OidcAuthorizationData? = nil
4198+
var returnValue: OAuthAuthorizationData? = nil
41994199
DispatchQueue.main.sync {
42004200
returnValue = urlForOidcOidcConfigurationPromptUnderlyingReturnValue
42014201
}
@@ -4213,9 +4213,9 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
42134213
}
42144214
}
42154215
}
4216-
open var urlForOidcOidcConfigurationPromptClosure: ((OidcConfiguration, OidcPrompt?) async throws -> OidcAuthorizationData)?
4216+
open var urlForOidcOidcConfigurationPromptClosure: ((OidcConfiguration, OidcPrompt?) async throws -> OAuthAuthorizationData)?
42174217

4218-
open override func urlForOidc(oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?) async throws -> OidcAuthorizationData {
4218+
open override func urlForOidc(oidcConfiguration: OidcConfiguration, prompt: OidcPrompt?) async throws -> OAuthAuthorizationData {
42194219
if let error = urlForOidcOidcConfigurationPromptThrowableError {
42204220
throw error
42214221
}
@@ -9737,6 +9737,52 @@ open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unc
97379737
try await setCallEnabledEnabledClosure?(enabled)
97389738
}
97399739

9740+
//MARK: - setCustomPushRule
9741+
9742+
open var setCustomPushRuleRuleIdRuleKindActionsConditionsThrowableError: Error?
9743+
var setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount = 0
9744+
open var setCustomPushRuleRuleIdRuleKindActionsConditionsCallsCount: Int {
9745+
get {
9746+
if Thread.isMainThread {
9747+
return setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount
9748+
} else {
9749+
var returnValue: Int? = nil
9750+
DispatchQueue.main.sync {
9751+
returnValue = setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount
9752+
}
9753+
9754+
return returnValue!
9755+
}
9756+
}
9757+
set {
9758+
if Thread.isMainThread {
9759+
setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount = newValue
9760+
} else {
9761+
DispatchQueue.main.sync {
9762+
setCustomPushRuleRuleIdRuleKindActionsConditionsUnderlyingCallsCount = newValue
9763+
}
9764+
}
9765+
}
9766+
}
9767+
open var setCustomPushRuleRuleIdRuleKindActionsConditionsCalled: Bool {
9768+
return setCustomPushRuleRuleIdRuleKindActionsConditionsCallsCount > 0
9769+
}
9770+
open var setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedArguments: (ruleId: String, ruleKind: RuleKind, actions: [Action], conditions: [PushCondition])?
9771+
open var setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedInvocations: [(ruleId: String, ruleKind: RuleKind, actions: [Action], conditions: [PushCondition])] = []
9772+
open var setCustomPushRuleRuleIdRuleKindActionsConditionsClosure: ((String, RuleKind, [Action], [PushCondition]) async throws -> Void)?
9773+
9774+
open override func setCustomPushRule(ruleId: String, ruleKind: RuleKind, actions: [Action], conditions: [PushCondition]) async throws {
9775+
if let error = setCustomPushRuleRuleIdRuleKindActionsConditionsThrowableError {
9776+
throw error
9777+
}
9778+
setCustomPushRuleRuleIdRuleKindActionsConditionsCallsCount += 1
9779+
setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedArguments = (ruleId: ruleId, ruleKind: ruleKind, actions: actions, conditions: conditions)
9780+
DispatchQueue.main.async {
9781+
self.setCustomPushRuleRuleIdRuleKindActionsConditionsReceivedInvocations.append((ruleId: ruleId, ruleKind: ruleKind, actions: actions, conditions: conditions))
9782+
}
9783+
try await setCustomPushRuleRuleIdRuleKindActionsConditionsClosure?(ruleId, ruleKind, actions, conditions)
9784+
}
9785+
97409786
//MARK: - setDefaultRoomNotificationMode
97419787

97429788
open var setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeThrowableError: Error?
@@ -10055,7 +10101,7 @@ open class NotificationSettingsSDKMock: MatrixRustSDK.NotificationSettings, @unc
1005510101
try await unmuteRoomRoomIdIsEncryptedIsOneToOneClosure?(roomId, isEncrypted, isOneToOne)
1005610102
}
1005710103
}
10058-
open class OidcAuthorizationDataSDKMock: MatrixRustSDK.OidcAuthorizationData, @unchecked Sendable {
10104+
open class OAuthAuthorizationDataSDKMock: MatrixRustSDK.OAuthAuthorizationData, @unchecked Sendable {
1005910105
init() {
1006010106
super.init(noPointer: .init())
1006110107
}

‎ElementX/Sources/Mocks/SDK/ClientSDKMock.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extension ClientSDKMock {
4242
userIdServerNameThrowableError = MockError.generic
4343
serverReturnValue = "https://\(configuration.serverAddress)"
4444
getUrlUrlReturnValue = configuration.elementWellKnown
45-
urlForOidcOidcConfigurationPromptReturnValue = OidcAuthorizationDataSDKMock(configuration: configuration)
45+
urlForOidcOidcConfigurationPromptReturnValue = OAuthAuthorizationDataSDKMock(configuration: configuration)
4646
loginUsernamePasswordInitialDeviceNameDeviceIdClosure = { username, password, _, _ in
4747
guard username == configuration.validCredentials.username,
4848
password == configuration.validCredentials.password else {
@@ -66,7 +66,7 @@ extension HomeserverLoginDetailsSDKMock {
6666
}
6767
}
6868

69-
extension OidcAuthorizationDataSDKMock {
69+
extension OAuthAuthorizationDataSDKMock {
7070
convenience init(configuration: ClientSDKMock.Configuration) {
7171
self.init()
7272

‎ElementX/Sources/Services/Authentication/AuthenticationServiceProtocol.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ enum OIDCError: Error {
6969
}
7070

7171
struct OIDCAuthorizationDataProxy: Equatable {
72-
let underlyingData: OidcAuthorizationData
72+
let underlyingData: OAuthAuthorizationData
7373

7474
var url: URL {
7575
guard let url = URL(string: underlyingData.loginUrl()) else {
@@ -79,8 +79,8 @@ struct OIDCAuthorizationDataProxy: Equatable {
7979
}
8080
}
8181

82-
extension OidcAuthorizationData: @retroactive Equatable {
83-
public static func == (lhs: MatrixRustSDK.OidcAuthorizationData, rhs: MatrixRustSDK.OidcAuthorizationData) -> Bool {
82+
extension OAuthAuthorizationData: @retroactive Equatable {
83+
public static func == (lhs: MatrixRustSDK.OAuthAuthorizationData, rhs: MatrixRustSDK.OAuthAuthorizationData) -> Bool {
8484
lhs.loginUrl() == rhs.loginUrl()
8585
}
8686
}

‎Enterprise

‎project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ packages:
5959
# Element/Matrix dependencies
6060
MatrixRustSDK:
6161
url: https://github.com/element-hq/matrix-rust-components-swift
62-
exactVersion: 25.03.13
62+
exactVersion: 25.03.20
6363
# path: ../matrix-rust-sdk
6464
Compound:
6565
url: https://github.com/element-hq/compound-ios

0 commit comments

Comments
 (0)