aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-11-11 13:51:15 +0100
committerChristian Schneppe <christian@pix-art.de>2018-11-11 13:51:15 +0100
commitb38fe1e8f0a9a1aa479b4a61f65f61ae78db6665 (patch)
tree3cd92b820a39ee463fca74a92841b3a31e3f6062 /src/main/java/de/pixart/messenger/ui
parent13586d7b797cd6ce9ec967e2657a0180340dcfb5 (diff)
implement message deletion
fixed #208
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 45929344c..69aa51918 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1334,12 +1334,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
MenuItem downloadFile = menu.findItem(R.id.download_file);
MenuItem deleteFile = menu.findItem(R.id.delete_file);
MenuItem showErrorMessage = menu.findItem(R.id.show_error_message);
+ deleteMessage.setVisible(true);
if (!m.isFileOrImage() && !encrypted && !m.isGeoUri() && !m.treatAsDownloadable()) {
copyMessage.setVisible(true);
quoteMessage.setVisible(MessageUtils.prepareQuote(m).length() > 0);
- //temporarily hide single message deletion in chat view
- deleteMessage.setVisible(false);
- // deleteMessage.setVisible(true);
String body = m.getMergedBody().toString();
if (ShareUtil.containsXmppUri(body)) {
copyLink.setTitle(R.string.copy_jabber_id);
@@ -1891,9 +1889,16 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
private void deleteMessage(Message message) {
final Conversation conversation = (Conversation) message.getConversation();
- activity.xmppConnectionService.deleteMessage(conversation, message);
- activity.onConversationsListItemUpdated();
- refresh();
+ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+ builder.setNegativeButton(R.string.cancel, null);
+ builder.setTitle(R.string.delete_message_dialog);
+ builder.setMessage(R.string.delete_message_dialog_msg);
+ builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+ activity.xmppConnectionService.deleteMessage(conversation, message);
+ activity.onConversationsListItemUpdated();
+ refresh();
+ });
+ builder.create().show();
}
private void deleteFile(final Message message) {