From b8a6763d1167e69ccf9fc24ef5e01e365f792dfa Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Wed, 23 Jul 2025 17:20:39 +0300
Subject: [PATCH] Bump the RustSDK to v25.07.23

---
 ElementX.xcodeproj/project.pbxproj                     |  2 +-
 .../xcshareddata/swiftpm/Package.resolved              |  4 ++--
 .../Sources/Mocks/Generated/SDKGeneratedMocks.swift    | 10 +++++-----
 ElementX/Sources/Mocks/SDK/ClientSDKMock.swift         |  5 +++--
 ElementX/Sources/Services/Client/Client.swift          |  6 +-----
 project.yml                                            |  2 +-
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 4b4c70dea..a57fd27a1 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -9036,7 +9036,7 @@
 			repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 25.07.15;
+				version = 25.07.23;
 			};
 		};
 		701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7b1a118d2..9d04edecd 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -158,8 +158,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/matrix-rust-components-swift",
       "state" : {
-        "revision" : "1c896dcca3bd302b492a71b3d020f50d8407fea0",
-        "version" : "25.7.15"
+        "revision" : "4a9adc537b42360b525474b1122678cb3394817f",
+        "version" : "25.7.23"
       }
     },
     {
diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
index b011ad52a..d8aecb1f4 100644
--- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
@@ -2168,13 +2168,13 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
     open var getUrlUrlReceivedUrl: String?
     open var getUrlUrlReceivedInvocations: [String] = []
 
-    var getUrlUrlUnderlyingReturnValue: String!
-    open var getUrlUrlReturnValue: String! {
+    var getUrlUrlUnderlyingReturnValue: Data!
+    open var getUrlUrlReturnValue: Data! {
         get {
             if Thread.isMainThread {
                 return getUrlUrlUnderlyingReturnValue
             } else {
-                var returnValue: String? = nil
+                var returnValue: Data? = nil
                 DispatchQueue.main.sync {
                     returnValue = getUrlUrlUnderlyingReturnValue
                 }
@@ -2192,9 +2192,9 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
             }
         }
     }
-    open var getUrlUrlClosure: ((String) async throws -> String)?
+    open var getUrlUrlClosure: ((String) async throws -> Data)?
 
-    open override func getUrl(url: String) async throws -> String {
+    open override func getUrl(url: String) async throws -> Data {
         if let error = getUrlUrlThrowableError {
             throw error
         }
diff --git a/ElementX/Sources/Mocks/SDK/ClientSDKMock.swift b/ElementX/Sources/Mocks/SDK/ClientSDKMock.swift
index 776c6e5b6..a1643be2b 100644
--- a/ElementX/Sources/Mocks/SDK/ClientSDKMock.swift
+++ b/ElementX/Sources/Mocks/SDK/ClientSDKMock.swift
@@ -43,7 +43,7 @@ extension ClientSDKMock {
         userIdServerNameThrowableError = MockError.generic
         serverReturnValue = "https://\(configuration.serverAddress)"
         homeserverReturnValue = configuration.homeserverURL
-        urlForOidcOidcConfigurationPromptLoginHintDeviceIdReturnValue = OAuthAuthorizationDataSDKMock(configuration: configuration)
+        urlForOidcOidcConfigurationPromptLoginHintDeviceIdAdditionalScopesReturnValue = OAuthAuthorizationDataSDKMock(configuration: configuration)
         loginUsernamePasswordInitialDeviceNameDeviceIdClosure = { username, password, _, _ in
             guard username == configuration.validCredentials.username,
                   password == configuration.validCredentials.password else {
@@ -56,7 +56,8 @@ extension ClientSDKMock {
         getUrlUrlClosure = { url in
             guard url.contains(".well-known/element/element.json") else { throw MockError.generic }
             if let elementWellKnown = configuration.elementWellKnown {
-                return elementWellKnown
+                guard let data = elementWellKnown.data(using: .utf8) else { fatalError() }
+                return data
             } else {
                 throw MockError.generic
             }
diff --git a/ElementX/Sources/Services/Client/Client.swift b/ElementX/Sources/Services/Client/Client.swift
index 116d5402a..dbdecc851 100644
--- a/ElementX/Sources/Services/Client/Client.swift
+++ b/ElementX/Sources/Services/Client/Client.swift
@@ -21,11 +21,7 @@ extension ClientProtocol {
                 return .failure(.invalidServerName)
             }
             
-            let response = try await getUrl(url: url.absoluteString)
-            
-            guard let data = response.data(using: .utf8) else {
-                return .failure(.invalidResponse)
-            }
+            let data = try await getUrl(url: url.absoluteString)
             
             return .success(data)
         } catch {
diff --git a/project.yml b/project.yml
index 90197cfca..744e0e3a4 100644
--- a/project.yml
+++ b/project.yml
@@ -68,7 +68,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/element-hq/matrix-rust-components-swift
-    exactVersion: 25.07.15
+    exactVersion: 25.07.23
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios