Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

1 files changed, 46 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/observers/FileDeletionObserver.java b/src/main/java/de/thedevstack/conversationsplus/persistance/observers/FileDeletionObserver.java
new file mode 100644
index 00000000..a313c8b1
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/observers/FileDeletionObserver.java
@@ -0,0 +1,46 @@
+package de.thedevstack.conversationsplus.persistance.observers;
+
+import android.os.FileObserver;
+
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
+
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.entities.Transferable;
+import eu.siacs.conversations.entities.TransferablePlaceholder;
+
+/**
+ * Observer to mark messages containing files which are deleted.
+ */
+public class FileDeletionObserver extends FileObserver {
+    public FileDeletionObserver(String path) {
+        super(path, FileObserver.DELETE);
+    }
+
+    @Override
+    public void onEvent(int event, String path) {
+        if (null != path) {
+            markFileDeleted(path.split("\\.")[0]);
+        }
+    }
+
+    private void markFileDeleted(String uuid) {
+        if (null != XmppConnectionServiceAccessor.xmppConnectionService) {
+            for (Conversation conversation : XmppConnectionServiceAccessor.xmppConnectionService.getConversations()) {
+                Message message = conversation.findMessageWithFileAndUuid(uuid);
+                if (message != null) {
+                    message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+                    final int s = message.getStatus();
+                    if (s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
+                        MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED);
+                    } else {
+                        UiUpdateHelper.updateConversationUi();
+                    }
+                    return;
+                }
+            }
+        }
+    }
+}