Added function to get all config Addresses

Author: jbsession

app/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt

@@ -151,6 +151,52 @@ fun ConfigFactoryProtocol.userConfigsChanged(
             }
         }
 
+/** All addresses that exist in config and therefore must be kept. */
+fun ConfigFactoryProtocol.allConfigAddresses(): Set<Address> {
+    val (contacts, blinded, groups) = withUserConfigs { config ->
+        Triple(config.contacts.all(), config.contacts.allBlinded(), config.userGroups.all())
+    }
+
+    val contactsAddress : Set<Address> =
+        contacts.asSequence().map { Address.fromSerialized(it.id) }.toSet()
+    val blindedAddress : Set<Address> =
+        blinded.asSequence().map { Address.fromSerialized(it.id) }.toSet()
+
+    val closedIds = mutableListOf<AccountId>()
+    val groupAddresses: Set<Address> = buildSet {
+        groups.forEach { groupInfo ->
+            when (groupInfo) {
+                is GroupInfo.LegacyGroupInfo -> {
+                    add(Address.LegacyGroup(groupInfo.accountId))
+                    groupInfo.members.keys.forEach { add(Address.fromSerialized(it)) }
+                }
+                is GroupInfo.ClosedGroupInfo -> {
+                    val groupId = AccountId(groupInfo.groupAccountId)
+                    closedIds += groupId
+                    add(Address.Group(groupId))
+                }
+                is GroupInfo.CommunityGroupInfo -> {
+                    add(Address.Community(groupInfo.community.baseUrl, groupInfo.community.room))
+                }
+            }
+        }
+    }
+
+    val closedMemberAddresses: Set<Address> = buildSet {
+        closedIds.forEach { groupId ->
+            withGroupConfigs(groupId) { config ->
+                config.groupMembers.all().forEach { add(Address.fromSerialized(it.accountId())) }
+            }
+        }
+    }
+
+    return buildSet {
+        addAll(contactsAddress)
+        addAll(blindedAddress)
+        addAll(groupAddresses)
+        addAll(closedMemberAddresses)
+    }
+}
 
 /**
  * Wait until all configs of given group are pushed to the server.

app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToDatabaseSync.kt

@@ -30,6 +30,7 @@ import org.session.libsession.utilities.Address.Companion.fromSerialized
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.UserConfigType
+import org.session.libsession.utilities.allConfigAddresses
 import org.session.libsession.utilities.getGroup
 import org.session.libsession.utilities.userConfigsChanged
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey
@@ -152,13 +153,8 @@ class ConfigToDatabaseSync @Inject constructor(
                 }
             }
 
-            // Initiate cleanup in recipient_settings rows that no longer have any messages
-            val addressesToKeep = mmsSmsDatabase.getAllReferencedAddresses()
-            val removed = recipientSettingsDatabase.cleanupRecipientSettings(addressesToKeep)
-            Log.d(TAG, "Recipient settings pruned: $removed orphan rows")
-            if(removed > 0){
-                avatarCacheCleaner.launchAvatarCleanup()
-            }
+            // Initiate cleanup in recipient_settings
+            pruneRecipientSettingsAndAvatars()
         }
 
         // If we created threads, we need to update the thread database with the creation date.
@@ -178,6 +174,20 @@ class ConfigToDatabaseSync @Inject constructor(
         }
     }
 
+    private fun pruneRecipientSettingsAndAvatars() {
+        val addressesToKeep: Set<Address> = buildSet {
+            addAll(configFactory.allConfigAddresses())
+            addAll(mmsSmsDatabase.getAllReferencedAddresses())
+        }
+
+        val removed = recipientSettingsDatabase.cleanupRecipientSettings(addressesToKeep)
+        Log.d(TAG, "Recipient settings pruned: $removed orphan rows")
+
+        if (removed > 0) {
+            avatarCacheCleaner.launchAvatarCleanup()
+        }
+    }
+
     private fun deleteGroupData(address: Address.Group) {
         lokiAPIDatabase.clearLastMessageHashes(address.accountId.hexString)
         lokiAPIDatabase.clearReceivedMessageHashValues(address.accountId.hexString)