ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev

This commit is contained in:
Anthony Lee 2014-08-07 20:34:49 +00:00 committed by Android (Google) Code Review
parent 1381d4083b 4524dccde8
commit 8218d00634
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/email/provider/EmailProvider.java
View File

@ -4056,10 +4056,11 @@ public class EmailProvider extends ContentProvider
* @return array of URIs * @return array of URIs
*/ */
private Uri[] defaultRecentFolders(final String id) { private Uri[] defaultRecentFolders(final String id) {
Uri[] recentFolders = new Uri[0];
final SQLiteDatabase db = getDatabase(getContext()); final SQLiteDatabase db = getDatabase(getContext());
if (id.equals(COMBINED_ACCOUNT_ID_STRING)) { if (id.equals(COMBINED_ACCOUNT_ID_STRING)) {
// We don't have default recents for the combined view. // We don't have default recents for the combined view.
return new Uri[0]; return recentFolders;
} }
// We search for the types we want, and find corresponding IDs. // We search for the types we want, and find corresponding IDs.
final String[] idAndType = { BaseColumns._ID, UIProvider.FolderColumns.TYPE }; final String[] idAndType = { BaseColumns._ID, UIProvider.FolderColumns.TYPE };
@ -4083,18 +4084,25 @@ public class EmailProvider extends ContentProvider
.append(")"); .append(")");
LogUtils.d(TAG, "defaultRecentFolders: Query is %s", sb); LogUtils.d(TAG, "defaultRecentFolders: Query is %s", sb);
final Cursor c = db.rawQuery(sb.toString(), null); final Cursor c = db.rawQuery(sb.toString(), null);
if (c == null || c.getCount() <= 0 || !c.moveToFirst()) { try {
return new Uri[0]; if (c == null || c.getCount() <= 0 || !c.moveToFirst()) {
return recentFolders;
}
// Read all the IDs of the mailboxes, and turn them into URIs.
recentFolders = new Uri[c.getCount()];
int i = 0;
do {
final long folderId = c.getLong(0);
recentFolders[i] = uiUri("uifolder", folderId);
LogUtils.d(TAG, "Default recent folder: %d, with uri %s", folderId,
recentFolders[i]);
++i;
} while (c.moveToNext());
} finally {
if (c != null) {
c.close();
}
} }
// Read all the IDs of the mailboxes, and turn them into URIs.
final Uri[] recentFolders = new Uri[c.getCount()];
int i = 0;
do {
final long folderId = c.getLong(0);
recentFolders[i] = uiUri("uifolder", folderId);
LogUtils.d(TAG, "Default recent folder: %d, with uri %s", folderId, recentFolders[i]);
++i;
} while (c.moveToNext());
return recentFolders; return recentFolders;
} }