3 files changed, 6 insertions, 10 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnClickListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnClickListener.java
index e3c85fdf..9eaec00c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnClickListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnClickListener.java
@@ -1,6 +1,5 @@
 package de.thedevstack.conversationsplus.ui.listeners;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.view.View;
 import android.widget.Toast;
@@ -11,6 +10,7 @@ import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
 import de.thedevstack.conversationsplus.ui.EditAccountActivity;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 /**
  */
@@ -25,7 +25,7 @@ public class ContactPictureOnClickListener implements View.OnClickListener {
 
     @Override
     public void onClick(View view) {
-        if (message.getStatus() <= Message.STATUS_RECEIVED) { // What does this mean?
+        if (MessageUtil.isIncomingMessage(message)) {
             if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
                 if (message.getCounterpart() != null) {
                     String user = message.getCounterpart().isBareJid() ? message.getCounterpart().toString() : message.getCounterpart().getResourcepart();
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnLongClickListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnLongClickListener.java
index 49ff764b..fef10f90 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnLongClickListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ContactPictureOnLongClickListener.java
@@ -7,6 +7,7 @@ import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.ui.QrCodeUtil;
 
 /**
@@ -22,7 +23,7 @@ public class ContactPictureOnLongClickListener implements View.OnLongClickListen
 
     @Override
     public boolean onLongClick(View view) {
-        if (message.getStatus() <= Message.STATUS_RECEIVED) {
+        if (MessageUtil.isIncomingMessage(message)) {
             if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
                 if (message.getCounterpart() != null) {
                     String user = message.getCounterpart().getResourcepart();
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 e6ec7496..a65e9c7a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -113,19 +113,14 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
     }
 
     protected Message createMessage() {
-        final Message message;
-        if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-            message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
-        } else {
-            message = new Message(conversation, "", conversation.getNextEncryption());
-        }
+        final Message message = MessageUtil.createOutgoingMessage(conversation, "");
         if (null != conversation.getNextCounterpart() && null == message.getCounterpart()) {
             message.setCounterpart(conversation.getNextCounterpart());
         }
 
         //message.setType(Message.TYPE_IMAGE);
         message.setFileParams(new FileParams());
-        message.getFileParams().setFileStatus(FileStatus.NEEDS_UPLOAD);
+        MessageUtil.setFileStatus(message, FileStatus.NEEDS_UPLOAD);
 
         return message;
     }