OI Safe: Remove null-pointer exceptions that have been found using Monkey.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1899 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index fc4a197cad2b71b51e3c0f3ebb0c40ba3285a0b5..379003a7309e1c049dc09db2e59d9db5b031af0f 100644 (file)
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -426,6 +426,9 @@ public class CategoryList extends ListActivity {
 
        @Override
        public boolean onMenuOpened(int featureId, Menu menu) {
+               if (menu == null) {
+                       return super.onMenuOpened(featureId, menu);
+               }
                MenuItem miDelete = menu.findItem(DEL_CATEGORY_INDEX);
                MenuItem miEdit = menu.findItem(EDIT_CATEGORY_INDEX);
                if (getSelectedItemPosition() > -1) {
@@ -1064,6 +1067,10 @@ public class CategoryList extends ListActivity {
        
                HashMap<String,Long> categories = new HashMap<String,Long>();
                List<CategoryEntry> rows;
+               if (dbHelper==null) {
+                       if (debug) Log.d(TAG, "getCategoryToId: dbHelper is null");
+                       return categories;
+               }
                rows = dbHelper.fetchAllCategoryRows();
 
                for (CategoryEntry row : rows) {

diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java
index 4ac36468ba7f3ed74d3015d6597152c0487e3482..49d60f24b850fe1cf68ab2d594feab3ab2a9405b 100644 (file)
--- a/src/org/openintents/safe/PassList.java
+++ b/src/org/openintents/safe/PassList.java
@@ -242,6 +242,9 @@ public class PassList extends ListActivity {
 
     @Override
     public boolean onMenuOpened(int featureId, Menu menu) {
+       if (menu == null) {
+               return super.onMenuOpened(featureId, menu);
+       }
                MenuItem miDel  = menu.findItem(DEL_PASSWORD_INDEX);
                MenuItem miMove = menu.findItem(MOVE_PASSWORD_INDEX);
        if (getSelectedItemPosition() > -1) {