add a test for this case

xmtp · Feb 11, 2025 · 1613070 · 1613070
1 parent 0d0251e
commit 1613070
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt b/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt
@@ -5,6 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertThrows
 import org.junit.Assert.fail
 import org.junit.Test
@@ -517,6 +518,7 @@ class ClientTest {
         )
     }
 
+    @OptIn(DelicateApi::class)
     @Test
     fun testAddAccounts() {
         val fixtures = fixtures()
@@ -539,6 +541,29 @@ class ClientTest {
         )
     }
 
+    @OptIn(DelicateApi::class)
+    @Test
+    fun testAddAccountsWithExistingInboxIds() {
+        val fixtures = fixtures()
+
+        assertThrows(
+            "This wallet is already associated with inbox ${fixtures.boClient.inboxId}",
+            XMTPException::class.java
+        ) {
+            runBlocking { fixtures.alixClient.addAccount(fixtures.boAccount) }
+        }
+
+        assert(fixtures.boClient.inboxId != fixtures.alixClient.inboxId)
+        runBlocking { fixtures.alixClient.addAccount(fixtures.boAccount, true) }
+
+        val state = runBlocking { fixtures.alixClient.inboxState(true) }
+        assertEquals(state.addresses.size, 2)
+
+        val inboxId = runBlocking { fixtures.alixClient.inboxIdFromAddress(fixtures.boClient.address) }
+        assertEquals(inboxId, fixtures.alixClient.inboxId)
+    }
+
+    @OptIn(DelicateApi::class)
     @Test
     fun testRemovingAccounts() {
         val fixtures = fixtures()

diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -259,10 +259,11 @@ class Client() {
     }
 
     @DelicateApi("This function is delicate and should be used with caution. Adding a wallet already associated with an inboxId will cause the wallet to loose access to that inbox. See: inboxIdFromAddress(address)")
-    suspend fun addAccount(newAccount: SigningKey, changeInboxId: Boolean = false) {
-        val inboxId: String? = if (!changeInboxId) inboxIdFromAddress(newAccount.address) else null
+    suspend fun addAccount(newAccount: SigningKey, allowReassignInboxId: Boolean = false) {
+        val inboxId: String? =
+            if (!allowReassignInboxId) inboxIdFromAddress(newAccount.address) else null
 
-        if (changeInboxId || inboxId.isNullOrBlank()) {
+        if (allowReassignInboxId || inboxId.isNullOrBlank()) {
             val signatureRequest = ffiClient.addWallet(newAccount.address.lowercase())
             handleSignature(signatureRequest, newAccount)
             ffiClient.applySignatureRequest(signatureRequest)