From d08c926bb2b35990a260428a461e3d5edac97726 Mon Sep 17 00:00:00 2001 From: Tony Rankin Date: Wed, 22 Apr 2015 17:23:17 -0700 Subject: [PATCH] Making sure Cursor is closed if exception gets thrown. --- .../org/wordpress/android/util/ImageUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java index 2e8e96fc312f..23bd2cdb3fdc 100644 --- a/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java +++ b/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java @@ -406,17 +406,17 @@ public static byte[] createThumbnailFromUri(Context context, String filePath = null; if (imageUri.toString().contains("content:")) { String[] projection = new String[] { MediaStore.Images.Media.DATA }; + Cursor cur = null; try { - Cursor cur = context.getContentResolver().query(imageUri, projection, null, null, null); - if (cur != null) { - if (cur.moveToFirst()) { - int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA); - filePath = cur.getString(dataColumn); - } - cur.close(); + cur = context.getContentResolver().query(imageUri, projection, null, null, null); + if (cur != null && cur.moveToFirst()) { + int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA); + filePath = cur.getString(dataColumn); } } catch (IllegalStateException stateException) { Log.d(ImageUtils.class.getName(), "IllegalStateException querying content:" + imageUri); + } finally { + SqlUtils.closeCursor(cur); } }