From fb8737ed9f6b6c2947110a22b79430bd4affd706 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 30 Dec 2014 01:16:33 +0100 Subject: fixed npe in block menu item --- src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/eu/siacs') diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 5a9a208f..c4c3c354 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); } -- cgit v1.2.3