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

3 files changed, 97 insertions, 3 deletions

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 e3dab516..0cfee1d8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -20,6 +20,7 @@ import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 import eu.siacs.conversations.R;
+import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
@@ -30,7 +31,7 @@ import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.utils.FileUtils;
 
 /**
- * Created by tzur on 31.10.2015.
+ * Listener to let the user decide whether to resize a picture before sending or not.
  */
 public class ResizePictureUserDecisionListener implements UserDecisionListener {
     protected Uri uri;
@@ -157,7 +158,7 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
                 String filePath = FileUtils.getPath(uri);
                 MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
                 if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-                    xmppConnectionService.getPgpEngine().encrypt(message, callback);
+                    PgpEngine.getInstance().encrypt(message, callback);
                 } else {
                     callback.success(message);
                 }
@@ -196,7 +197,7 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
                 int imageHeight = resizedAndRotatedImage.getHeight();
                 MessageUtil.updateMessageWithImageDetails(message, filePath, imageSize, imageWidth, imageHeight);
                 if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-                    xmppConnectionService.getPgpEngine().encrypt(message, callback);
+                    PgpEngine.getInstance().encrypt(message, callback);
                 } else {
                     callback.success(message);
                 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
new file mode 100644
index 00000000..958e9de8
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java
@@ -0,0 +1,77 @@
+package de.thedevstack.conversationsplus.utils;
+
+import android.net.Uri;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.exceptions.FileCopyException;
+
+import eu.siacs.conversations.crypto.PgpEngine;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.persistance.FileBackend;
+import eu.siacs.conversations.ui.UiCallback;
+import eu.siacs.conversations.utils.FileUtils;
+
+/**
+ * Utility class to work with conversations.
+ */
+public class ConversationUtil {
+
+    public static void attachLocationToConversation(final Conversation conversation,
+                                             final Uri uri,
+                                             final UiCallback<Message> callback) {
+        int encryption = conversation.getNextEncryption();
+        if (encryption == Message.ENCRYPTION_PGP) {
+            encryption = Message.ENCRYPTION_DECRYPTED;
+        }
+        Message message = new Message(conversation, uri.toString(), encryption);
+        if (conversation.getNextCounterpart() != null) {
+            message.setCounterpart(conversation.getNextCounterpart());
+        }
+        if (encryption == Message.ENCRYPTION_DECRYPTED) {
+            PgpEngine.getInstance().encrypt(message, callback);
+        } else {
+            callback.success(message);
+        }
+    }
+
+    public static void attachFileToConversation(final Conversation conversation,
+                                         final Uri uri,
+                                         final UiCallback<Message> callback) {
+        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_FILE);
+        String path = FileUtils.getPath(uri);
+        if (path != null) {
+            message.setRelativeFilePath(path);
+            MessageUtil.updateFileParams(message);
+            if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+                PgpEngine.getInstance().encrypt(message, callback);
+            } else {
+                callback.success(message);
+            }
+        } else {
+            ConversationsPlusApplication.executeFileAdding(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        FileBackend.copyFileToPrivateStorage(message, uri);
+                        MessageUtil.updateFileParams(message);
+                        if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
+                            PgpEngine.getInstance().encrypt(message, callback);
+                        } else {
+                            callback.success(message);
+                        }
+                    } catch (FileCopyException e) {
+                        callback.error(e.getResId(), message);
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
index afb8387d..ca24bd1d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 
+import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.persistance.DatabaseBackend;
@@ -18,6 +19,21 @@ import eu.siacs.conversations.persistance.FileBackend;
  */
 public final class MessageUtil {
 
+
+    public static boolean markMessage(Conversation conversation, String uuid, int status) {
+        if (uuid == null) {
+            return false;
+        } else {
+            Message message = conversation.findSentMessageWithUuid(uuid);
+            if (message != null) {
+                markMessage(message, status);
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
     public static void markMessage(Message message, int status) {
         if (status == Message.STATUS_SEND_FAILED
                 && (message.getStatus() == Message.STATUS_SEND_RECEIVED || message