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/EditAccountActivity.java | |
| parent | a94663aaa4d52ba27ada76abe55d2d113304b4e0 (diff) | |
| parent | d5f99560ff13a3da42b0173fd73add653e08824b (diff) | |
Merge branch 'SamWhited-verifyServerIqs' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |