From cba8c693d6677b03cd1eeaa8ebf13fed82c05f4e Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sat, 14 Nov 2009 19:38:02 +0000
Subject: [PATCH] OI Safe: fixed NPE with CategoryList in onActivityResult
 which was caused by Safe being completely killed and when brought back to
 life catAdapter was not set.   Also bumped to 1.2.3rc2

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2388 72b678ce-9140-0410-bee8-679b907dd61a
---
 AndroidManifest.xml                        | 2 +-
 src/org/openintents/safe/CategoryList.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0079956..a32be2d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.openintents.safe" 
-    android:versionCode="12" android:versionName="1.2.3rc1">
+    android:versionCode="12" android:versionName="1.2.3rc2">
     <!-- History:
     1.2.3 [12]: 2009-11-12
     1.2.2 [11]: 2009-10-29
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index dbc7848..c73e1eb 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -120,7 +120,7 @@ public class CategoryList extends ListActivity {
     private static String masterKey;			
 
     private List<CategoryEntry> rows=null;
-    private CategoryListItemAdapter catAdapter;
+    private CategoryListItemAdapter catAdapter=null;
     private Intent restartTimerIntent=null;
     private int lastPosition=0;
     
@@ -670,7 +670,9 @@ public class CategoryList extends ListActivity {
     	}
     	if (requestCode==REQUEST_OPEN_CATEGORY) {
     		// update in case passwords were added/deleted and caused the counts to update
-			catAdapter.notifyDataSetChanged();
+    		if (catAdapter!=null) {
+    			catAdapter.notifyDataSetChanged();
+    		}
     	}
     }
 
-- 
2.50.1