Fix order of loading consent (#128)

* fix the allow block list overwritting in the wrong direction * revert back to previous way of loading
xmtp · Oct 26, 2023 · d42462b · d42462b
1 parent 7e229a1
commit d42462b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/library/src/androidTest/java/org/xmtp/android/library/ConversationTest.kt b/library/src/androidTest/java/org/xmtp/android/library/ConversationTest.kt
@@ -723,6 +723,12 @@ class ConversationTest {
         assertTrue(isAllowed)
         assertTrue(bobClient.contacts.isAllowed(alice.walletAddress))
 
+        bobClient.contacts.block(listOf(alice.walletAddress))
+        bobClient.contacts.refreshConsentList()
+
+        val isBlocked = bobConversation.consentState() == ConsentState.BLOCKED
+        assertTrue(isBlocked)
+
         val aliceConversation = aliceClient.conversations.list()[0]
         val isUnknown = aliceConversation.consentState() == ConsentState.UNKNOWN
 

diff --git a/library/src/main/java/org/xmtp/android/library/Contacts.kt b/library/src/main/java/org/xmtp/android/library/Contacts.kt
@@ -14,6 +14,7 @@ enum class ConsentState {
     BLOCKED,
     UNKNOWN
 }
+
 data class ConsentListEntry(
     val value: String,
     val entryType: EntryType,
@@ -67,23 +68,30 @@ class ConsentList(val client: Client) {
             )
         }
 
-        preferences.iterator().forEach { preference ->
+        preferences.reversed().iterator().forEach { preference ->
             preference.allow?.walletAddressesList?.forEach { address ->
                 consentList.allow(address)
             }
             preference.block?.walletAddressesList?.forEach { address ->
                 consentList.block(address)
             }
         }
+
         return consentList
     }
 
     @OptIn(ExperimentalUnsignedTypes::class)
     fun publish(entry: ConsentListEntry) {
         val payload = PrivatePreferencesAction.newBuilder().also {
             when (entry.consentType) {
-                ConsentState.ALLOWED -> it.setAllow(PrivatePreferencesAction.Allow.newBuilder().addWalletAddresses(entry.value))
-                ConsentState.BLOCKED -> it.setBlock(PrivatePreferencesAction.Block.newBuilder().addWalletAddresses(entry.value))
+                ConsentState.ALLOWED -> it.setAllow(
+                    PrivatePreferencesAction.Allow.newBuilder().addWalletAddresses(entry.value)
+                )
+
+                ConsentState.BLOCKED -> it.setBlock(
+                    PrivatePreferencesAction.Block.newBuilder().addWalletAddresses(entry.value)
+                )
+
                 ConsentState.UNKNOWN -> it.clearMessageType()
             }
         }.build()