diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 35142bb6a..b282ba399 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -9829,7 +9829,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.02.24; + version = 26.03.02; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index bd975af1d..139c5db3b 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "535c4d88d082716c37209d98cfd37fe407a0e04be32c7557518b5055b6accb3b", + "originHash" : "c8d3524e489088d57c95c07d456b207dd2173bee60536bc6267d5fa344e343bf", "pins" : [ { "identity" : "compound-design-tokens", @@ -159,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "4773764d92fb0a3a212b39bc54cd8399d43d482e", - "version" : "26.2.24" + "revision" : "4051d59a3ab0eb0de810e762c23bd424f9ebc693", + "version" : "26.3.2" } }, { diff --git a/ElementX/Sources/Other/Extensions/ClientBuilder.swift b/ElementX/Sources/Other/Extensions/ClientBuilder.swift index 5a887cc70..bfccd3870 100644 --- a/ElementX/Sources/Other/Extensions/ClientBuilder.swift +++ b/ElementX/Sources/Other/Extensions/ClientBuilder.swift @@ -23,7 +23,6 @@ extension ClientBuilder { threadsEnabled: Bool) -> ClientBuilder { var builder = ClientBuilder() .crossProcessLockConfig(crossProcessLockConfig: .multiProcess(holderName: InfoPlistReader.main.bundleIdentifier)) - .enableOidcRefreshLock() .setSessionDelegate(sessionDelegate: sessionDelegate) .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent()) .threadsEnabled(enabled: threadsEnabled, threadSubscriptions: threadsEnabled) diff --git a/ElementX/Sources/Other/SDKListener.swift b/ElementX/Sources/Other/SDKListener.swift index 67dd11e63..709672aa4 100644 --- a/ElementX/Sources/Other/SDKListener.swift +++ b/ElementX/Sources/Other/SDKListener.swift @@ -199,8 +199,8 @@ extension SDKListener: KnockRequestsListener where T == [KnockRequest] { // MARK: TimelineProxy -extension SDKListener: PaginationStatusListener where T == RoomPaginationStatus { - func onUpdate(status: RoomPaginationStatus) { +extension SDKListener: PaginationStatusListener where T == PaginationStatus { + func onUpdate(status: PaginationStatus) { onUpdateClosure(status) } } diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift index c7ee2ebed..49b8d6659 100644 --- a/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift +++ b/ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenViewModel.swift @@ -88,7 +88,7 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo await userSession.clientProxy.loadUserAvatarURL() await userSession.clientProxy.loadUserDisplayName() await state.accountProfileURL = userSession.clientProxy.accountURL(action: .profile) - await state.accountSessionsListURL = userSession.clientProxy.accountURL(action: .sessionsList) + await state.accountSessionsListURL = userSession.clientProxy.accountURL(action: .devicesList) } } diff --git a/ElementX/Sources/Services/Timeline/TimelineProxy.swift b/ElementX/Sources/Services/Timeline/TimelineProxy.swift index 9104e7c88..73a7d5f09 100644 --- a/ElementX/Sources/Services/Timeline/TimelineProxy.swift +++ b/ElementX/Sources/Services/Timeline/TimelineProxy.swift @@ -585,7 +585,7 @@ final class TimelineProxy: TimelineProxyProtocol { private func subscribeToPagination() async { switch kind { case .live: - let backPaginationListener = SDKListener { [weak self] status in + let backPaginationListener = SDKListener { [weak self] status in guard let self else { return } diff --git a/NSE/Sources/NSEUserSession.swift b/NSE/Sources/NSEUserSession.swift index a509f1c08..a72457240 100644 --- a/NSE/Sources/NSEUserSession.swift +++ b/NSE/Sources/NSEUserSession.swift @@ -109,6 +109,9 @@ final class NSEUserSession: NSEUserSessionProtocol { case .eventFilteredOut: MXLog.warning("Notification event filtered out - roomID: \(roomID) eventID: \(eventID)") return nil + case .eventRedacted: + MXLog.warning("Notification event redacted - roomID: \(roomID) eventID: \(eventID)") + return nil } } catch { MXLog.error("Could not get notification's content creating an empty notification instead, error: \(error)") diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index 39a35e8ed..20715b5f3 100644 --- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -6891,71 +6891,6 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } - //MARK: - enableOidcRefreshLock - - open var enableOidcRefreshLockUnderlyingCallsCount = 0 - open var enableOidcRefreshLockCallsCount: Int { - get { - if Thread.isMainThread { - return enableOidcRefreshLockUnderlyingCallsCount - } else { - var returnValue: Int? = nil - DispatchQueue.main.sync { - returnValue = enableOidcRefreshLockUnderlyingCallsCount - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - enableOidcRefreshLockUnderlyingCallsCount = newValue - } else { - DispatchQueue.main.sync { - enableOidcRefreshLockUnderlyingCallsCount = newValue - } - } - } - } - open var enableOidcRefreshLockCalled: Bool { - return enableOidcRefreshLockCallsCount > 0 - } - - open var enableOidcRefreshLockUnderlyingReturnValue: ClientBuilder! - open var enableOidcRefreshLockReturnValue: ClientBuilder! { - get { - if Thread.isMainThread { - return enableOidcRefreshLockUnderlyingReturnValue - } else { - var returnValue: ClientBuilder? = nil - DispatchQueue.main.sync { - returnValue = enableOidcRefreshLockUnderlyingReturnValue - } - - return returnValue! - } - } - set { - if Thread.isMainThread { - enableOidcRefreshLockUnderlyingReturnValue = newValue - } else { - DispatchQueue.main.sync { - enableOidcRefreshLockUnderlyingReturnValue = newValue - } - } - } - } - open var enableOidcRefreshLockClosure: (() -> ClientBuilder)? - - open override func enableOidcRefreshLock() -> ClientBuilder { - enableOidcRefreshLockCallsCount += 1 - if let enableOidcRefreshLockClosure = enableOidcRefreshLockClosure { - return enableOidcRefreshLockClosure() - } else { - return enableOidcRefreshLockReturnValue - } - } - //MARK: - enableShareHistoryOnInvite open var enableShareHistoryOnInviteEnableShareHistoryOnInviteUnderlyingCallsCount = 0 diff --git a/project.yml b/project.yml index cda442318..f45ce49f7 100644 --- a/project.yml +++ b/project.yml @@ -73,7 +73,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 26.02.24 + exactVersion: 26.03.02 # path: ../matrix-rust-sdk Compound: path: compound-ios