From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Mon, 2 Feb 2009 21:45:50 +0000 (+0000)
Subject: OI Safe: Remove null-pointer exceptions that have been found using Monkey.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=38f52c409445d5e9a4bba2d8e10d6bdc9f2c8408;p=android-vcpass-oisafe

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 fc4a197..379003a 100644
--- 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 4ac3646..49d60f2 100644
--- 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) {