diff options
author | Christian S <christian@pix-art.de> | 2016-05-06 11:58:19 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-05-06 11:58:19 +0200 |
commit | a1e951efe2e24137164d7857270a982a4ee0ae45 (patch) | |
tree | 986a2d963876033f14d8e9ed4abf01fe82a2414c /src/main/java/eu/siacs/conversations/entities | |
parent | 8f0f7e94a9626ef51f149f83f04dcb030f1b3234 (diff) | |
parent | e2d3bef7397984b1b717ec4a5bf60f572da73779 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Account.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index 1bcb15c07..1a7798b2d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -93,7 +93,8 @@ public class Account extends AbstractEntity { REGISTRATION_NOT_SUPPORTED(true), SECURITY_ERROR(true), INCOMPATIBLE_SERVER(true), - TOR_NOT_AVAILABLE(true); + TOR_NOT_AVAILABLE(true), + BIND_FAILURE(true); private final boolean isError; @@ -139,6 +140,8 @@ public class Account extends AbstractEntity { return R.string.account_status_incompatible_server; case TOR_NOT_AVAILABLE: return R.string.account_status_tor_unavailable; + case BIND_FAILURE: + return R.string.account_status_bind_failure; default: return R.string.account_status_unknown; } |