diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index dc8761fcc95d..45ec27d86978 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -95,6 +95,7 @@ import org.wordpress.android.util.MediaUtils; import org.wordpress.android.util.NetworkUtils; import org.wordpress.android.util.PermissionUtils; +import org.wordpress.android.util.SqlUtils; import org.wordpress.android.util.StringUtils; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.util.ToastUtils.Duration; @@ -1527,8 +1528,8 @@ private String getPathFromContentUri(Uri imageUri) { if (cur != null && cur.moveToFirst()) { int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA); path = cur.getString(dataColumn); - cur.close(); } + SqlUtils.closeCursor(cur); return path; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/services/PostUploadService.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/services/PostUploadService.java index 9b62c84b2bc7..07c9cb996ba7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/services/PostUploadService.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/services/PostUploadService.java @@ -41,6 +41,7 @@ import org.wordpress.android.util.DisplayUtils; import org.wordpress.android.util.ImageUtils; import org.wordpress.android.util.MediaUtils; +import org.wordpress.android.util.SqlUtils; import org.wordpress.android.util.StringUtils; import org.wordpress.android.util.SystemServiceFactory; import org.wordpress.android.util.WPMeShortlinks; @@ -538,6 +539,7 @@ private String uploadImage(MediaFile mediaFile) { path = thumbData; mediaFile.setFilePath(imageFile.getPath()); } + SqlUtils.closeCursor(cur); } else { // file is not in media library path = imageUri.toString().replace("file://", ""); imageFile = new File(path); @@ -706,6 +708,7 @@ private String uploadVideo(MediaFile mediaFile) { } } } + SqlUtils.closeCursor(cur); } else { // file is not in media library String filePath = videoUri.toString().replace("file://", ""); mediaFile.setFilePath(filePath); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java index 0dc980e2d0b8..b9c2f35bf9d2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java @@ -14,6 +14,7 @@ import org.wordpress.android.models.CategoryModel; import org.wordpress.android.models.SiteSettingsModel; import org.wordpress.android.util.LanguageUtils; +import org.wordpress.android.util.SqlUtils; import org.wordpress.android.util.StringUtils; import org.wordpress.android.util.WPPrefUtils; import org.xmlrpc.android.ApiHelper.Method; @@ -152,9 +153,13 @@ public static String getDefaultCategory(Context context) { if (id != 0) { CategoryModel category = new CategoryModel(); Cursor cursor = SiteSettingsTable.getCategory(id); - if (cursor != null && cursor.moveToFirst()) { - category.deserializeFromDatabase(cursor); - return category.name; + try { + if (cursor != null && cursor.moveToFirst()) { + category.deserializeFromDatabase(cursor); + return category.name; + } + } finally { + SqlUtils.closeCursor(cursor); } } diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java index a96dadc7493e..963dd4b40d0e 100644 --- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java +++ b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java @@ -112,8 +112,10 @@ public static Uri getLastRecordedVideoUri(Activity activity) { CursorLoader loader = new CursorLoader(activity, contentUri, proj, null, null, sortOrder); Cursor cursor = loader.loadInBackground(); cursor.moveToFirst(); + long value = cursor.getLong(0); + SqlUtils.closeCursor(cursor); - return Uri.parse(contentUri.toString() + "/" + cursor.getLong(0)); + return Uri.parse(contentUri.toString() + "/" + value); } /**