diff options
Diffstat (limited to 'src/eu/siacs/conversations/entities/Account.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Account.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java index ac62cf7b..b19889bf 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"; @@ -41,7 +40,6 @@ public class Account extends AbstractEntity{ public static final int STATUS_ONLINE = 1; public static final int STATUS_NO_INTERNET = 2; public static final int STATUS_UNAUTHORIZED = 3; - public static final int STATUS_TLS_ERROR = 4; public static final int STATUS_SERVER_NOT_FOUND = 5; public static final int STATUS_SERVER_REQUIRES_TLS = 6; @@ -72,6 +70,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"; } |