Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prefer ServiceIds over SignalServiceAddresses.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-07-08 09:09:27 -04:00
committed by Alex Hart
parent 6d4dadea48
commit 3beb730edb
18 changed files with 107 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
View File

@@ -2305,7 +2305,7 @@ public final class MessageContentProcessor {
}
List<org.signal.libsignal.protocol.util.Pair<RecipientId, Boolean>> unidentifiedStatus = Stream.of(members)
.map(m -> new org.signal.libsignal.protocol.util.Pair<>(m.getId(), message.isUnidentified(m.requireServiceId().toString())))
.map(m -> new org.signal.libsignal.protocol.util.Pair<>(m.getId(), message.isUnidentified(m.requireServiceId())))
.toList();
receiptDatabase.setUnidentified(unidentifiedStatus, messageId);
}
@@ -3132,16 +3132,11 @@ public final class MessageContentProcessor {
}
private static boolean isUnidentified(@NonNull SentTranscriptMessage message, @NonNull Recipient recipient) {
boolean unidentified = false;
if (recipient.hasE164()) {
unidentified |= message.isUnidentified(recipient.requireE164());
}
if (recipient.hasServiceId()) {
unidentified |= message.isUnidentified(recipient.requireServiceId());
return message.isUnidentified(recipient.requireServiceId());
} else {
return false;
}
return unidentified;
}
private static void log(@NonNull String message) {