empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Translate missing recipients into unknown recipients.

Browse source
This commit is contained in:
Greyson Parrelli 2024-12-21 12:29:32 -05:00
parent 034e04884c
commit 47a5816be8
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
View file

@ -1112,7 +1112,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
recipientId = RecipientId.from(cursor.requireNonNullString(RECIPIENT_ID)),
title = cursor.requireString(TITLE),
serializedMembers = cursor.requireString(MEMBER_GROUP_CONCAT),
serializedUnmigratedV1Members = cursor.requireString(UNMIGRATED_V1_MEMBERS),
serializedUnmigratedV1Members = null,
avatarId = cursor.requireLong(AVATAR_ID),
avatarKey = cursor.requireBlob(AVATAR_KEY),
avatarContentType = cursor.requireString(AVATAR_CONTENT_TYPE),

11
app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java
View file

@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.database.DistributionListTables;
import org.thoughtcrime.securesms.database.GroupTable;
import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.RecipientRecord;
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
import java.util.Objects;
@ -189,7 +190,15 @@ public final class LiveRecipient {
}
private @NonNull Recipient fetchAndCacheRecipientFromDisk(@NonNull RecipientId id) {
Recipient recipient = RecipientCreator.forRecord(context, recipientTable.getRecord(id));
RecipientRecord record;
try {
record = recipientTable.getRecord(id);
} catch (RecipientTable.MissingRecipientException e) {
Log.w(TAG, "Failed to find " + id + "! Returning UNKNOWN.");
return Recipient.UNKNOWN;
}
Recipient recipient = RecipientCreator.forRecord(context, record);
RecipientIdCache.INSTANCE.put(recipient);
return recipient;
}

5
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
View file

@ -119,11 +119,6 @@ object RecipientCreator {
return recipient
}
@JvmStatic
fun forUnknown(): Recipient {
return Recipient.UNKNOWN
}
@JvmStatic
fun forUnknownGroup(id: RecipientId, groupId: GroupId?): Recipient {
return Recipient(