Commit c79dd668 authored by Grigory Fedorov's avatar Grigory Fedorov

Fix for #461 ContactEditor.editAlias NullPointerException.

 If contact is null no options menu created.
parent e9f664f0
...@@ -26,7 +26,11 @@ public class ContactEditor extends ContactViewer { ...@@ -26,7 +26,11 @@ public class ContactEditor extends ContactViewer {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.contact_viewer, menu); RosterContact rosterContact = RosterManager.getInstance().getRosterContact(getAccount(), getBareAddress());
if (rosterContact != null) {
getMenuInflater().inflate(R.menu.contact_viewer, menu);
}
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment