diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-12-25 10:22:47 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-12-25 10:22:47 +0100 |
| commit | 384e1b4149460b81ea956b85e9ce597b2b1115cc (patch) | |
| tree | 66ddb4fd1ced5536806ee4a29cbe704993faff34 /src/main | |
| parent | 293e39c87a75f58f7ac5310d4b803f55a383e0d1 (diff) | |
| parent | 3ada834839d414e67903a5c1644ab6bdfede0c64 (diff) | |
Merge pull request #809 from pulser/server-info-fix
Show server info option when blocking is unavailable
Diffstat (limited to 'src/main')
| -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; } |