From fd5760d27aa45d3e8063a46bb1f0874e7ab4e10c Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 12 Jul 2014 12:41:37 +0200
Subject: made conversation list thread safe

---
 src/eu/siacs/conversations/persistance/DatabaseBackend.java |  4 ++--
 .../siacs/conversations/services/XmppConnectionService.java | 13 ++++++++++---
 src/eu/siacs/conversations/ui/ConversationActivity.java     |  3 +--
 src/eu/siacs/conversations/ui/ShareWithActivity.java        |  3 ++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/eu/siacs/conversations/persistance/DatabaseBackend.java
index fbf45d250..7643076a8 100644
--- a/src/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -116,8 +116,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 		return cursor.getInt(0);
 	}
 
-	public List<Conversation> getConversations(int status) {
-		List<Conversation> list = new ArrayList<Conversation>();
+	public CopyOnWriteArrayList<Conversation> getConversations(int status) {
+		CopyOnWriteArrayList<Conversation> list = new CopyOnWriteArrayList<Conversation>();
 		SQLiteDatabase db = this.getReadableDatabase();
 		String[] selectionArgs = { "" + status };
 		Cursor cursor = db.rawQuery("select * from " + Conversation.TABLENAME
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index fc19b3c1d..f8a5d9740 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -10,6 +10,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpServiceConnection;
@@ -98,7 +99,7 @@ public class XmppConnectionService extends Service {
 	private PresenceGenerator mPresenceGenerator = new PresenceGenerator();
 	
 	private List<Account> accounts;
-	private List<Conversation> conversations = null;
+	private CopyOnWriteArrayList<Conversation> conversations = null;
 	private JingleConnectionManager mJingleConnectionManager = new JingleConnectionManager(
 			this);
 
@@ -708,7 +709,14 @@ public class XmppConnectionService extends Service {
 				conv.setMessages(databaseBackend.getMessages(conv, 50));
 			}
 		}
-		Collections.sort(this.conversations, new Comparator<Conversation>() {
+		
+		return this.conversations;
+	}
+	
+	public void populateWithOrderedConversations(List<Conversation> list) {
+		list.clear();
+		list.addAll(getConversations());
+		Collections.sort(list, new Comparator<Conversation>() {
 			@Override
 			public int compare(Conversation lhs, Conversation rhs) {
 				Message left = lhs.getLatestMessage();
@@ -722,7 +730,6 @@ public class XmppConnectionService extends Service {
 				}
 			}
 		});
-		return this.conversations;
 	}
 
 	public List<Message> getMoreMessages(Conversation conversation,
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index aea35d3c4..209ff3b82 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -805,8 +805,7 @@ public class ConversationActivity extends XmppActivity {
 	}
 
 	public void updateConversationList() {
-		conversationList.clear();
-		conversationList.addAll(xmppConnectionService.getConversations());
+		xmppConnectionService.populateWithOrderedConversations(conversationList);
 		listView.invalidateViews();
 	}
 
diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java
index 601caa292..461aaec49 100644
--- a/src/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -89,7 +89,8 @@ public class ShareWithActivity extends XmppActivity {
 
 		Set<Contact> displayedContacts = new HashSet<Contact>();
 		conversations.removeAllViews();
-		List<Conversation> convList = xmppConnectionService.getConversations();
+		List<Conversation> convList = new ArrayList<Conversation>();
+		xmppConnectionService.populateWithOrderedConversations(convList);
 		Collections.sort(convList, new Comparator<Conversation>() {
 			@Override
 			public int compare(Conversation lhs, Conversation rhs) {
-- 
cgit v1.2.3