From 3ada834839d414e67903a5c1644ab6bdfede0c64 Mon Sep 17 00:00:00 2001 From: pulser Date: Wed, 24 Dec 2014 20:35:08 +0000 Subject: 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. --- src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java') 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; } -- cgit v1.2.3