Merge pull request #102 from xmtp/cv/02-03-libxmtp_ae4eb9c_for_db_loc…

…k_fix_and_remove_pinned_frame_url libxmtp ae4eb9c for db lock fix and remove pinned frame url
xmtp · Feb 3, 2025 · 3d13358 · 3d13358
2 parents ccddde3 + 040b7fc
commit 3d13358
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 63 deletions.
diff --git a/LibXMTP.podspec b/LibXMTP.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'LibXMTP'
-  s.version          = '3.0.21'
+  s.version          = '3.0.22'
   s.summary          = 'XMTP shared Rust code that powers cross-platform SDKs'
 
   s.homepage         = 'https://github.com/xmtp/libxmtp-swift'
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.platform         = :ios, '14.0', :macos, '11.0'
   s.swift_version    = '5.3'
 
-  s.source           = { :http => "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-a48e9a7/LibXMTPSwiftFFI.zip", :type => :zip }
+  s.source           = { :http => "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-ae4eb9c/LibXMTPSwiftFFI.zip", :type => :zip }
   s.vendored_frameworks = 'LibXMTPSwiftFFI.xcframework'
   s.source_files = 'Sources/LibXMTP/**/*'
 end
diff --git a/Package.swift b/Package.swift
@@ -27,8 +27,8 @@ let package = Package(
         ),
         .binaryTarget(
             name: "LibXMTPSwiftFFI",
-            url: "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-a48e9a7/LibXMTPSwiftFFI.zip",
-            checksum: "453f81bf4129bff1637196450e051d153797fb7eddae6bfe2c0526911f6de0c9"
+            url: "https://github.com/xmtp/libxmtp/releases/download/swift-bindings-ae4eb9c/LibXMTPSwiftFFI.zip",
+            checksum: "2509bf1e0532731f616ef116d048e5d0228dadda5b81e9e99c54bf0a07b4bc78"
         ),
         .testTarget(name: "LibXMTPTests", dependencies: ["LibXMTP"]),
     ]

diff --git a/Sources/LibXMTP/libxmtp-version.txt b/Sources/LibXMTP/libxmtp-version.txt
@@ -1,3 +1,3 @@
-Version: a48e9a79
+Version: ae4eb9cf
 Branch: main
-Date: 2025-01-29 21:04:07 +0000
+Date: 2025-02-03 22:08:43 +0000
diff --git a/Sources/LibXMTP/xmtpv3.swift b/Sources/LibXMTP/xmtpv3.swift
@@ -771,8 +771,6 @@ public protocol FfiConversationProtocol: AnyObject {
 
     func groupPermissions() throws -> FfiGroupPermissions
 
-    func groupPinnedFrameUrl() throws -> String
-
     func id() -> Data
 
     func isActive() throws -> Bool
@@ -823,8 +821,6 @@ public protocol FfiConversationProtocol: AnyObject {
 
     func updateGroupName(groupName: String) async throws
 
-    func updateGroupPinnedFrameUrl(pinnedFrameUrl: String) async throws
-
     func updatePermissionPolicy(permissionUpdateType: FfiPermissionUpdateType, permissionPolicyOption: FfiPermissionPolicy, metadataField: FfiMetadataField?) async throws
 }
 
@@ -1071,12 +1067,6 @@ open class FfiConversation:
         })
     }
 
