Using Recipients instead of Contact to sync config

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -488,6 +488,29 @@ public List<Recipient> getBlockedContacts() {
     return returnList;
   }
 
+  /**
+   * Returns a list of all recipients in the database.
+   *
+   * @return A list of all recipients
+   */
+  public List<Recipient> getAllRecipients() {
+    SQLiteDatabase database = databaseHelper.getReadableDatabase();
+
+    Cursor cursor = database.query(TABLE_NAME, new String[] {ID, ADDRESS}, null,
+            null, null, null, null, null);
+
+    RecipientReader reader = new RecipientReader(context, cursor);
+    List<Recipient> returnList = new ArrayList<>();
+    Recipient current;
+
+    while ((current = reader.getNext()) != null) {
+      returnList.add(current);
+    }
+
+    reader.close();
+    return returnList;
+  }
+
   public void setDisappearingState(@NonNull Recipient recipient, @NonNull Recipient.DisappearingState disappearingState) {
     ContentValues values = new ContentValues();
     values.put(DISAPPEARING_STATE, disappearingState.getId());

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

@@ -55,8 +55,6 @@ class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Da
         val database = databaseHelper.readableDatabase
         return database.getAll(sessionContactTable, null, null) { cursor ->
             contactFromCursor(cursor)
-        }.filter { contact ->
-            contact.accountID.let(::AccountId).prefix == IdPrefix.STANDARD
         }.toSet()
     }
 

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

@@ -1351,12 +1351,16 @@ open class Storage @Inject constructor(
 
         // if we have contacts locally but that are missing from the config, remove their corresponding thread
         val currentUserKey = getUserPublicKey()
-        val removedContacts = getAllContacts().filter { localContact ->
-            localContact.accountID != currentUserKey && // we don't want to remove ourselves (ie, our Note to Self)
-            moreContacts.none { it.id == localContact.accountID } // we don't want to remove contacts that are present in the config
+
+        //NOTE: I used to cycle through all Contact here instead or all Recipients, but turns out a Contact isn't saved until we have a name, nickname or avatar
+        // which in the case of contacts we are messaging for the first time and who haven't yet approved us, it won't be the case
+        // But that person is saved in the Recipient db. We might need to investigate how to clean the relationship between Recipients, Contacts and config Contacts.
+        val removedContacts = recipientDatabase.allRecipients.filter { localContact ->
+            localContact.address.toString() != currentUserKey && // we don't want to remove ourselves (ie, our Note to Self)
+            moreContacts.none { it.id == localContact.address.toString() } // we don't want to remove contacts that are present in the config
         }
         removedContacts.forEach {
-            deleteContact(it.accountID)
+            deleteContact(it.address.toString())
         }
     }