try to get the tests to pass

xmtp · Feb 7, 2025 · 9dca8c8 · 9dca8c8
1 parent 5c960c4
commit 9dca8c8
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt b/library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt
@@ -1027,10 +1027,11 @@ class GroupTest {
     @Test
     fun testGroupDisappearingMessages() {
         // Can enable message expiration on create
+        val setting = MessageDisappearingSettings(0L, 1L)
         val boGroup = runBlocking {
             boClient.conversations.newGroup(
                 listOf(alix.walletAddress),
-                messageDisappearingSettings = MessageDisappearingSettings(0L, 10L),
+                messageDisappearingSettings = setting,
             )
         }
         val messageId = runBlocking {
@@ -1040,15 +1041,19 @@ class GroupTest {
         var message = boClient.findMessage(messageId)
         var alixMessage = alixClient.findMessage(messageId)
         val alixGroup = alixClient.findGroup(boGroup.id)
+        assertEquals(
+            boGroup.messageDisappearingSettings()!!.disappearDurationInNs,
+            setting.disappearDurationInNs
+        )
         assert(message != null)
         assert(alixMessage != null)
         assertEquals(runBlocking { boGroup.messages() }.size, 2)
         assertEquals(runBlocking { alixGroup!!.messages() }.size, 1)
-        Thread.sleep(2000)
         runBlocking {
             boClient.conversations.syncAllConversations()
             alixClient.conversations.syncAllConversations()
         }
+        Thread.sleep(4000)
         message = boClient.findMessage(messageId)
         alixMessage = alixClient.findMessage(messageId)
         assert(message == null)
@@ -1070,7 +1075,7 @@ class GroupTest {
 
         assertEquals(runBlocking { boGroup.messages() }.size, 2)
         assertEquals(runBlocking { alixGroup!!.messages() }.size, 2)
-        assertEquals(boGroup.messageDisappearingSettings, null)
-        assertEquals(alixGroup!!.messageDisappearingSettings, null)
+        assertEquals(boGroup.messageDisappearingSettings(), null)
+        assertEquals(alixGroup!!.messageDisappearingSettings(), null)
     }
 }
diff --git a/library/src/main/java/org/xmtp/android/library/Conversation.kt b/library/src/main/java/org/xmtp/android/library/Conversation.kt
@@ -37,14 +37,6 @@ sealed class Conversation {
             }
         }
 
-    val messageDisappearingSettings: MessageDisappearingSettings
-        get() {
-            return when (this) {
-                is Group -> group.messageDisappearingSettings
-                is Dm -> dm.messageDisappearingSettings
-            }
-        }
-
     val createdAt: Date
         get() {
             return when (this) {
@@ -53,6 +45,13 @@ sealed class Conversation {
             }
         }
 
+    fun messageDisappearingSettings(): MessageDisappearingSettings? {
+        return when (this) {
+            is Group -> group.messageDisappearingSettings()
+            is Dm -> dm.messageDisappearingSettings()
+        }
+    }
+
     suspend fun lastMessage(): Message? {
         return when (this) {
             is Group -> group.lastMessage()

diff --git a/library/src/main/java/org/xmtp/android/library/Dm.kt b/library/src/main/java/org/xmtp/android/library/Dm.kt
@@ -41,8 +41,14 @@ class Dm(
     val peerInboxId: String
         get() = libXMTPGroup.dmPeerInboxId()
 
-    val messageDisappearingSettings: MessageDisappearingSettings
-        get() = MessageDisappearingSettings.createFromFfi(libXMTPGroup.conversationMessageDisappearingSettings())
+    fun messageDisappearingSettings(): MessageDisappearingSettings? {
+        val settings = libXMTPGroup.conversationMessageDisappearingSettings()
+        return if (settings.fromNs > 0 && settings.inNs > 0) {
+            MessageDisappearingSettings.createFromFfi(settings)
+        } else {
+            null
+        }
+    }
 
     private suspend fun metadata(): FfiConversationMetadata {
         return libXMTPGroup.groupMetadata()

diff --git a/library/src/main/java/org/xmtp/android/library/Group.kt b/library/src/main/java/org/xmtp/android/library/Group.kt
@@ -60,8 +60,15 @@ class Group(
     val description: String
         get() = libXMTPGroup.groupDescription()
 
-    val messageDisappearingSettings: MessageDisappearingSettings
-        get() = MessageDisappearingSettings.createFromFfi(libXMTPGroup.conversationMessageDisappearingSettings())
+    fun messageDisappearingSettings(): MessageDisappearingSettings? {
+        val settings = libXMTPGroup.conversationMessageDisappearingSettings()
+        return if (settings.fromNs <= 0 && settings.inNs <= 0) {
+            null
+        } else {
+            MessageDisappearingSettings.createFromFfi(settings)
+
+        }
+    }
 
     suspend fun send(text: String): String {
         return send(encodeContent(content = text, options = null))