diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index c6fe0bbb5..adf4e634e 100644 --- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -341,12 +341,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity return; } - DcMsg dcMsg = dcContext.getMsg(mediaItem.msgId); - DcChat dcChat = dcContext.getChat(dcMsg.getChatId()); - - String text = getResources().getQuantityString( - dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages, - 1, 1); + String text = getResources().getQuantityString(R.plurals.ask_delete_messages_simple, 1, 1); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(text); diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java index adfc1c326..a5dc2cc43 100644 --- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -63,9 +63,7 @@ public abstract class MessageSelectorFragment protected void handleDeleteMessages(int chatId, final int[] messageIds) { DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId); - String text = getActivity().getResources().getQuantityString( - dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages, - messageIds.length, messageIds.length); + String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages_simple, messageIds.length, messageIds.length); AlertDialog dialog = new AlertDialog.Builder(getActivity()) .setMessage(text) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a363d175d..015196750 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -364,11 +364,12 @@ Are you sure you want to leave this group? - Delete %d chat? It will no longer be shown in the chat list; its messages will remain on the server. - Delete %d chats? They will no longer be shown in the chat list; their messages will remain on the server. + Delete %d chat? + Delete %d chats? - Delete chat \"%1$s\"? It will no longer be shown in the chat list; its messages will remain on the server. + Delete chat \"%1$s\"? Are you sure you want to delete this message? + Delete %d message here and on the server? Delete %d messages here and on the server?