Bump the RustSDK to v1.1.10

element-hq · Sep 7, 2023 · eecd862 · eecd862
1 parent 3bc474f
commit eecd862
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -5579,7 +5579,7 @@
 			repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 1.1.9;
+				version = 1.1.10;
 			};
 		};
 		821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {

diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -129,8 +129,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "c6b3c6cace0f4d35af98772ca944e90dc65e69f0",
-        "version" : "1.1.9"
+        "revision" : "73b1199017b79c210fb0dc93b3513d9bfc89210c",
+        "version" : "1.1.10"
       }
     },
     {
@@ -244,7 +244,7 @@
     {
       "identity" : "swiftui-introspect",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/siteline/SwiftUI-Introspect",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
       "state" : {
         "revision" : "b94da693e57eaf79d16464b8b7c90d09cba4e290",
         "version" : "0.9.2"

diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
@@ -1,4 +1,4 @@
-// Generated using Sourcery 2.0.2 — https://github.com/krzysztofzablocki/Sourcery
+// Generated using Sourcery 2.0.3 — https://github.com/krzysztofzablocki/Sourcery
 // DO NOT EDIT
 
 // swiftlint:disable all
@@ -400,23 +400,27 @@ class SDKClientMock: SDKClientProtocol {
     }
     //MARK: - notificationClient
 
-    public var notificationClientThrowableError: Error?
-    public var notificationClientCallsCount = 0
-    public var notificationClientCalled: Bool {
-        return notificationClientCallsCount > 0
+    public var notificationClientProcessSetupThrowableError: Error?
+    public var notificationClientProcessSetupCallsCount = 0
+    public var notificationClientProcessSetupCalled: Bool {
+        return notificationClientProcessSetupCallsCount > 0
     }
-    public var notificationClientReturnValue: NotificationClientBuilder!
-    public var notificationClientClosure: (() throws -> NotificationClientBuilder)?
+    public var notificationClientProcessSetupReceivedProcessSetup: NotificationProcessSetup?
+    public var notificationClientProcessSetupReceivedInvocations: [NotificationProcessSetup] = []
+    public var notificationClientProcessSetupReturnValue: NotificationClientBuilder!
+    public var notificationClientProcessSetupClosure: ((NotificationProcessSetup) throws -> NotificationClientBuilder)?
 
-    public func notificationClient() throws -> NotificationClientBuilder {
-        if let error = notificationClientThrowableError {
+    public func notificationClient(processSetup: NotificationProcessSetup) throws -> NotificationClientBuilder {
+        if let error = notificationClientProcessSetupThrowableError {
             throw error
         }
-        notificationClientCallsCount += 1
-        if let notificationClientClosure = notificationClientClosure {
-            return try notificationClientClosure()
+        notificationClientProcessSetupCallsCount += 1
+        notificationClientProcessSetupReceivedProcessSetup = processSetup
+        notificationClientProcessSetupReceivedInvocations.append(processSetup)
+        if let notificationClientProcessSetupClosure = notificationClientProcessSetupClosure {
+            return try notificationClientProcessSetupClosure(processSetup)
         } else {
-            return notificationClientReturnValue
+            return notificationClientProcessSetupReturnValue
         }
     }
     //MARK: - restoreSession

diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -393,8 +393,7 @@ class ClientProxy: ClientProxyProtocol {
         do {
             let syncService = try await client
                 .syncService()
-                .withEncryptionSync(withCrossProcessLock: true,
-                                    appIdentifier: "MainApp")
+                .withCrossProcessLock(appIdentifier: "MainApp")
                 .finish()
             let roomListService = syncService.roomListService()
 

diff --git a/NSE/Sources/Other/NSEUserSession.swift b/NSE/Sources/Other/NSEUserSession.swift
@@ -36,8 +36,7 @@ final class NSEUserSession {
         try baseClient.restoreSession(session: credentials.restorationToken.session)
 
         notificationClient = try baseClient
-            .notificationClient()
-            .retryDecryption(withCrossProcessLock: true)
+            .notificationClient(processSetup: .multipleProcesses)
             .filterByPushRules()
             .finish()
     }

diff --git a/project.yml b/project.yml
@@ -45,7 +45,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.1.9
+    exactVersion: 1.1.10
     # path: ../matrix-rust-sdk
   DesignKit:
     path: DesignKit