Implements FS#245: Implement FiletransferHttp (upload and delete), some minor bug fixes including to fail a JingleTransfer in case criterias are not met

1 files changed, 2 insertions, 4 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index df7fc922..9e550988 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -24,6 +24,7 @@ import de.thedevstack.conversationsplus.ConversationsPlusColors;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
@@ -108,10 +109,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			imagePreview.setVisibility(View.GONE);
             CharSequence msgText = preview.first;
             String msgPrefix = null;
-            if (message.getStatus() == Message.STATUS_SEND
-                    || message.getStatus() == Message.STATUS_SEND_DISPLAYED
-                    || message.getStatus() == Message.STATUS_SEND_FAILED
-                    || message.getStatus() == Message.STATUS_SEND_RECEIVED) {
+            if (MessageUtil.isMessageSent(message)) {
                 msgPrefix = activity.getString(R.string.cplus_me);
             } else if (conversation.getMode() == Conversation.MODE_MULTI) {
                 msgPrefix = UIHelper.getMessageDisplayName(message);