From 2c4be592ad3ea7b37551eac187edf4b0ddc80baf Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sun, 26 Mar 2023 11:42:30 -0400
Subject: [PATCH] Correctly counts pruned contact lists.

---
 .../java/com/vitorpamplona/amethyst/model/LocalCache.kt    | 2 +-
 .../com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt  | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 23b9c1460..da8686412 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -724,7 +724,7 @@ object LocalCache {
     fun pruneContactLists(userAccount: Account) {
         var removingContactList = 0
         users.values.forEach {
-            if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false)) {
+            if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
                 it.latestContactList = null
                 removingContactList++
             }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
index 99a4d9ed1..c99cfe66a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
@@ -130,17 +130,14 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                                     NostrChannelDataSource.printCounter()
                                     NostrChatroomDataSource.printCounter()
                                     NostrChatroomListDataSource.printCounter()
-
                                     NostrGlobalDataSource.printCounter()
+                                    NostrHashtagDataSource.printCounter()
                                     NostrHomeDataSource.printCounter()
-
-                                    NostrSingleEventDataSource.printCounter()
                                     NostrSearchEventOrUserDataSource.printCounter()
                                     NostrSingleChannelDataSource.printCounter()
+                                    NostrSingleEventDataSource.printCounter()
                                     NostrSingleUserDataSource.printCounter()
                                     NostrThreadDataSource.printCounter()
-                                    NostrHashtagDataSource.printCounter()
-
                                     NostrUserProfileDataSource.printCounter()
 
                                     Log.d("STATE DUMP", "Connected Relays: " + RelayPool.connectedRelays())