CB-919: Camera Plugin returned with empty error message

Guarding against null cursor.
apache · Jun 20, 2012 · c1c9075 · c1c9075
1 parent a691e9f
commit c1c9075
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java
@@ -524,18 +524,20 @@ private Cursor queryImgDB() {
     private void checkForDuplicateImage(int type) {
         int diff = 1;
         Cursor cursor = queryImgDB();
-        int currentNumOfImages = cursor.getCount();
+        if (cursor != null) {
+            int currentNumOfImages = cursor.getCount();
 
-        if (type == FILE_URI) {
-            diff = 2;
-        }
+            if (type == FILE_URI) {
+                diff = 2;
+            }
 
-        // delete the duplicate file if the difference is 2 for file URI or 1 for Data URL
-        if ((currentNumOfImages - numPics) == diff) {
-            cursor.moveToLast();
-            int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;
-            Uri uri = Uri.parse(MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "/" + id);
-            this.cordova.getActivity().getContentResolver().delete(uri, null, null);
+            // delete the duplicate file if the difference is 2 for file URI or 1 for Data URL
+            if ((currentNumOfImages - numPics) == diff) {
+                cursor.moveToLast();
+                int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;
+                Uri uri = Uri.parse(MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "/" + id);
+                this.cordova.getActivity().getContentResolver().delete(uri, null, null);
+            }
         }
     }
 

diff --git a/framework/src/org/apache/cordova/Capture.java b/framework/src/org/apache/cordova/Capture.java
@@ -424,14 +424,16 @@ private Cursor queryImgDB() {
      */
     private void checkForDuplicateImage() {
         Cursor cursor = queryImgDB();
-        int currentNumOfImages = cursor.getCount();
-
-        // delete the duplicate file if the difference is 2
-        if ((currentNumOfImages - numPics) == 2) {
-            cursor.moveToLast();
-            int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;
-            Uri uri = Uri.parse(MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "/" + id);
-            this.cordova.getActivity().getContentResolver().delete(uri, null, null);
+        if (cursor != null) {
+            int currentNumOfImages = cursor.getCount();
+
+            // delete the duplicate file if the difference is 2
+            if ((currentNumOfImages - numPics) == 2) {
+                cursor.moveToLast();
+                int id = Integer.valueOf(cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media._ID))) - 1;
+                Uri uri = Uri.parse(MediaStore.Images.Media.EXTERNAL_CONTENT_URI + "/" + id);
+                this.cordova.getActivity().getContentResolver().delete(uri, null, null);
+            }
         }
     }
 }