adds messageExpiration permissions from libxmtp (#368)

Co-authored-by: cameronvoell <[email protected]>
xmtp · Jan 15, 2025 · fc83757 · fc83757
1 parent 2da80a0
commit fc83757
Show file tree

Hide file tree

Showing 9 changed files with 3,658 additions and 4,673 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,6 +434,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
+            updateMessageExpirationPolicy = PermissionOption.Admin,
         )
         val boGroup = runBlocking {
             boClient.conversations.newGroupCustomPermissions(
@@ -468,6 +469,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
+            updateMessageExpirationPolicy = PermissionOption.Admin,
         )
 
         assertThrows(GenericException.GroupMutablePermissions::class.java) {
@@ -488,6 +490,7 @@ class GroupPermissionsTest {
             updateGroupDescriptionPolicy = PermissionOption.Allow,
             updateGroupImagePolicy = PermissionOption.Admin,
             updateGroupPinnedFrameUrlPolicy = PermissionOption.Deny,
+            updateMessageExpirationPolicy = PermissionOption.Allow,
         )
 
         // Valid custom policy works as expected

diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt
@@ -1,3 +1,3 @@
-Version: ab9bb055
+Version: f04e0049
 Branch: main
-Date: 2025-01-07 00:08:33 +0000
+Date: 2025-01-14 23:09:48 +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
@@ -54,6 +54,8 @@ data class Conversations(
         groupImageUrlSquare: String = "",
         groupDescription: String = "",
         groupPinnedFrameUrl: String = "",
+        messageExpirationFromMs: Long? = null,
+        messageExpirationMs: Long? = null,
     ): Group {
         return newGroupInternal(
             accountAddresses,
@@ -62,7 +64,9 @@ data class Conversations(
             groupImageUrlSquare,
             groupDescription,
             groupPinnedFrameUrl,
-            null
+            null,
+            messageExpirationFromMs,
+            messageExpirationMs,
         )
     }
 
@@ -73,6 +77,8 @@ data class Conversations(
         groupImageUrlSquare: String = "",
         groupDescription: String = "",
         groupPinnedFrameUrl: String = "",
+        messageExpirationFromMs: Long? = null,
+        messageExpirationMs: Long? = null,
     ): Group {
         return newGroupInternal(
             accountAddresses,
@@ -81,7 +87,9 @@ data class Conversations(
             groupImageUrlSquare,
             groupDescription,
             groupPinnedFrameUrl,
-            PermissionPolicySet.toFfiPermissionPolicySet(permissionPolicySet)
+            PermissionPolicySet.toFfiPermissionPolicySet(permissionPolicySet),
+            messageExpirationFromMs,
+            messageExpirationMs
         )
     }
 
@@ -93,6 +101,8 @@ data class Conversations(
         groupDescription: String,
         groupPinnedFrameUrl: String,
         permissionsPolicySet: FfiPermissionPolicySet?,
+        messageExpirationFromMs: Long?,
+        messageExpirationMs: Long?,
     ): Group {
         if (accountAddresses.size == 1 &&
             accountAddresses.first().lowercase() == client.address.lowercase()
@@ -115,7 +125,9 @@ data class Conversations(
                     groupImageUrlSquare = groupImageUrlSquare,
                     groupDescription = groupDescription,
                     groupPinnedFrameUrl = groupPinnedFrameUrl,
-                    customPermissionPolicySet = permissionsPolicySet
+                    customPermissionPolicySet = permissionsPolicySet,
+                    messageExpirationFromMs = messageExpirationFromMs,
+                    messageExpirationMs = messageExpirationMs,
                 )
             )
         return Group(client.inboxId, group)

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
@@ -39,7 +39,7 @@ enum class GroupPermissionPreconfiguration {
     companion object {
         fun toFfiGroupPermissionOptions(option: GroupPermissionPreconfiguration): FfiGroupPermissionsOptions {
             return when (option) {
-                ALL_MEMBERS -> FfiGroupPermissionsOptions.ALL_MEMBERS
+                ALL_MEMBERS -> FfiGroupPermissionsOptions.DEFAULT
                 ADMIN_ONLY -> FfiGroupPermissionsOptions.ADMIN_ONLY
             }
         }
@@ -55,6 +55,7 @@ data class PermissionPolicySet(
     val updateGroupDescriptionPolicy: PermissionOption,
     val updateGroupImagePolicy: PermissionOption,
     val updateGroupPinnedFrameUrlPolicy: PermissionOption,
+    val updateMessageExpirationPolicy: PermissionOption,
 ) {
     companion object {
         fun toFfiPermissionPolicySet(permissionPolicySet: PermissionPolicySet): FfiPermissionPolicySet {
@@ -66,7 +67,8 @@ data class PermissionPolicySet(
                 updateGroupNamePolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupNamePolicy),
                 updateGroupDescriptionPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupDescriptionPolicy),
                 updateGroupImageUrlSquarePolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupImagePolicy),
-                updateGroupPinnedFrameUrlPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupPinnedFrameUrlPolicy)
+                updateGroupPinnedFrameUrlPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateGroupPinnedFrameUrlPolicy),
+                updateMessageExpirationMsPolicy = PermissionOption.toFfiPermissionPolicy(permissionPolicySet.updateMessageExpirationPolicy),
             )
         }
 
@@ -80,6 +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)
             )
         }
     }