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

Default values for member level and admin when no UUID.

Browse source
This commit is contained in:
Alan Evans 2020-09-03 12:28:11 -03:00 • committed by Cody Henthorne
parent ed440a2150
commit f88874bec8
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
View file

@ -850,21 +850,33 @@ public final class GroupDatabase extends Database {
} }
public boolean isAdmin(@NonNull Recipient recipient) { public boolean isAdmin(@NonNull Recipient recipient) {
return DecryptedGroupUtil.findMemberByUuid(getDecryptedGroup().getMembersList(), recipient.getUuid().get()) Optional<UUID> uuid = recipient.getUuid();
if (!uuid.isPresent()) {
return false;
}
return DecryptedGroupUtil.findMemberByUuid(getDecryptedGroup().getMembersList(), uuid.get())
.transform(t -> t.getRole() == Member.Role.ADMINISTRATOR) .transform(t -> t.getRole() == Member.Role.ADMINISTRATOR)
.or(false); .or(false);
} }
public MemberLevel memberLevel(@NonNull Recipient recipient) { public MemberLevel memberLevel(@NonNull Recipient recipient) {
Optional<UUID> uuid = recipient.getUuid();
if (!uuid.isPresent()) {
return MemberLevel.NOT_A_MEMBER;
}
DecryptedGroup decryptedGroup = getDecryptedGroup(); DecryptedGroup decryptedGroup = getDecryptedGroup();
return DecryptedGroupUtil.findMemberByUuid(decryptedGroup.getMembersList(), recipient.getUuid().get()) return DecryptedGroupUtil.findMemberByUuid(decryptedGroup.getMembersList(), uuid.get())
.transform(member -> member.getRole() == Member.Role.ADMINISTRATOR .transform(member -> member.getRole() == Member.Role.ADMINISTRATOR
? MemberLevel.ADMINISTRATOR ? MemberLevel.ADMINISTRATOR
: MemberLevel.FULL_MEMBER) : MemberLevel.FULL_MEMBER)
.or(() -> DecryptedGroupUtil.findPendingByUuid(decryptedGroup.getPendingMembersList(), recipient.getUuid().get()) .or(() -> DecryptedGroupUtil.findPendingByUuid(decryptedGroup.getPendingMembersList(), uuid.get())
.transform(m -> MemberLevel.PENDING_MEMBER) .transform(m -> MemberLevel.PENDING_MEMBER)
.or(() -> DecryptedGroupUtil.findRequestingByUuid(decryptedGroup.getRequestingMembersList(), recipient.getUuid().get()) .or(() -> DecryptedGroupUtil.findRequestingByUuid(decryptedGroup.getRequestingMembersList(), uuid.get())
.transform(m -> MemberLevel.REQUESTING_MEMBER) .transform(m -> MemberLevel.REQUESTING_MEMBER)
.or(MemberLevel.NOT_A_MEMBER))); .or(MemberLevel.NOT_A_MEMBER)));
} }