Converted to HashSet, added DISTINCT to profile pic and key

Author: jbsession

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

@@ -154,7 +154,7 @@ class ConfigToDatabaseSync @Inject constructor(
 
             // Initiate cleanup in recipient_settings rows that no longer have any messages
             val addressesToKeep = mmsSmsDatabase.getAllReferencedAddresses()
-                .mapTo(mutableSetOf()) { Address.fromSerialized(it) }
+                .mapTo(mutableSetOf()) { fromSerialized(it) }
 
             val removed = recipientSettingsDatabase.cleanupRecipientSettings(addressesToKeep)
             Log.d(TAG, "Recipient settings pruned: $removed orphan rows")

app/src/main/java/org/thoughtcrime/securesms/database/RecipientSettingsDatabase.kt

@@ -151,10 +151,10 @@ class RecipientSettingsDatabase @Inject constructor(
      * them from the cleanup.
      */
     fun getAllReferencedAvatarFiles(): Set<RemoteFile.Encrypted> {
-        val recipientAvatars = LinkedHashSet<RemoteFile.Encrypted>()
+        val recipientAvatars = HashSet<RemoteFile.Encrypted>()
         readableDatabase.rawQuery(
             """
-        SELECT $COL_PROFILE_PIC_URL, $COL_PROFILE_PIC_KEY
+        SELECT DISTINCT $COL_PROFILE_PIC_URL, $COL_PROFILE_PIC_KEY
         FROM $TABLE_NAME
         WHERE $COL_PROFILE_PIC_URL IS NOT NULL AND $COL_PROFILE_PIC_URL != ''
           AND $COL_PROFILE_PIC_KEY IS NOT NULL AND $COL_PROFILE_PIC_KEY != ''