diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-03-06 04:15:40 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-03-06 04:15:40 +0100 |
| commit | a73cc24c3f00b1e5f2fd5dc8237d8d4c699dd676 (patch) | |
| tree | 3a7add992f728cd60c933c54d0de72e1d88aed6d /src/eu/siacs/conversations/entities/Account.java | |
| parent | 1124ded2005fa5b0b9504bac383743e31212bab7 (diff) | |
| parent | 0168f185ebb209dbfb69cb19bf221354c9a8561a (diff) | |
Merge branch 'watchdog'
Diffstat (limited to 'src/eu/siacs/conversations/entities/Account.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Account.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java index a596aba1..52125b03 100644 --- a/src/eu/siacs/conversations/entities/Account.java +++ b/src/eu/siacs/conversations/entities/Account.java @@ -32,11 +32,12 @@ public class Account extends AbstractEntity{ public static final int OPTION_USETLS = 0; public static final int OPTION_DISABLED = 1; - public static final int STATUS_DISABLED = -1; - public static final int STATUS_OFFLINE = 0; + public static final int STATUS_CONNECTING = 0; + public static final int STATUS_DISABLED = -2; + public static final int STATUS_OFFLINE = -1; public static final int STATUS_ONLINE = 1; public static final int STATUS_UNAUTHORIZED = 2; - public static final int STATUS_NOINTERNET = 3; + public static final int STATUS_NO_INTERNET = 3; public static final int STATUS_TLS_ERROR = 4; public static final int STATUS_SERVER_NOT_FOUND = 5; @@ -46,7 +47,7 @@ public class Account extends AbstractEntity{ protected int options = 0; protected String rosterVersion; protected String resource; - protected int status = 0; + protected int status = -1; protected JSONObject keys = new JSONObject(); protected boolean online = false; |