commit 7152124ac79a2faf6fd8e4135069feb92edeb1fe
author Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 17 18:47:14 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 17 18:47:14 2010 -0800
tree 4f63cae61808a7a66b6f9bbea027d6efb5342bd7
parent c3f2a52067b799e223f0964207a2d1957165e960

Fixing monkey-induced NPE

Bug: 3206773

Change-Id: I39ba4fb85186ae686e913d69c0647fc98b1879b9

src/com/android/contacts/list/ContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index 4914906..197dc51 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -254,47 +254,45 @@
     }
 
     public void createNewContact() {
-        mListener.onCreateNewContactAction();
+        if (mListener != null) mListener.onCreateNewContactAction();
     }
 
     public void viewContact(Uri contactUri) {
-        mListener.onViewContactAction(contactUri);
+        if (mListener != null) mListener.onViewContactAction(contactUri);
     }
 
     public void editContact(Uri contactUri) {
-        mListener.onEditContactAction(contactUri);
+        if (mListener != null) mListener.onEditContactAction(contactUri);
     }
 
     public void deleteContact(Uri contactUri) {
-        mListener.onDeleteContactAction(contactUri);
+        if (mListener != null) mListener.onDeleteContactAction(contactUri);
     }
 
     public void addToFavorites(Uri contactUri) {
-        mListener.onAddToFavoritesAction(contactUri);
+        if (mListener != null) mListener.onAddToFavoritesAction(contactUri);
     }
 
     public void removeFromFavorites(Uri contactUri) {
-        mListener.onRemoveFromFavoritesAction(contactUri);
+        if (mListener != null) mListener.onRemoveFromFavoritesAction(contactUri);
     }
 
     public void callContact(Uri contactUri) {
-        mListener.onCallContactAction(contactUri);
+        if (mListener != null) mListener.onCallContactAction(contactUri);
     }
 
     public void smsContact(Uri contactUri) {
-        mListener.onSmsContactAction(contactUri);
+        if (mListener != null) mListener.onSmsContactAction(contactUri);
     }
 
     private void notifyInvalidSelection() {
-        if (mListener != null) {
-            mListener.onInvalidSelection();
-        }
+        if (mListener != null) mListener.onInvalidSelection();
     }
 
     @Override
     protected void finish() {
         super.finish();
-        mListener.onFinishAction();
+        if (mListener != null) mListener.onFinishAction();
     }
 
     public void requestSelectionOnScreen(boolean smooth) {