diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-12-23 18:09:40 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-12-23 18:09:40 +0100 |
commit | 58437b6f0662025092395ead85411d8f26adc3ba (patch) | |
tree | 68e172f69f858e61265748d25a3306f3b5f13072 /src/main/java/eu/siacs/conversations/ui | |
parent | a94663aaa4d52ba27ada76abe55d2d113304b4e0 (diff) | |
parent | d5f99560ff13a3da42b0173fd73add653e08824b (diff) |
Merge branch 'SamWhited-verifyServerIqs' into development
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 3a3f0778..c41a18c6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Blockable; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; @@ -316,7 +317,8 @@ public class ConversationActivity extends XmppActivity } else { menuUnblock.setVisible(false); } - if (!this.getSelectedConversation().getAccount().getXmppConnection().getFeatures().blocking()) { + final Account account = this.getSelectedConversation().getAccount(); + if (account.getStatus() != Account.State.ONLINE || !account.getXmppConnection().getFeatures().blocking()) { menuBlock.setVisible(false); menuUnblock.setVisible(false); } diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 47fe5964..0dd7a2eb 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -327,7 +327,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate if (mAccount == null) { showQrCode.setVisible(false); showBlocklist.setVisible(false); - } else if (!mAccount.getXmppConnection().getFeatures().blocking()) { + } else if (mAccount.getStatus() != Account.State.ONLINE || !mAccount.getXmppConnection().getFeatures().blocking()) { showBlocklist.setVisible(false); } return true; |