Skip to content

fixed database cursor leaks #4627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbradbury merged 8 commits into from
Oct 27, 2016
Merged

fixed database cursor leaks #4627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7dbe9a
Close the database cursor in MediaUtils
andrew659 Oct 9, 2016
343f2fd
Close cursors in PostUploadService
andrew659 Oct 9, 2016
e5cb19a
close cursor in SiteSettingsInterface
andrew659 Oct 9, 2016
c9045e6
close cursor in EditPostActivity
andrew659 Oct 9, 2016
eeed717
use SqlUtils.closeCursor() to close db cursors
andrew659 Oct 27, 2016
9c74c73
use SqlUtils.closeCursor() to close db cursors
andrew659 Oct 27, 2016
688a61e
use SqlUtils.closeCursor() to close db cursors
andrew659 Oct 27, 2016
f6a6921
use SqlUtils.closeCursor() to close db cursors
andrew659 Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
3 changes: 3 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/services/PostUploadService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
11 changes: 8 additions & 3 deletions WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
4 changes: 3 additions & 1 deletion libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down