From 34fcdda53fa8ae1174909b62860534d2d874eb72 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Thu, 29 Sep 2016 11:57:16 +0200
Subject: Implements FS#235: Deletion of remote files uploaded via httpupload

---
 .../ResizePictureUserDecisionListener.java         | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
index b7340ce0..1574bb85 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -14,6 +14,8 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.crypto.PgpEngine;
+import de.thedevstack.conversationsplus.entities.FileParams;
+import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.enums.UserDecision;
 import de.thedevstack.conversationsplus.exceptions.UiException;
 import de.thedevstack.conversationsplus.utils.FileUtils;
@@ -27,6 +29,7 @@ import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.ui.XmppActivity;
+import de.thedevstack.conversationsplus.utils.MimeUtils;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 /**
@@ -96,20 +99,18 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
     @Override
     public void onYes() {
         this.showPrepareFileToast();
-        final Message message;
-        if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-            message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
-        } else {
-            message = new Message(conversation, "", conversation.getNextEncryption());
-        }
-        message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_IMAGE);
+        final Message message = createMessage();
         ConversationsPlusApplication.executeFileAdding(new OnYesRunnable(message, uri));
     }
 
     @Override
     public void onNo() {
         this.showPrepareFileToast();
+        final Message message = createMessage();
+        ConversationsPlusApplication.executeFileAdding(new OnNoRunnable(message, uri));
+    }
+
+    protected Message createMessage() {
         final Message message;
         if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
             message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
@@ -117,8 +118,11 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
             message = new Message(conversation, "", conversation.getNextEncryption());
         }
         message.setCounterpart(conversation.getNextCounterpart());
-        message.setType(Message.TYPE_IMAGE);
-        ConversationsPlusApplication.executeFileAdding(new OnNoRunnable(message, uri));
+        //message.setType(Message.TYPE_IMAGE);
+        message.setFileParams(new FileParams());
+        message.getFileParams().setFileStatus(FileStatus.NEEDS_UPLOAD);
+
+        return message;
     }
 
     @Override
-- 
cgit v1.2.3