TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 15:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various groups V2 dialog copy changes.

Browse Source
This commit is contained in:
Alan Evans
2020-09-29 12:03:32 -03:00
parent 4e25e8aaa2
commit fe33ce3413
8 changed files with 48 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java
View File

@@ -77,27 +77,26 @@ public final class LeaveGroupDialog {
private void showSelectNewAdminDialog() {
new AlertDialog.Builder(activity)
.setTitle(R.string.ConversationActivity_choose_new_admin)
.setMessage(R.string.ConversationActivity_before_you_leave_you_must_choose_at_least_one_new_admin_for_this_group)
.setTitle(R.string.LeaveGroupDialog_choose_new_admin)
.setMessage(R.string.LeaveGroupDialog_before_you_leave_you_must_choose_at_least_one_new_admin_for_this_group)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.ConversationActivity_choose_admin, (d,w) -> activity.startActivity(ChooseNewAdminActivity.createIntent(activity, groupId.requireV2())))
.setPositiveButton(R.string.LeaveGroupDialog_choose_admin, (d,w) -> activity.startActivity(ChooseNewAdminActivity.createIntent(activity, groupId.requireV2())))
.show();
}
private void showLeaveDialog() {
new AlertDialog.Builder(activity)
.setTitle(R.string.ConversationActivity_leave_group)
.setIconAttribute(R.attr.dialog_info_icon)
.setTitle(R.string.LeaveGroupDialog_leave_group)
.setCancelable(true)
.setMessage(R.string.ConversationActivity_are_you_sure_you_want_to_leave_this_group)
.setPositiveButton(R.string.yes, (dialog, which) -> {
.setMessage(R.string.LeaveGroupDialog_you_will_no_longer_be_able_to_send_or_receive_messages_in_this_group)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.LeaveGroupDialog_leave, (dialog, which) -> {
AlertDialog progressDialog = SimpleProgressDialog.show(activity);
SimpleTask.run(activity.getLifecycle(), this::leaveGroup, result -> {
progressDialog.dismiss();
handleLeaveGroupResult(result);
});
})
.setNegativeButton(R.string.no, null)
.show();
}

2
app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.java
View File

@@ -103,7 +103,7 @@ public class AddMembersActivity extends PushContactSelectionActivity {
return new AlertDialog.Builder(this)
.setMessage(" ")
.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel())
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
.setPositiveButton(R.string.AddMembersActivity__add, (dialog, which) -> {
dialog.dismiss();
onFinishedSelection();
})

2
app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.java
View File

@@ -88,7 +88,7 @@ public final class AddToGroupsActivity extends ContactSelectionActivity {
new AlertDialog.Builder(this)
.setTitle(addEvent.getTitle())
.setMessage(addEvent.getMessage())
.setPositiveButton(android.R.string.ok, (dialog, which) -> viewModel.onAddToGroupsConfirmed(addEvent))
.setPositiveButton(R.string.AddToGroupActivity_add, (dialog, which) -> viewModel.onAddToGroupsConfirmed(addEvent))
.setNegativeButton(android.R.string.cancel, null)
.show();
} else if (event instanceof Event.LegacyGroupDenialEvent) {

4
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupRightsDialog.java
View File

@@ -47,10 +47,10 @@ public final class GroupRightsDialog {
public enum Type {
MEMBERSHIP(R.string.ManageGroupActivity_choose_who_can_add_or_invite_new_members,
MEMBERSHIP(R.string.ManageGroupActivity_who_can_add_new_members,
R.array.GroupManagement_edit_group_membership_choices),
ATTRIBUTES(R.string.ManageGroupActivity_choose_who_can_edit_the_group_name_avatar_and_disappearing_messages,
ATTRIBUTES(R.string.ManageGroupActivity_who_can_edit_this_groups_info,
R.array.GroupManagement_edit_group_info_choices);
@StringRes private final int message;

6
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
View File

@@ -74,12 +74,6 @@ final class RecipientDialogRepository {
});
}
void getGroupName(@NonNull Consumer<String> stringConsumer) {
SimpleTask.run(SignalExecutors.BOUNDED,
() -> DatabaseFactory.getGroupDatabase(context).requireGroup(Objects.requireNonNull(groupId)).getTitle(),
stringConsumer::accept);
}
void removeMember(@NonNull Consumer<Boolean> onComplete, @NonNull GroupChangeErrorCallback error) {
SimpleTask.run(SignalExecutors.UNBOUNDED,
() -> {

31
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogViewModel.java
View File

@@ -178,22 +178,21 @@ final class RecipientDialogViewModel extends ViewModel {
}
void onRemoveFromGroupClicked(@NonNull Activity activity, @NonNull Runnable onSuccess) {
recipientDialogRepository.getGroupName(title ->
new AlertDialog.Builder(activity)
.setMessage(context.getString(R.string.RecipientBottomSheet_remove_s_from_s, Objects.requireNonNull(recipient.getValue()).getDisplayName(context), title))
.setPositiveButton(R.string.RecipientBottomSheet_remove,
(dialog, which) -> {
adminActionBusy.setValue(true);
recipientDialogRepository.removeMember(result -> {
adminActionBusy.setValue(false);
if (result) {
onSuccess.run();
}
},
this::showErrorToast);
})
.setNegativeButton(android.R.string.cancel, (dialog, which) -> {})
.show());
new AlertDialog.Builder(activity)
.setMessage(context.getString(R.string.RecipientBottomSheet_remove_s_from_the_group, Objects.requireNonNull(recipient.getValue()).getDisplayName(context)))
.setPositiveButton(R.string.RecipientBottomSheet_remove,
(dialog, which) -> {
adminActionBusy.setValue(true);
recipientDialogRepository.removeMember(result -> {
adminActionBusy.setValue(false);
if (result) {
onSuccess.run();
}
},
this::showErrorToast);
})
.setNegativeButton(android.R.string.cancel, (dialog, which) -> {})
.show();
}
void onAddedToContacts() {