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

Adopt libsignal 0.30.0 and ServiceIds for group members.

Browse Source 
Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
Jordan Rose
2023-07-31 10:28:18 -07:00
committed by Greyson Parrelli
parent b11d653fc0
commit a2c3b5d64e
44 changed files with 613 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,19 +166,18 @@ public final class MessageGroupContext {
return decryptedGroupV2Context.getChange();
}
public @NonNull List<UUID> getAllActivePendingAndRemovedMembers() {
LinkedList<UUID> memberUuids = new LinkedList<>();
DecryptedGroup groupState = decryptedGroupV2Context.getGroupState();
DecryptedGroupChange groupChange = decryptedGroupV2Context.getChange();
public @NonNull List<ServiceId> getAllActivePendingAndRemovedMembers() {
DecryptedGroup groupState = decryptedGroupV2Context.getGroupState();
DecryptedGroupChange groupChange = decryptedGroupV2Context.getChange();
memberUuids.addAll(DecryptedGroupUtil.membersToUuidList(groupState.getMembersList()));
memberUuids.addAll(DecryptedGroupUtil.pendingToUuidList(groupState.getPendingMembersList()));
memberUuids.addAll(DecryptedGroupUtil.removedMembersUuidList(groupChange));
memberUuids.addAll(DecryptedGroupUtil.removedPendingMembersUuidList(groupChange));
memberUuids.addAll(DecryptedGroupUtil.removedRequestingMembersUuidList(groupChange));
return UuidUtil.filterKnown(memberUuids);
return Stream.of(DecryptedGroupUtil.membersToServiceIdList(groupState.getMembersList()),
DecryptedGroupUtil.pendingToServiceIdList(groupState.getPendingMembersList()),
DecryptedGroupUtil.removedMembersServiceIdList(groupChange),
DecryptedGroupUtil.removedPendingMembersServiceIdList(groupChange),
DecryptedGroupUtil.removedRequestingMembersServiceIdList(groupChange))
.flatMap(Stream::of)
.filterNot(ServiceId::isUnknown)
.toList();
}
@Override