Fix for #461 ContactEditor.editAlias NullPointerException.

If contact is null no options menu created.

Fix for #461 ContactEditor.editAlias NullPointerException.
If contact is null no options menu created.
c79dd668 · Grigory Fedorov · e9f664f0 · c79dd668
Commit c79dd668 authored May 25, 2015 by Grigory Fedorov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ContactEditor.java app/src/main/java/com/xabber/android/ui/ContactEditor.java +5 -1

No files found.
--- a/app/src/main/java/com/xabber/android/ui/ContactEditor.java
+++ b/app/src/main/java/com/xabber/android/ui/ContactEditor.java
@@ -26,7 +26,11 @@ public class ContactEditor extends ContactViewer {

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