sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed npe when rotating screen in contact details activity

This commit is contained in:
Daniel Gultsch 2015-04-28 13:31:33 +02:00
parent b1843fb61a
commit 51bf8ec98e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View File

@ -256,16 +256,19 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
MenuItem unblock = menu.findItem(R.id.action_unblock); MenuItem unblock = menu.findItem(R.id.action_unblock);
MenuItem edit = menu.findItem(R.id.action_edit_contact); MenuItem edit = menu.findItem(R.id.action_edit_contact);
MenuItem delete = menu.findItem(R.id.action_delete_contact); MenuItem delete = menu.findItem(R.id.action_delete_contact);
if (contact == null) {
return true;
}
final XmppConnection connection = contact.getAccount().getXmppConnection(); final XmppConnection connection = contact.getAccount().getXmppConnection();
if (connection != null && connection.getFeatures().blocking()) { if (connection != null && connection.getFeatures().blocking()) {
if (this.contact.isBlocked()) { if (this.contact.isBlocked()) {
menu.findItem(R.id.action_block).setVisible(false); block.setVisible(false);
} else { } else {
menu.findItem(R.id.action_unblock).setVisible(false); unblock.setVisible(false);
} }
} else { } else {
menu.findItem(R.id.action_unblock).setVisible(false); unblock.setVisible(false);
menu.findItem(R.id.action_block).setVisible(false); block.setVisible(false);
} }
if (!contact.showInRoster()) { if (!contact.showInRoster()) {
edit.setVisible(false); edit.setVisible(false);
@ -275,6 +278,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
} }
private void populateView() { private void populateView() {
invalidateOptionsMenu();
setTitle(contact.getDisplayName()); setTitle(contact.getDisplayName());
if (contact.showInRoster()) { if (contact.showInRoster()) {
send.setVisibility(View.VISIBLE); send.setVisibility(View.VISIBLE);