diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:10 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:10 +0200 |
commit | c65600edc9861c5f1788676e03a8164904a79193 (patch) | |
tree | faf64e8d88d8a2974609fd896845939e42b348bd /src/eu/siacs/conversations/entities/Account.java | |
parent | 9cfb4ee6c3f80e499cd1b4e5d8c6aa9a675cea84 (diff) |
pending leaves and joins for muc
Diffstat (limited to 'src/eu/siacs/conversations/entities/Account.java')
-rw-r--r-- | src/eu/siacs/conversations/entities/Account.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java index ac62cf7b..0910516c 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"; } |