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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 00799567f9dbdb4b4d68cc69ddafd3876231f9af..a32be2dff4867216bd4247abd8f8a84384145609 100644 (file)
--- 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" \r
-    android:versionCode="12" android:versionName="1.2.3rc1">\r
+    android:versionCode="12" android:versionName="1.2.3rc2">\r
     <!-- History:
     1.2.3 [12]: 2009-11-12\r
     1.2.2 [11]: 2009-10-29\r

diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index dbc7848c1a1773dbd22beb3ef387d848561d7a36..c73e1eb90a029170cf4f8eb809fced162ef1dd62 100644 (file)
--- 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();
+               }
        }
     }