Bug 1234967 - Pre: implement deleting bookmarks by ID draft
authorAndrzej Hunt <andrzej@ahunt.org>
Tue, 29 Mar 2016 11:19:24 -0700
changeset 450173 be2d0df120001724b973129818a52ceee767e6f4
parent 450172 fb31841f24eddf71bb750dbf02532a09261d3de8
child 450174 5f6790be0c2c3454a28b48c5b5e219f76fef88f3
push id38772
push userbmo:twointofive@gmail.com
push dateFri, 16 Dec 2016 03:01:04 +0000
bugs1234967
milestone53.0a1
Bug 1234967 - Pre: implement deleting bookmarks by ID Rebased by Tom Klein. MozReview-Commit-ID: Ejyuw7KcPAi
mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
@@ -104,16 +104,17 @@ public abstract class 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 Cursor getBookmarksForPartialUrl(ContentResolver cr, String partialUrl);
     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);
     public abstract boolean hasBookmarkWithGuid(ContentResolver cr, String guid);
 
     public abstract boolean insertPageMetadata(ContentProviderClient contentProviderClient, String pageUrl, boolean hasImage, String metadataJSON);
     public abstract int deletePageMetadata(ContentProviderClient contentProviderClient, String pageUrl);
     /**
      * Can return <code>null</code>.
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
@@ -1229,16 +1229,29 @@ public class LocalBrowserDB extends Brow
 
         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;
+
+        // Do this now so that the items still exist!
+        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();