From d53fd6a1099cd11c005c3b9db6c29e320b265a55 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Wed, 5 Aug 2020 10:27:50 -0300 Subject: [PATCH] Change invite cancel to invite revoke. --- .../securesms/groups/GroupManager.java | 4 +-- .../securesms/groups/GroupManagerV2.java | 4 +-- .../groups/ui/AdminActionsListener.java | 4 +-- .../groups/ui/GroupMemberListAdapter.java | 12 ++++----- ...va => InviteRevokeConfirmationDialog.java} | 24 ++++++++--------- .../PendingMemberInvitesFragment.java | 12 ++++----- .../PendingMemberInvitesViewModel.java | 18 ++++++------- .../PendingMemberRepository.java | 14 +++++----- .../res/menu/others_invite_pending_menu.xml | 4 +-- .../main/res/menu/own_invite_pending_menu.xml | 4 +-- app/src/main/res/values/strings.xml | 26 +++++++++---------- 11 files changed, 63 insertions(+), 63 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/{InviteCancelConfirmationDialog.java => InviteRevokeConfirmationDialog.java} (74%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java index 56f5ca859..3983e1bbf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java @@ -200,13 +200,13 @@ public final class GroupManager { } @WorkerThread - public static void cancelInvites(@NonNull Context context, + public static void revokeInvites(@NonNull Context context, @NonNull GroupId.V2 groupId, @NonNull Collection uuidCipherTexts) throws GroupChangeFailedException, GroupInsufficientRightsException, IOException, GroupNotAMemberException, GroupChangeBusyException { try (GroupManagerV2.GroupEditor editor = new GroupManagerV2(context).edit(groupId.requireV2())) { - editor.cancelInvites(uuidCipherTexts); + editor.revokeInvites(uuidCipherTexts); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java index 103c265c0..8cc558d62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java @@ -258,7 +258,7 @@ final class GroupManagerV2 { } @WorkerThread - @NonNull GroupManager.GroupActionResult cancelInvites(@NonNull Collection uuidCipherTexts) + @NonNull GroupManager.GroupActionResult revokeInvites(@NonNull Collection uuidCipherTexts) throws GroupChangeFailedException, GroupInsufficientRightsException, IOException, GroupNotAMemberException { return commitChangeWithConflictResolution(groupOperations.createRemoveInvitationChange(new HashSet<>(uuidCipherTexts))); @@ -284,7 +284,7 @@ final class GroupManagerV2 { if (selfPendingMember.isPresent()) { try { - return cancelInvites(Collections.singleton(new UuidCiphertext(selfPendingMember.get().getUuidCipherText().toByteArray()))); + return revokeInvites(Collections.singleton(new UuidCiphertext(selfPendingMember.get().getUuidCipherText().toByteArray()))); } catch (InvalidInputException e) { throw new AssertionError(e); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/AdminActionsListener.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/AdminActionsListener.java index 8d540e9ca..83ad77eda 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/AdminActionsListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/AdminActionsListener.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; public interface AdminActionsListener { - void onCancelInvite(@NonNull GroupMemberEntry.PendingMember pendingMember); + void onRevokeInvite(@NonNull GroupMemberEntry.PendingMember pendingMember); - void onCancelAllInvites(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers); + void onRevokeAllInvites(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java index 1d86284ed..9add247ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java @@ -324,8 +324,8 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter { - if (item == R.id.cancel_invite) { - adminActionsListener.onCancelInvite(pendingMember); + if (item == R.id.revoke_invite) { + adminActionsListener.onRevokeInvite(pendingMember); return true; } return false; @@ -360,16 +360,16 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter { - if (item.getItemId() == R.id.cancel_invites) { - item.setTitle(context.getResources().getQuantityString(R.plurals.PendingMembersActivity_cancel_d_invites, pendingMembers.getInviteCount(), + if (item.getItemId() == R.id.revoke_invites) { + item.setTitle(context.getResources().getQuantityString(R.plurals.PendingMembersActivity_revoke_d_invites, pendingMembers.getInviteCount(), pendingMembers.getInviteCount())); return true; } return true; }, item -> { - if (item == R.id.cancel_invites) { - adminActionsListener.onCancelAllInvites(pendingMembers); + if (item == R.id.revoke_invites) { + adminActionsListener.onRevokeAllInvites(pendingMembers); return true; } return false; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/InviteCancelConfirmationDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/InviteRevokeConfirmationDialog.java similarity index 74% rename from app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/InviteCancelConfirmationDialog.java rename to app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/InviteRevokeConfirmationDialog.java index 9d01af068..f8f0c4c90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/InviteCancelConfirmationDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/InviteRevokeConfirmationDialog.java @@ -8,40 +8,40 @@ import androidx.appcompat.app.AlertDialog; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.recipients.Recipient; -final class InviteCancelConfirmationDialog { +final class InviteRevokeConfirmationDialog { - private InviteCancelConfirmationDialog() { + private InviteRevokeConfirmationDialog() { } /** - * Confirms that you want to cancel an invite that you sent. + * Confirms that you want to revoke an invite that you sent. */ - static AlertDialog showOwnInviteCancelConfirmationDialog(@NonNull Context context, + static AlertDialog showOwnInviteRevokeConfirmationDialog(@NonNull Context context, @NonNull Recipient invitee, - @NonNull Runnable onCancel) + @NonNull Runnable onRevoke) { return new AlertDialog.Builder(context) - .setMessage(context.getString(R.string.GroupManagement_cancel_own_single_invite, + .setMessage(context.getString(R.string.InviteRevokeConfirmationDialog_revoke_own_single_invite, invitee.getDisplayName(context))) - .setPositiveButton(R.string.yes, (dialog, which) -> onCancel.run()) + .setPositiveButton(R.string.yes, (dialog, which) -> onRevoke.run()) .setNegativeButton(R.string.no, null) .show(); } /** - * Confirms that you want to cancel a number of invites that another member sent. + * Confirms that you want to revoke a number of invites that another member sent. */ - static AlertDialog showOthersInviteCancelConfirmationDialog(@NonNull Context context, + static AlertDialog showOthersInviteRevokeConfirmationDialog(@NonNull Context context, @NonNull Recipient inviter, int numberOfInvitations, - @NonNull Runnable onCancel) + @NonNull Runnable onRevoke) { return new AlertDialog.Builder(context) - .setMessage(context.getResources().getQuantityString(R.plurals.GroupManagement_cancel_others_invites, + .setMessage(context.getResources().getQuantityString(R.plurals.InviteRevokeConfirmationDialog_revoke_others_invites, numberOfInvitations, inviter.getDisplayName(context), numberOfInvitations)) - .setPositiveButton(R.string.yes, (dialog, which) -> onCancel.run()) + .setPositiveButton(R.string.yes, (dialog, which) -> onRevoke.run()) .setNegativeButton(R.string.no, null) .show(); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesFragment.java index 844bba29e..3380f1e44 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesFragment.java @@ -50,12 +50,12 @@ public class PendingMemberInvitesFragment extends Fragment { youInvited.setAdminActionsListener(new AdminActionsListener() { @Override - public void onCancelInvite(@NonNull GroupMemberEntry.PendingMember pendingMember) { - viewModel.cancelInviteFor(pendingMember); + public void onRevokeInvite(@NonNull GroupMemberEntry.PendingMember pendingMember) { + viewModel.revokeInviteFor(pendingMember); } @Override - public void onCancelAllInvites(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers) { + public void onRevokeAllInvites(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers) { throw new AssertionError(); } }); @@ -63,13 +63,13 @@ public class PendingMemberInvitesFragment extends Fragment { othersInvited.setAdminActionsListener(new AdminActionsListener() { @Override - public void onCancelInvite(@NonNull GroupMemberEntry.PendingMember pendingMember) { + public void onRevokeInvite(@NonNull GroupMemberEntry.PendingMember pendingMember) { throw new AssertionError(); } @Override - public void onCancelAllInvites(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers) { - viewModel.cancelInvitesFor(pendingMembers); + public void onRevokeAllInvites(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers) { + viewModel.revokeInvitesFor(pendingMembers); } }); diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java index e84574f60..eb0aaf392 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberInvitesViewModel.java @@ -56,27 +56,27 @@ public class PendingMemberInvitesViewModel extends ViewModel { for (PendingMemberRepository.SinglePendingMemberInvitedByYou pendingMember : inviteeResult.getByMe()) { byMe.add(new GroupMemberEntry.PendingMember(pendingMember.getInvitee(), pendingMember.getInviteeCipherText(), - inviteeResult.isCanCancelInvites())); + inviteeResult.isCanRevokeInvites())); } for (PendingMemberRepository.MultiplePendingMembersInvitedByAnother pendingMembers : inviteeResult.getByOthers()) { byOthers.add(new GroupMemberEntry.UnknownPendingMemberCount(pendingMembers.getInviter(), pendingMembers.getUuidCipherTexts(), - inviteeResult.isCanCancelInvites())); + inviteeResult.isCanRevokeInvites())); } setInvitees(byMe, byOthers); } - void cancelInviteFor(@NonNull GroupMemberEntry.PendingMember pendingMember) { + void revokeInviteFor(@NonNull GroupMemberEntry.PendingMember pendingMember) { UuidCiphertext inviteeCipherText = pendingMember.getInviteeCipherText(); - InviteCancelConfirmationDialog.showOwnInviteCancelConfirmationDialog(context, pendingMember.getInvitee(), () -> + InviteRevokeConfirmationDialog.showOwnInviteRevokeConfirmationDialog(context, pendingMember.getInvitee(), () -> SimpleTask.run( () -> { pendingMember.setBusy(true); try { - return pendingMemberRepository.cancelInvites(Collections.singleton(inviteeCipherText)); + return pendingMemberRepository.revokeInvites(Collections.singleton(inviteeCipherText)); } finally { pendingMember.setBusy(false); } @@ -100,13 +100,13 @@ public class PendingMemberInvitesViewModel extends ViewModel { )); } - void cancelInvitesFor(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers) { - InviteCancelConfirmationDialog.showOthersInviteCancelConfirmationDialog(context, pendingMembers.getInviter(), pendingMembers.getInviteCount(), + void revokeInvitesFor(@NonNull GroupMemberEntry.UnknownPendingMemberCount pendingMembers) { + InviteRevokeConfirmationDialog.showOthersInviteRevokeConfirmationDialog(context, pendingMembers.getInviter(), pendingMembers.getInviteCount(), () -> SimpleTask.run( () -> { pendingMembers.setBusy(true); try { - return pendingMemberRepository.cancelInvites(pendingMembers.getCiphertexts()); + return pendingMemberRepository.revokeInvites(pendingMembers.getCiphertexts()); } finally { pendingMembers.setBusy(false); } @@ -131,7 +131,7 @@ public class PendingMemberInvitesViewModel extends ViewModel { } private void toastErrorCanceling(int quantity) { - Toast.makeText(context, context.getResources().getQuantityText(R.plurals.PendingMembersActivity_error_canceling_invite, quantity), Toast.LENGTH_SHORT) + Toast.makeText(context, context.getResources().getQuantityText(R.plurals.PendingMembersActivity_error_revoking_invite, quantity), Toast.LENGTH_SHORT) .show(); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java index 1b8f04895..bc78ddf96 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/pendingmemberinvites/PendingMemberRepository.java @@ -98,9 +98,9 @@ final class PendingMemberRepository { } @WorkerThread - boolean cancelInvites(@NonNull Collection uuidCipherTexts) { + boolean revokeInvites(@NonNull Collection uuidCipherTexts) { try { - GroupManager.cancelInvites(context, groupId, uuidCipherTexts); + GroupManager.revokeInvites(context, groupId, uuidCipherTexts); return true; } catch (GroupChangeException | IOException e) { Log.w(TAG, e); @@ -111,15 +111,15 @@ final class PendingMemberRepository { public static final class InviteeResult { private final List byMe; private final List byOthers; - private final boolean canCancelInvites; + private final boolean canRevokeInvites; private InviteeResult(List byMe, List byOthers, - boolean canCancelInvites) + boolean canRevokeInvites) { this.byMe = byMe; this.byOthers = byOthers; - this.canCancelInvites = canCancelInvites; + this.canRevokeInvites = canRevokeInvites; } public List getByMe() { @@ -130,8 +130,8 @@ final class PendingMemberRepository { return byOthers; } - public boolean isCanCancelInvites() { - return canCancelInvites; + public boolean isCanRevokeInvites() { + return canRevokeInvites; } } diff --git a/app/src/main/res/menu/others_invite_pending_menu.xml b/app/src/main/res/menu/others_invite_pending_menu.xml index 2c7edfbe0..222565294 100644 --- a/app/src/main/res/menu/others_invite_pending_menu.xml +++ b/app/src/main/res/menu/others_invite_pending_menu.xml @@ -2,7 +2,7 @@ + android:id="@+id/revoke_invites" + android:title="@string/PendingMembersActivity_revoke_invites" /> \ No newline at end of file diff --git a/app/src/main/res/menu/own_invite_pending_menu.xml b/app/src/main/res/menu/own_invite_pending_menu.xml index 4ebfcf4d3..6408226c7 100644 --- a/app/src/main/res/menu/own_invite_pending_menu.xml +++ b/app/src/main/res/menu/own_invite_pending_menu.xml @@ -2,7 +2,7 @@ + android:id="@+id/revoke_invite" + android:title="@string/PendingMembersActivity_revoke_invite" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 33a94b3a2..73290ae2d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -492,15 +492,15 @@ No pending invites by other group members. Details of people invited by other group members are not shown. If invitees choose to join, their information will be shared with the group at that time. They will not see any messages in the group until they join. - Cancel invite - Cancel invites - - Cancel invite - Cancel %1$d invites + Revoke invite + Revoke invites + + Revoke invite + Revoke %1$d invites - - Error canceling invite - Error canceling invites + + Error revoking invite + Error revoking invites @@ -621,11 +621,11 @@ Disabled Default - - Do you want to cancel the invite you sent to %1$s? - - Do you want to cancel the invite sent by %1$s? - Do you want to cancel %2$d invites sent by %1$s? + + Do you want to revoke the invite you sent to %1$s? + + Do you want to revoke the invite sent by %1$s? + Do you want to revoke %2$d invites sent by %1$s?