wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 887820 - Close cursors in LocalBrowserDB and its users. r=mleibovic

Browse Source
This commit is contained in:
Chris Kitching 2013-07-11 10:43:36 -04:00
parent fb7766388a
commit 72d93f1679
6 changed files with 192 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/android/base/BrowserApp.java
View File

@ -1839,11 +1839,16 @@ abstract public class BrowserApp extends GeckoApp
public synchronized String doInBackground(Void... params) {
// Get the most recent URL stored in browser history.
String url = "";
Cursor c = BrowserDB.getRecentHistory(getContentResolver(), 1);
if (c.moveToFirst()) {
url = c.getString(c.getColumnIndexOrThrow(Combined.URL));
Cursor c = null;
try {
c = BrowserDB.getRecentHistory(getContentResolver(), 1);
if (c.moveToFirst()) {
url = c.getString(c.getColumnIndexOrThrow(Combined.URL));
}
} finally {
if (c != null)
c.close();
}
c.close();
return url;
}

16
mobile/android/base/EditBookmarkDialog.java
View File

@ -148,12 +148,16 @@ public class EditBookmarkDialog {
return null;
}
cursor.moveToFirst();
Bookmark bookmark = new Bookmark(cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks._ID)),
cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.TITLE)),
cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.URL)),
cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.KEYWORD)));
cursor.close();
Bookmark bookmark = null;
try {
cursor.moveToFirst();
bookmark = new Bookmark(cursor.getInt(cursor.getColumnIndexOrThrow(Bookmarks._ID)),
cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.TITLE)),
cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.URL)),
cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.KEYWORD)));
} finally {
cursor.close();
}
return bookmark;
}

19
mobile/android/base/GlobalHistory.java
View File

@ -51,14 +51,19 @@ class GlobalHistory {
// the cache was wiped away, repopulate it
Log.w(LOGTAG, "Rebuilding visited link set...");
visitedSet = new HashSet<String>();
Cursor c = BrowserDB.getAllVisitedHistory(GeckoAppShell.getContext().getContentResolver());
if (c.moveToFirst()) {
do {
visitedSet.add(c.getString(0));
} while (c.moveToNext());
Cursor c = null;
try {
c = BrowserDB.getAllVisitedHistory(GeckoAppShell.getContext().getContentResolver());
if (c.moveToFirst()) {
do {
visitedSet.add(c.getString(0));
} while (c.moveToNext());
}
mVisitedCache = new SoftReference<Set<String>>(visitedSet);
} finally {
if (c != null)
c.close();
}
mVisitedCache = new SoftReference<Set<String>>(visitedSet);
c.close();
}
// this runs on the same handler thread as the checkUriVisited code,

8
mobile/android/base/awesomebar/AllPagesTab.java
View File

@ -866,8 +866,11 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
}
public void storeFaviconsInMemCache(Cursor c) {
if (c == null)
return;
try {
if (c == null || !c.moveToFirst())
if (!c.moveToFirst())
return;
do {
@ -884,8 +887,7 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
Favicons.getInstance().putFaviconInMemCache(url, favicon);
} while (c.moveToNext());
} finally {
if (c != null)
c.close();
c.close();
}
}

13
mobile/android/base/db/BrowserDB.java
View File

