1 files changed, 36 insertions, 13 deletions

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 76fe84cf..439f9f22 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -1,8 +1,10 @@
 package eu.siacs.conversations.entities;
 
 import java.security.interfaces.DSAPublicKey;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import eu.siacs.conversations.utils.UIHelper;
 
 import net.java.otr4j.OtrException;
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
@@ -13,7 +15,7 @@ import net.java.otr4j.session.SessionStatus;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.net.Uri;
+import android.graphics.Bitmap;
 
 public class Conversation extends AbstractEntity {
 	public static final String TABLENAME = "conversations";
@@ -43,7 +45,7 @@ public class Conversation extends AbstractEntity {
 
 	private String nextPresence;
 
-	private transient List<Message> messages = null;
+	private transient CopyOnWriteArrayList<Message> messages = null;
 	private transient Account account = null;
 
 	private transient SessionImpl otrSession;
@@ -85,8 +87,9 @@ public class Conversation extends AbstractEntity {
 	}
 
 	public List<Message> getMessages() {
-		if (messages == null)
-			this.messages = new ArrayList<Message>(); // prevent null pointer
+		if (messages == null) {
+			this.messages = new CopyOnWriteArrayList<Message>(); // prevent null pointer
+		}
 
 		// populate with Conversation (this)
 
@@ -133,7 +136,7 @@ public class Conversation extends AbstractEntity {
 		}
 	}
 
-	public void setMessages(List<Message> msgs) {
+	public void setMessages(CopyOnWriteArrayList<Message> msgs) {
 		this.messages = msgs;
 	}
 
@@ -173,13 +176,6 @@ public class Conversation extends AbstractEntity {
 		return this.contactJid;
 	}
 
-	public Uri getProfilePhotoUri() {
-		if (this.getProfilePhotoString() != null) {
-			return Uri.parse(this.getProfilePhotoString());
-		}
-		return null;
-	}
-
 	public int getStatus() {
 		return this.status;
 	}
@@ -339,6 +335,16 @@ public class Conversation extends AbstractEntity {
 		if ((latestEncryption == Message.ENCRYPTION_DECRYPTED)
 				|| (latestEncryption == Message.ENCRYPTION_DECRYPTION_FAILED)) {
 			return Message.ENCRYPTION_PGP;
+		} else if (latestEncryption == Message.ENCRYPTION_NONE) {
+			if (getContact().getPresences().size() == 1) {
+				if (getContact().getOtrFingerprints().size() >= 1) {
+					return Message.ENCRYPTION_OTR;
+				} else {
+					return latestEncryption;
+				}
+			} else {
+				return latestEncryption;
+			}
 		} else {
 			return latestEncryption;
 		}
@@ -395,4 +401,21 @@ public class Conversation extends AbstractEntity {
 	public Bookmark getBookmark() {
 		return this.bookmark;
 	}
+
+	public Bitmap getImage(Context context, int size) {
+		if (mode==MODE_SINGLE) {
+			return getContact().getImage(size, context);
+		} else {
+			return UIHelper.getContactPicture(this, size, context, false);
+		}
+	}
+	
+	public boolean hasDuplicateMessage(Message message) {
+		for(int i = this.getMessages().size() -1; i >= 0; --i) {
+			if (this.messages.get(i).equals(message)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }