Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 11:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues around SignalServiceAddress creation.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-08-27 10:57:52 -04:00
committed by Alex Hart
parent a57adcb2b0
commit 08008629b3
10 changed files with 19 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
View File

@@ -82,7 +82,7 @@ public class MultiDeviceBlockedUpdateJob extends BaseJob {
while ((recipient = reader.getNext()) != null) {
if (recipient.isPushGroup()) {
blockedGroups.add(recipient.requireGroupId().getDecodedId());
} else if (recipient.isMaybeRegistered()) {
} else if (recipient.isMaybeRegistered() && (recipient.hasUuid() || recipient.hasE164())) {
blockedIndividuals.add(RecipientUtil.toSignalServiceAddress(context, recipient));
}
}

3
app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
View File

@@ -132,8 +132,7 @@ public final class MessageGroupContext {
return Stream.of(groupContext.getMembersList())
.map(GroupContext.Member::getE164)
.withoutNulls()
.map(e164 -> new SignalServiceAddress(null, e164))
.map(RecipientId::from)
.map(RecipientId::fromExternalPush)
.filterNot(selfId::equals)
.toList();
}

2
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
View File

@@ -82,7 +82,7 @@ public class RecipientUtil {
return Stream.of(recipients)
.map(Recipient::resolve)
.map(r -> new SignalServiceAddress(r.getUuid().orNull(), r.getE164().orNull()))
.map(r -> new SignalServiceAddress(r.requireUuid(), r.getE164().orNull()))
.toList();
}