narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #809 from pulser/server-info-fix

Browse source 
Show server info option when blocking is unavailable
This commit is contained in:
Daniel Gultsch 2014-12-25 10:22:47 +01:00
parent 293e39c87a 3ada834839
commit 384e1b4149
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -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;
}