@ -331,7 +331,15 @@ public class BrowserDB {
public void setPinnedSites(Cursor c) {
mPinnedSites = new SparseArray<PinnedSite>();
if (c != null && c.getCount() > 0) {
if (c == null) {
return;
}
try {
if (c.getCount() <= 0) {
return;
}
c.moveToPosition(0);
do {
int pos = c.getInt(c.getColumnIndex(Bookmarks.POSITION));
@ -339,8 +347,7 @@ public class BrowserDB {
String title = c.getString(c.getColumnIndex(URLColumns.TITLE));
mPinnedSites.put(pos, new PinnedSite(title, url));
} while (c.moveToNext());
}
if (c != null && !c.isClosed()) {
} finally {
c.close();
}
}

270
mobile/android/base/db/LocalBrowserDB.java
View File

@ -185,35 +185,36 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
@Override
public int getCount(ContentResolver cr, String database) {
Cursor cursor = null;
int count = 0;
String[] columns = null;
String constraint = null;
try {
Uri uri = null;
if ("history".equals(database)) {
uri = mHistoryUriWithProfile;
columns = new String[] { History._ID };
constraint = Combined.VISITS + " > 0";
} else if ("bookmarks".equals(database)) {
uri = mBookmarksUriWithProfile;
columns = new String[] { Bookmarks._ID };
// ignore folders, tags, keywords, separators, etc.
constraint = Bookmarks.TYPE + " = " + Bookmarks.TYPE_BOOKMARK;
} else if ("thumbnails".equals(database)) {
uri = mThumbnailsUriWithProfile;
columns = new String[] { Thumbnails._ID };
} else if ("favicons".equals(database)) {
uri = mFaviconsUriWithProfile;
columns = new String[] { Favicons._ID };
}
if (uri != null) {
Uri uri = null;
if ("history".equals(database)) {
uri = mHistoryUriWithProfile;
columns = new String[] { History._ID };
constraint = Combined.VISITS + " > 0";
} else if ("bookmarks".equals(database)) {
uri = mBookmarksUriWithProfile;
columns = new String[] { Bookmarks._ID };
// ignore folders, tags, keywords, separators, etc.
constraint = Bookmarks.TYPE + " = " + Bookmarks.TYPE_BOOKMARK;
} else if ("thumbnails".equals(database)) {
uri = mThumbnailsUriWithProfile;
columns = new String[] { Thumbnails._ID };
} else if ("favicons".equals(database)) {
uri = mFaviconsUriWithProfile;
columns = new String[] { Favicons._ID };
}
if (uri != null) {
Cursor cursor = null;
try {
cursor = cr.query(uri, columns, constraint, null, null);
count = cursor.getCount();
} finally {
if (cursor != null)
cursor.close();
}
} finally {
if (cursor != null)
cursor.close();
}
debug("Got count " + count + " for " + database);
return count;
@ -442,7 +443,8 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
null);
count = c.getCount();
} finally {
c.close();
if (c != null)
c.close();
}
// Cache result for future queries
@ -464,7 +466,8 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
null);
count = c.getCount();
} finally {
c.close();
if (c != null)
c.close();
}
// Cache result for future queries
@ -476,88 +479,90 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
public int getReadingListCount(ContentResolver cr) {
// This method is about the Reading List, not normal bookmarks
Cursor c = null;
int count = 0;
try {
c = cr.query(mBookmarksUriWithProfile,
new String[] { Bookmarks._ID },
Bookmarks.PARENT + " = ?",
new String[] { String.valueOf(Bookmarks.FIXED_READING_LIST_ID) },
null);
count = c.getCount();
return c.getCount();
} finally {
c.close();
if (c != null)
c.close();
}
return count;
}
@Override
public boolean isBookmark(ContentResolver cr, String uri) {
// This method is about normal bookmarks, not the Reading List
int count = 0;
Cursor c = null;
try {
Cursor c = cr.query(bookmarksUriWithLimit(1),
new String[] { Bookmarks._ID },
Bookmarks.URL + " = ? AND " +
Bookmarks.PARENT + " != ? AND " +
Bookmarks.PARENT + " != ?",
new String[] { uri,
String.valueOf(Bookmarks.FIXED_READING_LIST_ID),
String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID) },
Bookmarks.URL);
count = c.getCount();
c.close();
c = cr.query(bookmarksUriWithLimit(1),
new String[] { Bookmarks._ID },
Bookmarks.URL + " = ? AND " +
Bookmarks.PARENT + " != ? AND " +
Bookmarks.PARENT + " != ?",
new String[] { uri,
String.valueOf(Bookmarks.FIXED_READING_LIST_ID),
String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID) },
Bookmarks.URL);
return c.getCount() > 0;
} catch (NullPointerException e) {
Log.e(LOGTAG, "NullPointerException in isBookmark");
} finally {
if (c != null)
c.close();
}
return (count > 0);
return false;
}
@Override
public boolean isReadingListItem(ContentResolver cr, String uri) {
int count = 0;
Cursor c = null;
try {
Cursor c = cr.query(mBookmarksUriWithProfile,
new String[] { Bookmarks._ID },
Bookmarks.URL + " = ? AND " +
Bookmarks.PARENT + " == ?",
new String[] { uri,
String.valueOf(Bookmarks.FIXED_READING_LIST_ID) },
Bookmarks.URL);
c = cr.query(mBookmarksUriWithProfile,
new String[] { Bookmarks._ID },
Bookmarks.URL + " = ? AND " +
Bookmarks.PARENT + " == ?",
new String[] { uri,
String.valueOf(Bookmarks.FIXED_READING_LIST_ID) },
Bookmarks.URL);
count = c.getCount();
c.close();
return c.getCount() > 0;
} catch (NullPointerException e) {
Log.e(LOGTAG, "NullPointerException in isReadingListItem");
} finally {
if (c != null)
c.close();
}
return (count > 0);
return false;
}
@Override
public String getUrlForKeyword(ContentResolver cr, String keyword) {
Cursor cursor = cr.query(mBookmarksUriWithProfile,
new String[] { Bookmarks.URL },
Bookmarks.KEYWORD + " = ?",
new String[] { keyword },
null);
Cursor c = null;
try {
c = cr.query(mBookmarksUriWithProfile,
new String[] { Bookmarks.URL },
Bookmarks.KEYWORD + " = ?",
new String[] { keyword },
null);
if (!cursor.moveToFirst()) {
cursor.close();
return null;
if (c.moveToFirst())
return c.getString(c.getColumnIndexOrThrow(Bookmarks.URL));
} finally {
if (c != null)
c.close();
}
String url = cursor.getString(cursor.getColumnIndexOrThrow(Bookmarks.URL));
cursor.close();
return url;
return null;
}
private synchronized long getFolderIdFromGuid(ContentResolver cr, String guid) {
if (mFolderIdMap.containsKey(guid))
return mFolderIdMap.get(guid);
return mFolderIdMap.get(guid);
long folderId = -1;
Cursor c = null;
@ -603,17 +608,23 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
values.put(Bookmarks.DATE_MODIFIED, now);
// Get the page's favicon ID from the history table
Cursor c = cr.query(mHistoryUriWithProfile,
new String[] { History.FAVICON_ID },
History.URL + " = ?",
new String[] { uri },
null);
if (c.moveToFirst()) {
int columnIndex = c.getColumnIndexOrThrow(History.FAVICON_ID);
if (!c.isNull(columnIndex))
values.put(Bookmarks.FAVICON_ID, c.getLong(columnIndex));
Cursor c = null;
try {
c = cr.query(mHistoryUriWithProfile,
new String[] { History.FAVICON_ID },
History.URL + " = ?",
new String[] { uri },
null);
if (c.moveToFirst()) {
int columnIndex = c.getColumnIndexOrThrow(History.FAVICON_ID);
if (!c.isNull(columnIndex))
values.put(Bookmarks.FAVICON_ID, c.getLong(columnIndex));
}
} finally {
if (c != null)
c.close();
}
c.close();
// Restore deleted record if possible
values.put(Bookmarks.IS_DELETED, 0);
@ -716,21 +727,25 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
@Override
public Bitmap getFaviconForUrl(ContentResolver cr, String uri) {
Cursor c = cr.query(mCombinedUriWithProfile,
new String[] { Combined.FAVICON },
Combined.URL + " = ?",
new String[] { uri },
null);
Cursor c = null;
byte[] b = null;
if (!c.moveToFirst()) {
c.close();
return null;
try {
c = cr.query(mCombinedUriWithProfile,
new String[] { Combined.FAVICON },
Combined.URL + " = ?",
new String[] { uri },
null);
if (c.moveToFirst()) {
int faviconIndex = c.getColumnIndexOrThrow(Combined.FAVICON);
b = c.getBlob(faviconIndex);
}
} finally {
if (c != null)
c.close();
}
int faviconIndex = c.getColumnIndexOrThrow(Combined.FAVICON);
byte[] b = c.getBlob(faviconIndex);
c.close();
if (b == null || b.length == 0)
return null;
@ -739,21 +754,23 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
@Override
public String getFaviconUrlForHistoryUrl(ContentResolver cr, String uri) {
Cursor c = cr.query(mHistoryUriWithProfile,
new String[] { History.FAVICON_URL },
Combined.URL + " = ?",
new String[] { uri },
null);
Cursor c = null;
if (!c.moveToFirst()) {
c.close();
return null;
try {
c = cr.query(mHistoryUriWithProfile,
new String[] { History.FAVICON_URL },
Combined.URL + " = ?",
new String[] { uri },
null);
if (c.moveToFirst())
return c.getString(c.getColumnIndexOrThrow(History.FAVICON_URL));
} finally {
if (c != null)
c.close();
}
String faviconUrl = c.getString(c.getColumnIndexOrThrow(History.FAVICON_URL));
c.close();
return faviconUrl;
return null;
}
@Override
@ -825,22 +842,24 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
@Override
public byte[] getThumbnailForUrl(ContentResolver cr, String uri) {
Cursor c = cr.query(mThumbnailsUriWithProfile,
new String[] { Thumbnails.DATA },
Thumbnails.URL + " = ?",
new String[] { uri },
null);
Cursor c = null;
byte[] b = null;
try {
c = cr.query(mThumbnailsUriWithProfile,
new String[]{Thumbnails.DATA},
Thumbnails.URL + " = ?",
new String[]{uri},
null);
if (!c.moveToFirst()) {
c.close();
return null;
if (c.moveToFirst()) {
int thumbnailIndex = c.getColumnIndexOrThrow(Thumbnails.DATA);
b = c.getBlob(thumbnailIndex);
}
} finally {
if (c != null)
c.close();
}
int thumbnailIndex = c.getColumnIndexOrThrow(Thumbnails.DATA);
byte[] b = c.getBlob(thumbnailIndex);
c.close();
return b;
}
@ -1228,16 +1247,20 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
@Override
public boolean isVisited(ContentResolver cr, String uri) {
int count = 0;
Cursor c = null;
try {
Cursor c = cr.query(historyUriWithLimit(1),
new String[] { History._ID },
History.URL + " = ?",
new String[] { uri },
History.URL);
c = cr.query(historyUriWithLimit(1),
new String[] { History._ID },
History.URL + " = ?",
new String[] { uri },
History.URL);
count = c.getCount();
c.close();
} catch (NullPointerException e) {
Log.e(LOGTAG, "NullPointerException in isVisited");
} finally {
if (c != null)
c.close();
}
return (count > 0);
@ -1252,9 +1275,8 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
Bookmarks.URL + " = ?",
new String[] { url },
null);
if (c == null) {
return c;
} else if (c.getCount() == 0) {
if (c != null && c.getCount() == 0) {
c.close();
c = null;
}