Merge branch 'main' of https://github.com/xmtp/xmtp-android into np/d…

…isappearing-messages
xmtp · Feb 7, 2025 · 5c960c4 · 5c960c4
2 parents 90907ef + 28aebb5
commit 5c960c4
Show file tree

Hide file tree

Showing 8 changed files with 375 additions and 13 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/HistorySyncTest.kt b/library/src/androidTest/java/org/xmtp/android/library/HistorySyncTest.kt
@@ -121,6 +121,9 @@ class HistorySyncTest {
             )
         }
 
+        val state3 = runBlocking { alixClient3.inboxState(true) }
+        assertEquals(state3.installations.size, 3)
+
         runBlocking {
             alix2Group.send("A message")
             alix2Group.send("A second message")
@@ -131,7 +134,11 @@ class HistorySyncTest {
             Thread.sleep(2000)
             alixClient3.conversations.syncAllConversations()
             Thread.sleep(2000)
-            val alix3Group = alixClient3.findGroup(alixGroup.id)!!
+
+            val alix3Groups = alixClient3.conversations.listGroups()
+            assertEquals(alix3Groups.size, 1)
+            val alix3Group = alixClient3.findGroup(alixGroup.id)
+                ?: throw AssertionError("Failed to find group with ID: ${alixGroup.id}")
             assertEquals(runBlocking { alixGroup.messages() }.size, 5)
             assertEquals(runBlocking { alix2Group.messages() }.size, 5)
             assertEquals(runBlocking { alix3Group.messages() }.size, 5)

diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt
@@ -1,3 +1,3 @@
-Version: ae4eb9cf
+Version: b137466b
 Branch: main
-Date: 2025-02-03 22:08:43 +0000
+Date: 2025-02-06 16:54:22 +0000
diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -27,7 +27,11 @@ data class ClientOptions(
     val preAuthenticateToInboxCallback: PreEventCallback? = null,
     val appContext: Context,
     val dbEncryptionKey: ByteArray,
-    val historySyncUrl: String? = null,
+    val historySyncUrl: String? = when (api.env) {
+        XMTPEnvironment.PRODUCTION -> "https://message-history.production.ephemera.network/"
+        XMTPEnvironment.LOCAL -> "http://0.0.0.0:5558"
+        else -> "https://message-history.dev.ephemera.network/"
+    },
     val dbDirectory: String? = null,
 ) {
     data class Api(

diff --git a/library/src/main/java/xmtpv3.kt b/library/src/main/java/xmtpv3.kt
diff --git a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so
diff --git a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so