From c65600edc9861c5f1788676e03a8164904a79193 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 18 Jul 2014 21:57:10 +0200
Subject: pending leaves and joins for muc

---
 src/eu/siacs/conversations/entities/Account.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/eu/siacs/conversations/entities/Account.java')

diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java
index ac62cf7b6..0910516c8 100644
--- a/src/eu/siacs/conversations/entities/Account.java
+++ b/src/eu/siacs/conversations/entities/Account.java
@@ -4,6 +4,7 @@ import java.security.interfaces.DSAPublicKey;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
 import net.java.otr4j.crypto.OtrCryptoException;
@@ -18,8 +19,6 @@ import android.content.Context;
 import android.database.Cursor;
 
 public class Account  extends AbstractEntity{
-
-	private static final long serialVersionUID = 6174825093869578035L;
 	
 	public static final String TABLENAME = "accounts";
 	
@@ -72,6 +71,9 @@ public class Account  extends AbstractEntity{
 
 	private List<Bookmark> bookmarks = new ArrayList<Bookmark>();
 	
+	public List<Conversation> pendingConferenceJoins = new CopyOnWriteArrayList<Conversation>();
+	public List<Conversation> pendingConferenceLeaves = new CopyOnWriteArrayList<Conversation>();
+	
 	public Account() {
 		this.uuid = "0";
 	}
-- 
cgit v1.2.3