From 14e28d1e9afc058526eba4a6096d582f4810ea84 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 23 Aug 2016 11:34:14 +0200
Subject: Fixes FS#229: prompt for confirmation before deleting a file

---
 .../ui/listeners/DeleteFileCallback.java           | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java
new file mode 100644
index 00000000..3ff7f367
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java
@@ -0,0 +1,36 @@
+package de.thedevstack.conversationsplus.ui.listeners;
+
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.entities.Transferable;
+import de.thedevstack.conversationsplus.entities.TransferablePlaceholder;
+import de.thedevstack.conversationsplus.persistance.FileBackend;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
+
+/**
+ * Created by steckbrief on 23.08.2016.
+ */
+public class DeleteFileCallback implements SimpleUserDecisionCallback {
+    private final Message message;
+
+    public DeleteFileCallback(Message message) {
+        this.message = message;
+    }
+
+    private void deleteFile() {
+        if (FileBackend.deleteFile(this.message, XmppConnectionServiceAccessor.xmppConnectionService)) {
+            this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+            UiUpdateHelper.updateConversationUi();
+        }
+    }
+
+    @Override
+    public void onYes() {
+        this.deleteFile();
+    }
+
+    @Override
+    public void onNo() {
+        // Nothing to do
+    }
+}
-- 
cgit v1.2.3


From c6ed89e4109a3db25d9cae8ad1426a3294e721c3 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 23 Aug 2016 12:00:50 +0200
Subject: Javadoc added and access to xmppConnectionService moved

---
 .../conversationsplus/ui/listeners/DeleteFileCallback.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java
index 3ff7f367..f855a90d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java
@@ -5,10 +5,9 @@ import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.TransferablePlaceholder;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
-import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
 
 /**
- * Created by steckbrief on 23.08.2016.
+ * Callback for the user decision if a file should be deleted or not.
  */
 public class DeleteFileCallback implements SimpleUserDecisionCallback {
     private final Message message;
@@ -17,18 +16,27 @@ public class DeleteFileCallback implements SimpleUserDecisionCallback {
         this.message = message;
     }
 
+    /**
+     * Deletes the file and updates the UI.
+     */
     private void deleteFile() {
-        if (FileBackend.deleteFile(this.message, XmppConnectionServiceAccessor.xmppConnectionService)) {
+        if (FileBackend.deleteFile(this.message)) {
             this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
             UiUpdateHelper.updateConversationUi();
         }
     }
 
+    /**
+     * Deletes the file.
+     */
     @Override
     public void onYes() {
         this.deleteFile();
     }
 
+    /**
+     * Nothing to do in this case.
+     */
     @Override
     public void onNo() {
         // Nothing to do
-- 
cgit v1.2.3