pending leaves and joins for muc

4 files changed, 5 insertions, 11 deletions

diff --git a/src/eu/siacs/conversations/entities/AbstractEntity.java b/src/eu/siacs/conversations/entities/AbstractEntity.java
index 0297fa662..4891723ee 100644
--- a/src/eu/siacs/conversations/entities/AbstractEntity.java
+++ b/src/eu/siacs/conversations/entities/AbstractEntity.java
@@ -1,12 +1,9 @@
 package eu.siacs.conversations.entities;
 
-import java.io.Serializable;
-
 import android.content.ContentValues;
 
-public abstract class AbstractEntity implements Serializable {
+public abstract class AbstractEntity {
 
-	private static final long serialVersionUID = -1895605706690653719L;
 	
 	public static final String UUID = "uuid";
 	
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";
 	}
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index 70752adc2..4e8c18342 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -16,9 +16,6 @@ import android.database.Cursor;
 import android.net.Uri;
 
 public class Conversation extends AbstractEntity {
-
-	private static final long serialVersionUID = -6727528868973996739L;
-
 	public static final String TABLENAME = "conversations";
 
 	public static final int STATUS_AVAILABLE = 0;
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index 8e669c658..49c5ce585 100644
--- a/src/eu/siacs/conversations/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -7,8 +7,6 @@ import android.content.Context;
 import android.database.Cursor;
 
 public class Message extends AbstractEntity {
-
-	private static final long serialVersionUID = 7222081895167103025L;
 	
 	public static final String TABLENAME = "messages";