diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 01:16:33 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 01:16:33 +0100 |
| commit | fb8737ed9f6b6c2947110a22b79430bd4affd706 (patch) | |
| tree | fc76f547d3c93a1da0971066c97b89afead8a1cb /src/main/java | |
| parent | c78dc5b494abb10c085715201e86094470a2b6e3 (diff) | |
fixed npe in block menu item
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 5a9a208fe..c4c3c3540 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -318,7 +318,7 @@ public class ConversationActivity extends XmppActivity menuUnblock.setVisible(false); } final Account account = this.getSelectedConversation().getAccount(); - if (account.isOnlineAndConnected() || !account.getXmppConnection().getFeatures().blocking()) { + if (!(account.isOnlineAndConnected() && account.getXmppConnection().getFeatures().blocking())) { menuBlock.setVisible(false); menuUnblock.setVisible(false); } |