diff options
| author | pulser <pulser@xda-developers.com> | 2014-12-24 20:35:08 +0000 |
|---|---|---|
| committer | pulser <pulser@xda-developers.com> | 2014-12-24 20:54:56 +0000 |
| commit | 3ada834839d414e67903a5c1644ab6bdfede0c64 (patch) | |
| tree | 66ddb4fd1ced5536806ee4a29cbe704993faff34 /src/main/java/eu | |
| parent | 293e39c87a75f58f7ac5310d4b803f55a383e0d1 (diff) | |
Show server info option when blocking is unavailable
Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available.
Diffstat (limited to 'src/main/java/eu')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 9597b15e..9fce5ae5 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -339,9 +339,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate showQrCode.setVisible(false); showBlocklist.setVisible(false); showMoreInfo.setVisible(false); - } else if (mAccount.getStatus() != Account.State.ONLINE || !mAccount.getXmppConnection().getFeatures().blocking()) { + } else if (mAccount.getStatus() != Account.State.ONLINE) { + showBlocklist.setVisible(false); + showMoreInfo.setVisible(false); + } else if (!mAccount.getXmppConnection().getFeatures().blocking()) { showBlocklist.setVisible(false); - showMoreInfo.setVisible(false); } return true; } |