Only admin can cancel any invite.

signalapp · May 29, 2020 · 67a8ec0 · 67a8ec0
1 parent 297a7d0
commit 67a8ec0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.../thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java b/.../thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java
@@ -56,13 +56,13 @@ private void setMembers(PendingMemberRepository.InviteeResult inviteeResult) {
     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);

diff --git a/...va/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java b/...va/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java
@@ -114,15 +114,15 @@ boolean cancelInvites(@NonNull Collection<UuidCiphertext> uuidCipherTexts) {
   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 @@ public List<MultiplePendingMembersInvitedByAnother> getByOthers() {
       return byOthers;
     }
 
-    public boolean isCanCancelOthersInvites() {
-      return canCancelOthersInvites;
+    public boolean isCanCancelInvites() {
+      return canCancelInvites;
     }
   }