- Protecting contact lists of all accounts in the device.

- Pruning events that are not from or cite an account.

app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -205,6 +205,10 @@ object LocalPreferences {
         }
     }
 
+    fun allLocalAccountNPubs(): Set<String> {
+        return savedAccounts().toSet()
+    }
+
     fun saveToEncryptedStorage(account: Account) {
         val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
         prefs.edit().apply {

app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -31,6 +31,7 @@ import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.actions.ImageUploader
+import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import java.io.File
 
 object ServiceManager {
@@ -117,11 +118,13 @@ object ServiceManager {
     fun cleanUp() {
         LocalCache.cleanObservers()
 
+        val accounts = LocalPreferences.allLocalAccountNPubs().mapNotNull { decodePublicKeyAsHexOrNull(it) }.toSet()
+
         account?.let {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
-            LocalCache.pruneContactLists(it)
+            LocalCache.pruneContactLists(accounts)
-            LocalCache.pruneRepliesAndReactions(it)
+            LocalCache.pruneRepliesAndReactions(accounts)
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -729,7 +729,7 @@ object LocalCache {
 
         val author = getOrCreateUser(event.pubKey)
         val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
-            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 
@@ -751,7 +751,7 @@ object LocalCache {
 
         val author = getOrCreateUser(event.pubKey)
         val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
-            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -253,8 +253,7 @@ open class Note(val idHex: String) {
             zaps = zaps.minus(note)
             liveSet?.zaps?.invalidateData()
         } else if (zaps.containsValue(note)) {
-            val toRemove = zaps.filterValues { it == note }
+            zaps = zaps.filterValues { it != note }
-            zaps = zaps.minus(toRemove.keys)
             liveSet?.zaps?.invalidateData()
         }
     }

quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt

@@ -98,6 +98,7 @@ open class Event(
     override fun matchTag1With(text: String) = tags.any { it.size > 1 && it[1].contains(text, true) }
 
     override fun isTaggedUser(idHex: String) = tags.any { it.size > 1 && it[0] == "p" && it[1] == idHex }
+    override fun isTaggedUsers(idHexes: Set<String>) = tags.any { it.size > 1 && it[0] == "p" && it[1] in idHexes }
 
     override fun isTaggedEvent(idHex: String) = tags.any { it.size > 1 && it[0] == "e" && it[1] == idHex }
 
@@ -199,7 +200,7 @@ open class Event(
         return try {
             hasCorrectIDHash() && hasVerifedSignature()
         } catch (e: Exception) {
-            Log.e("Event", "Fail checking if event $id has a valid signature", e)
+            Log.e("Event", "Event $id does not have a valid signature: ${toJson()}", e)
             false
         }
     }

quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt

@@ -30,6 +30,7 @@ interface EventInterface {
     fun hasValidSignature(): Boolean
 
     fun isTaggedUser(idHex: String): Boolean
+    fun isTaggedUsers(idHex: Set<String>): Boolean
 
     fun isTaggedEvent(idHex: String): Boolean