From e372c02c732cf0881c21eb8423454a555e8fc75c Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Fri, 12 Jun 2009 17:07:29 -0400 Subject: Consolidate bookmark add/delete code in the browser. Driven by a desire to put bookmarking functionality into the title bar, I have consolidated the code for adding and removing bookmarks. --- src/com/android/browser/BrowserBookmarksAdapter.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/com/android/browser/BrowserBookmarksAdapter.java') diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index 09741ae50..c403b44d8 100644 --- a/src/com/android/browser/BrowserBookmarksAdapter.java +++ b/src/com/android/browser/BrowserBookmarksAdapter.java @@ -179,18 +179,7 @@ class BrowserBookmarksAdapter extends BaseAdapter { } mCursor.moveToPosition(position- mExtraOffset); String url = mCursor.getString(Browser.HISTORY_PROJECTION_URL_INDEX); - WebIconDatabase.getInstance().releaseIconForPageUrl(url); - Uri uri = ContentUris.withAppendedId(Browser.BOOKMARKS_URI, mCursor - .getInt(Browser.HISTORY_PROJECTION_ID_INDEX)); - int numVisits = mCursor.getInt(Browser.HISTORY_PROJECTION_VISITS_INDEX); - if (0 == numVisits) { - mContentResolver.delete(uri, null, null); - } else { - // It is no longer a bookmark, but it is still a visited site. - ContentValues values = new ContentValues(); - values.put(Browser.BookmarkColumns.BOOKMARK, 0); - mContentResolver.update(uri, values, null, null); - } + Bookmarks.removeFromBookmarks(null, mContentResolver, url); refreshList(); } -- cgit v1.2.3