Bump to version 25.02.19 (matrix-rust-sdk/main 2eb2ae7959a9af77d2faf11835821ad1d51d7d9f)

Author: pixlwave

Package.swift

@@ -1,8 +1,8 @@
 // swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 import PackageDescription
-let checksum = "13a62b88a768166c1d436acbe3ae27a436c706043bc45eabacd7412cef527a3a"
-let version = "24.12.20"
+let checksum = "d6db899fc3e31a986d03004197723fad9a9bd3b8c416da41411ab567ff152f03"
+let version = "25.02.19"
 let url = "https://github.com/matrix-org/matrix-rust-components-swift/releases/download/\(version)/MatrixSDKFFI.xcframework.zip"
 let package = Package(
     name: "MatrixRustSDK",

Sources/MatrixRustSDK/matrix_sdk.swift

@@ -914,9 +914,10 @@ public enum QrCodeLoginError {
 
 
     /**
-     * An error happened while we were communicating with the OIDC provider.
+     * An error happened while we were communicating with the OAuth 2.0
+     * authorization server.
      */
-    case Oidc(message: String)
+    case Oauth(message: String)
 
     /**
      * The other device has signaled to us that the login has failed.
@@ -940,7 +941,8 @@ public enum QrCodeLoginError {
 
     /**
      * An error happened while we were trying to discover our user and device
-     * ID, after we have acquired an access token from the OIDC provider.
+     * ID, after we have acquired an access token from the OAuth 2.0
+     * authorization server.
      */
     case UserIdDiscovery(message: String)
 
@@ -974,7 +976,7 @@ public struct FfiConverterTypeQRCodeLoginError: FfiConverterRustBuffer {
 
 
 
-        case 1: return .Oidc(
+        case 1: return .Oauth(
             message: try FfiConverterString.read(from: &buf)
         )
 
@@ -1021,7 +1023,7 @@ public struct FfiConverterTypeQRCodeLoginError: FfiConverterRustBuffer {
 
 
 
-        case .Oidc(_ /* message is ignored*/):
+        case .Oauth(_ /* message is ignored*/):
             writeInt(&buf, Int32(1))
         case .LoginFailure(_ /* message is ignored*/):
             writeInt(&buf, Int32(2))

Sources/MatrixRustSDK/matrix_sdk_crypto.swift

@@ -382,27 +382,6 @@ fileprivate class UniffiHandleMap<T> {
 // Public interface members begin here.
 
 
-fileprivate struct FfiConverterBool : FfiConverter {
-    typealias FfiType = Int8
-    typealias SwiftType = Bool
-
-    public static func lift(_ value: Int8) throws -> Bool {
-        return value != 0
-    }
-
-    public static func lower(_ value: Bool) -> Int8 {
-        return value ? 1 : 0
-    }
-
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Bool {
-        return try lift(readInt(&buf))
-    }
-
-    public static func write(_ value: Bool, into buf: inout [UInt8]) {
-        writeInt(&buf, lower(value))
-    }
-}
-
 fileprivate struct FfiConverterString: FfiConverter {
     typealias SwiftType = String
     typealias FfiType = RustBuffer
@@ -513,39 +492,42 @@ public func FfiConverterTypeDecryptionSettings_lower(_ value: DecryptionSettings
 public enum CollectStrategy {
 
     /**
-     * Device based sharing strategy.
+     * Share with all (unblacklisted) devices.
      */
-    case deviceBasedStrategy(
-        /**
-         * If `true`, devices that are not trusted will be excluded from the
-         * conversation. A device is trusted if any of the following is true:
-         * - It was manually marked as trusted.
-         * - It was marked as verified via interactive verification.
-         * - It is signed by its owner identity, and this identity has been
-         * trusted via interactive verification.
-         * - It is the current own device of the user.
-         */onlyAllowTrustedDevices: Bool, 
-        /**
-         * If `true`, and a verified user has an unsigned device, key sharing
-         * will fail with a
-         * [`SessionRecipientCollectionError::VerifiedUserHasUnsignedDevice`].
-         *
-         * If `true`, and a verified user has replaced their identity, key
-         * sharing will fail with a
-         * [`SessionRecipientCollectionError::VerifiedUserChangedIdentity`].
-         *
-         * Otherwise, keys are shared with unsigned devices as normal.
-         *
-         * Once the problematic devices are blacklisted or whitelisted the
-         * caller can retry to share a second time.
-         */errorOnVerifiedUserProblem: Bool
-    )
+    case allDevices
+    /**
+     * Share with all devices, except errors for *verified* users cause sharing
+     * to fail with an error.
+     *
+     * In this strategy, if a verified user has an unsigned device,
+     * key sharing will fail with a
+     * [`SessionRecipientCollectionError::VerifiedUserHasUnsignedDevice`].
+     * If a verified user has replaced their identity, key
+     * sharing will fail with a
+     * [`SessionRecipientCollectionError::VerifiedUserChangedIdentity`].
+     *
+     * Otherwise, keys are shared with unsigned devices as normal.
+     *
+     * Once the problematic devices are blacklisted or whitelisted the
+     * caller can retry to share a second time.
+     */
+    case errorOnVerifiedUserProblem
     /**
      * Share based on identity. Only distribute to devices signed by their
      * owner. If a user has no published identity he will not receive
      * any room keys.
      */
     case identityBasedStrategy
+    /**
+     * Only share keys with devices that we "trust". A device is trusted if any
+     * of the following is true:
+     * - It was manually marked as trusted.
+     * - It was marked as verified via interactive verification.
+     * - It is signed by its owner identity, and this identity has been
+     * trusted via interactive verification.
+     * - It is the current own device of the user.
+     */
+    case onlyTrustedDevices
 }
 
 
@@ -556,10 +538,13 @@ public struct FfiConverterTypeCollectStrategy: FfiConverterRustBuffer {
         let variant: Int32 = try readInt(&buf)
         switch variant {
 
-        case 1: return .deviceBasedStrategy(onlyAllowTrustedDevices: try FfiConverterBool.read(from: &buf), errorOnVerifiedUserProblem: try FfiConverterBool.read(from: &buf)
-        )
+        case 1: return .allDevices
 
-        case 2: return .identityBasedStrategy
+        case 2: return .errorOnVerifiedUserProblem
+        
+        case 3: return .identityBasedStrategy
+        
+        case 4: return .onlyTrustedDevices
 
         default: throw UniffiInternalError.unexpectedEnumCase
         }
@@ -569,15 +554,21 @@ public struct FfiConverterTypeCollectStrategy: FfiConverterRustBuffer {
         switch value {
 
 
-        case let .deviceBasedStrategy(onlyAllowTrustedDevices,errorOnVerifiedUserProblem):
+        case .allDevices:
             writeInt(&buf, Int32(1))
-            FfiConverterBool.write(onlyAllowTrustedDevices, into: &buf)
-            FfiConverterBool.write(errorOnVerifiedUserProblem, into: &buf)
-            
 
-        case .identityBasedStrategy:
+        
+        case .errorOnVerifiedUserProblem:
             writeInt(&buf, Int32(2))
 
+        
+        case .identityBasedStrategy:
+            writeInt(&buf, Int32(3))
+        
+        
+        case .onlyTrustedDevices:
+            writeInt(&buf, Int32(4))
+        
         }
     }
 }