set libxmtp ref to latest main

xmtp · Jan 30, 2025 · 005cedc · 005cedc
1 parent b7294a0
commit 005cedc
Show file tree

Hide file tree

Showing 9 changed files with 231 additions and 85 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/GroupPermissionsTest.kt b/library/src/androidTest/java/org/xmtp/android/library/GroupPermissionsTest.kt
@@ -434,7 +434,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
-            updateMessageExpirationPolicy = PermissionOption.Admin,
+            updateMessageDisappearingPolicy = PermissionOption.Admin,
         )
         val boGroup = runBlocking {
             boClient.conversations.newGroupCustomPermissions(
@@ -469,7 +469,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
-            updateMessageExpirationPolicy = PermissionOption.Admin,
+            updateMessageDisappearingPolicy = PermissionOption.Admin,
         )
 
         assertThrows(GenericException.GroupMutablePermissions::class.java) {
@@ -490,7 +490,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
-            updateMessageExpirationPolicy = PermissionOption.Allow,
+            updateMessageDisappearingPolicy = PermissionOption.Allow,
         )
 
         // Valid custom policy works as expected
@@ -518,7 +518,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
-            updateMessageExpirationPolicy = PermissionOption.Admin,
+            updateMessageDisappearingPolicy = PermissionOption.Admin,
         )
         val boGroup = runBlocking {
             boClient.conversations.newGroupCustomPermissionsWithInboxIds(

diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt
@@ -1,3 +1,3 @@
-Version: aaa58c22
-Branch: cv/01-10-json_deserialization_for_legacy_reactions
-Date: 2025-01-17 23:20:35 +0000
+Version: a48e9a79
+Branch: main
+Date: 2025-01-29 21:04:07 +0000
diff --git a/library/src/main/java/org/xmtp/android/library/Conversations.kt b/library/src/main/java/org/xmtp/android/library/Conversations.kt
@@ -22,6 +22,7 @@ import uniffi.xmtpv3.FfiGroupPermissionsOptions
 import uniffi.xmtpv3.FfiListConversationsOptions
 import uniffi.xmtpv3.FfiMessage
 import uniffi.xmtpv3.FfiMessageCallback
+import uniffi.xmtpv3.FfiMessageDisappearingSettings
 import uniffi.xmtpv3.FfiPermissionPolicySet
 import uniffi.xmtpv3.FfiSubscribeException
 import java.util.Date
@@ -54,8 +55,7 @@ data class Conversations(
         groupImageUrlSquare: String = "",
         groupDescription: String = "",
         groupPinnedFrameUrl: String = "",
-        messageExpirationFromMs: Long? = null,
-        messageExpirationMs: Long? = null,
+        messageDisappearingSettings: FfiMessageDisappearingSettings? = null,
     ): Group {
         return newGroupInternal(
             accountAddresses,
@@ -65,8 +65,7 @@ data class Conversations(
             groupDescription,
             groupPinnedFrameUrl,
             null,
-            messageExpirationFromMs,
-            messageExpirationMs,
+            messageDisappearingSettings,
         )
     }
 
@@ -77,8 +76,7 @@ data class Conversations(
         groupImageUrlSquare: String = "",
         groupDescription: String = "",
         groupPinnedFrameUrl: String = "",
-        messageExpirationFromMs: Long? = null,
-        messageExpirationMs: Long? = null,
+        messageDisappearingSettings: FfiMessageDisappearingSettings? = null,
     ): Group {
         return newGroupInternal(
             accountAddresses,
@@ -88,8 +86,7 @@ data class Conversations(
             groupDescription,
             groupPinnedFrameUrl,
             PermissionPolicySet.toFfiPermissionPolicySet(permissionPolicySet),
-            messageExpirationFromMs,
-            messageExpirationMs
+            messageDisappearingSettings
         )
     }
 
@@ -101,8 +98,7 @@ data class Conversations(
         groupDescription: String,
         groupPinnedFrameUrl: String,
         permissionsPolicySet: FfiPermissionPolicySet?,
-        messageExpirationFromMs: Long?,
-        messageExpirationMs: Long?,
+        messageDisappearingSettings: FfiMessageDisappearingSettings?,
     ): Group {
         if (accountAddresses.any { it.equals(client.address, ignoreCase = true) }) {
             throw XMTPException("Recipient is sender")
@@ -124,8 +120,7 @@ data class Conversations(
                     groupDescription = groupDescription,
                     groupPinnedFrameUrl = groupPinnedFrameUrl,
                     customPermissionPolicySet = permissionsPolicySet,
-                    messageExpirationFromMs = messageExpirationFromMs,
-                    messageExpirationMs = messageExpirationMs,
+                    messageDisappearingSettings = messageDisappearingSettings
                 )
             )
         return Group(client.inboxId, group)
@@ -138,8 +133,7 @@ data class Conversations(
         groupImageUrlSquare: String = "",
         groupDescription: String = "",
         groupPinnedFrameUrl: String = "",
-        messageExpirationFromMs: Long? = null,
-        messageExpirationMs: Long? = null,
+        messageDisappearingSettings: FfiMessageDisappearingSettings? = null,
     ): Group {
         return newGroupInternalWithInboxIds(
             inboxIds,
@@ -149,8 +143,7 @@ data class Conversations(
             groupDescription,
             groupPinnedFrameUrl,
             null,
-            messageExpirationFromMs,
-            messageExpirationMs,
+            messageDisappearingSettings
         )
     }
 
@@ -161,8 +154,7 @@ data class Conversations(
         groupImageUrlSquare: String = "",
         groupDescription: String = "",
         groupPinnedFrameUrl: String = "",
-        messageExpirationFromMs: Long? = null,
-        messageExpirationMs: Long? = null,
+        messageDisappearingSettings: FfiMessageDisappearingSettings? = null,
     ): Group {
         return newGroupInternalWithInboxIds(
             inboxIds,
@@ -172,8 +164,7 @@ data class Conversations(
             groupDescription,
             groupPinnedFrameUrl,
             PermissionPolicySet.toFfiPermissionPolicySet(permissionPolicySet),
-            messageExpirationFromMs,
-            messageExpirationMs
+            messageDisappearingSettings
         )
     }
 
@@ -185,8 +176,7 @@ data class Conversations(
         groupDescription: String,
         groupPinnedFrameUrl: String,
         permissionsPolicySet: FfiPermissionPolicySet?,
-        messageExpirationFromMs: Long?,
-        messageExpirationMs: Long?,
+        messageDisappearingSettings: FfiMessageDisappearingSettings?,
     ): Group {
         if (inboxIds.any { it.equals(client.inboxId, ignoreCase = true) }) {
             throw XMTPException("Recipient is sender")
@@ -202,8 +192,7 @@ data class Conversations(
                     groupDescription = groupDescription,
                     groupPinnedFrameUrl = groupPinnedFrameUrl,
                     customPermissionPolicySet = permissionsPolicySet,
-                    messageExpirationFromMs = messageExpirationFromMs,
-                    messageExpirationMs = messageExpirationMs,
+                    messageDisappearingSettings = messageDisappearingSettings
                 )
             )
         return Group(client.inboxId, group)
@@ -237,12 +226,8 @@ data class Conversations(
         if (falseAddresses.isNotEmpty()) {
             throw XMTPException("${falseAddresses.joinToString()} not on network")
         }
-        var dm = client.findDmByAddress(peerAddress)
-        if (dm == null) {
-            val dmConversation = ffiConversations.createDm(peerAddress.lowercase())
-            dm = Dm(client.inboxId, dmConversation)
-        }
-        return dm
+        val dmConversation = ffiConversations.findOrCreateDm(peerAddress.lowercase())
+        return Dm(client.inboxId, dmConversation)
     }
 
     suspend fun newConversationWithInboxId(peerInboxId: String): Conversation {
@@ -254,12 +239,8 @@ data class Conversations(
         if (peerInboxId.lowercase() == client.inboxId.lowercase()) {
             throw XMTPException("Recipient is sender")
         }
-        var dm = client.findDmByInboxId(peerInboxId)
-        if (dm == null) {
-            val dmConversation = ffiConversations.createDmWithInboxId(peerInboxId.lowercase())
-            dm = Dm(client.inboxId, dmConversation)
-        }
-        return dm
+        val dmConversation = ffiConversations.findOrCreateDmByInboxId(peerInboxId.lowercase())
+        return Dm(client.inboxId, dmConversation)
     }
 
     fun listGroups(

diff --git a/library/src/main/java/org/xmtp/android/library/libxmtp/PermissionPolicySet.kt b/library/src/main/java/org/xmtp/android/library/libxmtp/PermissionPolicySet.kt
@@ -55,7 +55,7 @@ data class PermissionPolicySet(
     val updateGroupDescriptionPolicy: PermissionOption,
     val updateGroupImagePolicy: PermissionOption,
     val updateGroupPinnedFrameUrlPolicy: PermissionOption,
-    val updateMessageExpirationPolicy: PermissionOption,
+    val updateMessageDisappearingPolicy: PermissionOption,
 ) {
     companion object {
         fun toFfiPermissionPolicySet(permissionPolicySet: PermissionPolicySet): FfiPermissionPolicySet {
@@ -68,7 +68,7 @@ data class PermissionPolicySet(
                 updateGroupDescriptionPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupDescriptionPolicy),
                 updateGroupImageUrlSquarePolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupImagePolicy),
                 updateGroupPinnedFrameUrlPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupPinnedFrameUrlPolicy),
-                updateMessageExpirationMsPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateMessageExpirationPolicy),
+                updateMessageDisappearingPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateMessageDisappearingPolicy),
             )
         }
 
@@ -82,7 +82,7 @@ data class PermissionPolicySet(
                 updateGroupDescriptionPolicy = PermissionOption.fromFfiPermissionPolicy(ffiPermissionPolicySet.updateGroupDescriptionPolicy),
                 updateGroupImagePolicy = PermissionOption.fromFfiPermissionPolicy(ffiPermissionPolicySet.updateGroupImageUrlSquarePolicy),
                 updateGroupPinnedFrameUrlPolicy = PermissionOption.fromFfiPermissionPolicy(ffiPermissionPolicySet.updateGroupPinnedFrameUrlPolicy),
-                updateMessageExpirationPolicy = PermissionOption.fromFfiPermissionPolicy(ffiPermissionPolicySet.updateMessageExpirationMsPolicy)
+                updateMessageDisappearingPolicy = PermissionOption.fromFfiPermissionPolicy(ffiPermissionPolicySet.updateMessageDisappearingPolicy)
             )
         }
     }