getAllReferencedAddresses() returns Address now

Author: jbsession

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

@@ -449,17 +449,23 @@ public Cursor getUnreadOrUnseenReactions() {
     return queryTables(PROJECTION, selection, order, null);
   }
 
-  public Set<String> getAllReferencedAddresses() {
+  public Set<Address> getAllReferencedAddresses() {
     final String[] projection = new String[] { "DISTINCT " + MmsSmsColumns.ADDRESS };
     final String selection =
             "NOT " + MmsSmsColumns.IS_DELETED +
                     " AND " + MmsSmsColumns.ADDRESS + " IS NOT NULL" +
                     " AND " + MmsSmsColumns.ADDRESS + " != ''";
 
-    Set<String> out = new HashSet<>();
+    Set<Address> out = new HashSet<>();
     try (Cursor cursor = queryTables(projection, selection, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        out.add(cursor.getString(0));
+        String serialized = cursor.getString(0);
+        try {
+          out.add(Address.fromSerialized(serialized));
+        } catch (Exception e) {
+          // If parsing fails, skip this row
+          Log.w(TAG, "Skipping unparsable address: " + serialized, e);
+        }
       }
     }
     return out;