-    open func groupPinnedFrameUrl() throws -> String {
-        return try FfiConverterString.lift(rustCallWithError(FfiConverterTypeGenericError.lift) {
-            uniffi_xmtpv3_fn_method_fficonversation_group_pinned_frame_url(self.uniffiClonePointer(), $0)
-        })
-    }
-
     open func id() -> Data {
         return try! FfiConverterData.lift(try! rustCall {
             uniffi_xmtpv3_fn_method_fficonversation_id(self.uniffiClonePointer(), $0)
@@ -1379,23 +1369,6 @@ open class FfiConversation:
             )
     }
 
-    open func updateGroupPinnedFrameUrl(pinnedFrameUrl: String) async throws {
-        return
-            try await uniffiRustCallAsync(
-                rustFutureFunc: {
-                    uniffi_xmtpv3_fn_method_fficonversation_update_group_pinned_frame_url(
-                        self.uniffiClonePointer(),
-                        FfiConverterString.lower(pinnedFrameUrl)
-                    )
-                },
-                pollFunc: ffi_xmtpv3_rust_future_poll_void,
-                completeFunc: ffi_xmtpv3_rust_future_complete_void,
-                freeFunc: ffi_xmtpv3_rust_future_free_void,
-                liftFunc: { $0 },
-                errorHandler: FfiConverterTypeGenericError.lift
-            )
-    }
-
     open func updatePermissionPolicy(permissionUpdateType: FfiPermissionUpdateType, permissionPolicyOption: FfiPermissionPolicy, metadataField: FfiMetadataField?) async throws {
         return
             try await uniffiRustCallAsync(
@@ -4501,18 +4474,16 @@ public struct FfiCreateGroupOptions {
     public var groupName: String?
     public var groupImageUrlSquare: String?
     public var groupDescription: String?
-    public var groupPinnedFrameUrl: String?
     public var customPermissionPolicySet: FfiPermissionPolicySet?
     public var messageDisappearingSettings: FfiMessageDisappearingSettings?
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(permissions: FfiGroupPermissionsOptions?, groupName: String?, groupImageUrlSquare: String?, groupDescription: String?, groupPinnedFrameUrl: String?, customPermissionPolicySet: FfiPermissionPolicySet?, messageDisappearingSettings: FfiMessageDisappearingSettings?) {
+    public init(permissions: FfiGroupPermissionsOptions?, groupName: String?, groupImageUrlSquare: String?, groupDescription: String?, customPermissionPolicySet: FfiPermissionPolicySet?, messageDisappearingSettings: FfiMessageDisappearingSettings?) {
         self.permissions = permissions
         self.groupName = groupName
         self.groupImageUrlSquare = groupImageUrlSquare
         self.groupDescription = groupDescription
-        self.groupPinnedFrameUrl = groupPinnedFrameUrl
         self.customPermissionPolicySet = customPermissionPolicySet
         self.messageDisappearingSettings = messageDisappearingSettings
     }
@@ -4532,9 +4503,6 @@ extension FfiCreateGroupOptions: Equatable, Hashable {
         if lhs.groupDescription != rhs.groupDescription {
             return false
         }
-        if lhs.groupPinnedFrameUrl != rhs.groupPinnedFrameUrl {
-            return false
-        }
         if lhs.customPermissionPolicySet != rhs.customPermissionPolicySet {
             return false
         }
@@ -4549,7 +4517,6 @@ extension FfiCreateGroupOptions: Equatable, Hashable {
         hasher.combine(groupName)
         hasher.combine(groupImageUrlSquare)
         hasher.combine(groupDescription)
-        hasher.combine(groupPinnedFrameUrl)
         hasher.combine(customPermissionPolicySet)
         hasher.combine(messageDisappearingSettings)
     }
@@ -4566,7 +4533,6 @@ public struct FfiConverterTypeFfiCreateGroupOptions: FfiConverterRustBuffer {
                 groupName: FfiConverterOptionString.read(from: &buf),
                 groupImageUrlSquare: FfiConverterOptionString.read(from: &buf),
                 groupDescription: FfiConverterOptionString.read(from: &buf),
-                groupPinnedFrameUrl: FfiConverterOptionString.read(from: &buf),
                 customPermissionPolicySet: FfiConverterOptionTypeFfiPermissionPolicySet.read(from: &buf),
                 messageDisappearingSettings: FfiConverterOptionTypeFfiMessageDisappearingSettings.read(from: &buf)
             )
@@ -4577,7 +4543,6 @@ public struct FfiConverterTypeFfiCreateGroupOptions: FfiConverterRustBuffer {
         FfiConverterOptionString.write(value.groupName, into: &buf)
         FfiConverterOptionString.write(value.groupImageUrlSquare, into: &buf)
         FfiConverterOptionString.write(value.groupDescription, into: &buf)
-        FfiConverterOptionString.write(value.groupPinnedFrameUrl, into: &buf)
         FfiConverterOptionTypeFfiPermissionPolicySet.write(value.customPermissionPolicySet, into: &buf)
         FfiConverterOptionTypeFfiMessageDisappearingSettings.write(value.messageDisappearingSettings, into: &buf)
     }
@@ -5412,20 +5377,18 @@ public struct FfiPermissionPolicySet {
     public var updateGroupNamePolicy: FfiPermissionPolicy
     public var updateGroupDescriptionPolicy: FfiPermissionPolicy
     public var updateGroupImageUrlSquarePolicy: FfiPermissionPolicy
-    public var updateGroupPinnedFrameUrlPolicy: FfiPermissionPolicy
     public var updateMessageDisappearingPolicy: FfiPermissionPolicy
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(addMemberPolicy: FfiPermissionPolicy, removeMemberPolicy: FfiPermissionPolicy, addAdminPolicy: FfiPermissionPolicy, removeAdminPolicy: FfiPermissionPolicy, updateGroupNamePolicy: FfiPermissionPolicy, updateGroupDescriptionPolicy: FfiPermissionPolicy, updateGroupImageUrlSquarePolicy: FfiPermissionPolicy, updateGroupPinnedFrameUrlPolicy: FfiPermissionPolicy, updateMessageDisappearingPolicy: FfiPermissionPolicy) {
+    public init(addMemberPolicy: FfiPermissionPolicy, removeMemberPolicy: FfiPermissionPolicy, addAdminPolicy: FfiPermissionPolicy, removeAdminPolicy: FfiPermissionPolicy, updateGroupNamePolicy: FfiPermissionPolicy, updateGroupDescriptionPolicy: FfiPermissionPolicy, updateGroupImageUrlSquarePolicy: FfiPermissionPolicy, updateMessageDisappearingPolicy: FfiPermissionPolicy) {
         self.addMemberPolicy = addMemberPolicy
         self.removeMemberPolicy = removeMemberPolicy
         self.addAdminPolicy = addAdminPolicy
         self.removeAdminPolicy = removeAdminPolicy
         self.updateGroupNamePolicy = updateGroupNamePolicy
         self.updateGroupDescriptionPolicy = updateGroupDescriptionPolicy
         self.updateGroupImageUrlSquarePolicy = updateGroupImageUrlSquarePolicy
-        self.updateGroupPinnedFrameUrlPolicy = updateGroupPinnedFrameUrlPolicy
         self.updateMessageDisappearingPolicy = updateMessageDisappearingPolicy
     }
 }
@@ -5453,9 +5416,6 @@ extension FfiPermissionPolicySet: Equatable, Hashable {
         if lhs.updateGroupImageUrlSquarePolicy != rhs.updateGroupImageUrlSquarePolicy {
             return false
         }
-        if lhs.updateGroupPinnedFrameUrlPolicy != rhs.updateGroupPinnedFrameUrlPolicy {
-            return false
-        }
         if lhs.updateMessageDisappearingPolicy != rhs.updateMessageDisappearingPolicy {
             return false
         }
@@ -5470,7 +5430,6 @@ extension FfiPermissionPolicySet: Equatable, Hashable {
         hasher.combine(updateGroupNamePolicy)
         hasher.combine(updateGroupDescriptionPolicy)
         hasher.combine(updateGroupImageUrlSquarePolicy)
-        hasher.combine(updateGroupPinnedFrameUrlPolicy)
         hasher.combine(updateMessageDisappearingPolicy)
     }
 }
@@ -5489,7 +5448,6 @@ public struct FfiConverterTypeFfiPermissionPolicySet: FfiConverterRustBuffer {
                 updateGroupNamePolicy: FfiConverterTypeFfiPermissionPolicy.read(from: &buf),
                 updateGroupDescriptionPolicy: FfiConverterTypeFfiPermissionPolicy.read(from: &buf),
                 updateGroupImageUrlSquarePolicy: FfiConverterTypeFfiPermissionPolicy.read(from: &buf),
-                updateGroupPinnedFrameUrlPolicy: FfiConverterTypeFfiPermissionPolicy.read(from: &buf),
                 updateMessageDisappearingPolicy: FfiConverterTypeFfiPermissionPolicy.read(from: &buf)
             )
     }
@@ -5502,7 +5460,6 @@ public struct FfiConverterTypeFfiPermissionPolicySet: FfiConverterRustBuffer {
         FfiConverterTypeFfiPermissionPolicy.write(value.updateGroupNamePolicy, into: &buf)
         FfiConverterTypeFfiPermissionPolicy.write(value.updateGroupDescriptionPolicy, into: &buf)
         FfiConverterTypeFfiPermissionPolicy.write(value.updateGroupImageUrlSquarePolicy, into: &buf)
-        FfiConverterTypeFfiPermissionPolicy.write(value.updateGroupPinnedFrameUrlPolicy, into: &buf)
         FfiConverterTypeFfiPermissionPolicy.write(value.updateMessageDisappearingPolicy, into: &buf)
     }
 }
@@ -6509,7 +6466,6 @@ public enum FfiMetadataField {
     case groupName
     case description
     case imageUrlSquare
-    case pinnedFrameUrl
 }
 
 #if swift(>=5.8)
@@ -6527,8 +6483,6 @@ public struct FfiConverterTypeFfiMetadataField: FfiConverterRustBuffer {
 
         case 3: return .imageUrlSquare
 
-        case 4: return .pinnedFrameUrl
-
         default: throw UniffiInternalError.unexpectedEnumCase
         }
     }
@@ -6543,9 +6497,6 @@ public struct FfiConverterTypeFfiMetadataField: FfiConverterRustBuffer {
 
         case .imageUrlSquare:
             writeInt(&buf, Int32(3))
-
-        case .pinnedFrameUrl:
-            writeInt(&buf, Int32(4))
         }
     }
 }
@@ -8608,9 +8559,6 @@ private var initializationResult: InitializationResult = {
     if uniffi_xmtpv3_checksum_method_fficonversation_group_permissions() != 61947 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_xmtpv3_checksum_method_fficonversation_group_pinned_frame_url() != 40964 {
-        return InitializationResult.apiChecksumMismatch
-    }
     if uniffi_xmtpv3_checksum_method_fficonversation_id() != 5542 {
         return InitializationResult.apiChecksumMismatch
     }
@@ -8677,9 +8625,6 @@ private var initializationResult: InitializationResult = {
     if uniffi_xmtpv3_checksum_method_fficonversation_update_group_name() != 62600 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_xmtpv3_checksum_method_fficonversation_update_group_pinned_frame_url() != 21997 {
-        return InitializationResult.apiChecksumMismatch
-    }
     if uniffi_xmtpv3_checksum_method_fficonversation_update_permission_policy() != 3743 {
         return InitializationResult.apiChecksumMismatch
     }