Bug 1232439 - Part 1: Implement removeBookmarkWithID in BrowerDB r=mcomella
MozReview-Commit-ID: 6SeV8bRetH0
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
@@ -109,16 +109,17 @@ public interface BrowserDB {
public abstract String getUrlForKeyword(ContentResolver cr, String keyword);
public abstract boolean isBookmark(ContentResolver cr, String uri);
public abstract boolean addBookmark(ContentResolver cr, String title, String uri);
public abstract Cursor getBookmarkForUrl(ContentResolver cr, String url);
public abstract void removeBookmarksWithURL(ContentResolver cr, String uri);
+ public abstract void removeBookmarkWithID(ContentResolver cr, int id);
public abstract void registerBookmarkObserver(ContentResolver cr, ContentObserver observer);
public abstract void updateBookmark(ContentResolver cr, int id, String uri, String title, String keyword);
/**
* Can return <code>null</code>.
*/
public abstract Cursor getBookmarksInFolder(ContentResolver cr, long folderId);
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
@@ -1027,16 +1027,28 @@ public class LocalBrowserDB implements B
final String[] urlArgs = new String[] { uri, String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID) };
final String urlEquals = Bookmarks.URL + " = ? AND " + Bookmarks.PARENT + " != ? ";
cr.delete(contentUri, urlEquals, urlArgs);
}
@Override
+ public void removeBookmarkWithID(ContentResolver cr, int id) {
+ final Uri contentUri = mBookmarksUriWithProfile;
+
+ bumpParents(cr, Bookmarks._ID, String.valueOf(id));
+
+ cr.delete(contentUri,
+ Bookmarks._ID + " = ?",
+ new String[] { String.valueOf(id) });
+
+ }
+
+ @Override
public void registerBookmarkObserver(ContentResolver cr, ContentObserver observer) {
cr.registerContentObserver(mBookmarksUriWithProfile, false, observer);
}
@Override
@RobocopTarget
public void updateBookmark(ContentResolver cr, int id, String uri, String title, String keyword) {
ContentValues values = new ContentValues();
--- a/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
@@ -275,16 +275,19 @@ public class StubBrowserDB implements Br
public boolean addBookmark(ContentResolver cr, String title, String uri) {
return false;
}
@RobocopTarget
public void removeBookmarksWithURL(ContentResolver cr, String uri) {
}
+ public void removeBookmarkWithID(ContentResolver cr, int id) {
+ }
+
public void addReadingListItem(ContentResolver cr, ContentValues values) {
}
public void updateReadingListItem(ContentResolver cr, ContentValues values) {
}
public void removeReadingListItemWithURL(ContentResolver cr, String uri) {
}