TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 01:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only admin can cancel any invite.

Browse Source
This commit is contained in:
Alan Evans 2020-05-21 18:11:04 -03:00 committed by Greyson Parrelli
parent 297a7d0ef8
commit 67a8ec0d39
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java
View File

@ -56,13 +56,13 @@ public class PendingMemberInvitesViewModel extends ViewModel {
for (PendingMemberRepository.SinglePendingMemberInvitedByYou pendingMember : inviteeResult.getByMe()) {
byMe.add(new GroupMemberEntry.PendingMember(pendingMember.getInvitee(),
pendingMember.getInviteeCipherText(),
true));
inviteeResult.isCanCancelInvites()));
}
for (PendingMemberRepository.MultiplePendingMembersInvitedByAnother pendingMembers : inviteeResult.getByOthers()) {
byOthers.add(new GroupMemberEntry.UnknownPendingMemberCount(pendingMembers.getInviter(),
pendingMembers.getUuidCipherTexts(),
inviteeResult.isCanCancelOthersInvites()));
inviteeResult.isCanCancelInvites()));
}
setInvitees(byMe, byOthers);

14
app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java
View File

@ -114,15 +114,15 @@ final class PendingMemberRepository {
public static final class InviteeResult {
private final List<SinglePendingMemberInvitedByYou> byMe;
private final List<MultiplePendingMembersInvitedByAnother> byOthers;
private final boolean canCancelOthersInvites;
private final boolean canCancelInvites;
private InviteeResult(List<SinglePendingMemberInvitedByYou> byMe,
List<MultiplePendingMembersInvitedByAnother> byOthers,
boolean canCancelOthersInvites)
boolean canCancelInvites)
{
this.byMe = byMe;
this.byOthers = byOthers;
this.canCancelOthersInvites = canCancelOthersInvites;
this.byMe = byMe;
this.byOthers = byOthers;
this.canCancelInvites = canCancelInvites;
}
public List<SinglePendingMemberInvitedByYou> getByMe() {
@ -133,8 +133,8 @@ final class PendingMemberRepository {
return byOthers;
}
public boolean isCanCancelOthersInvites() {
return canCancelOthersInvites;
public boolean isCanCancelInvites() {
return canCancelInvites;
}
}