Bug 760956 - Post: remove unneeded getPinnedSites and getTopSites from BrowserDB r=me draft
authorAndrzej Hunt <ahunt@mozilla.com>
Wed, 17 Feb 2016 09:57:44 -0800
changeset 335016 2f3cd8a579eddb30ba87019f30944629cfb17a4d
parent 335015 14fc23d70eb6eecc7bae50fc25577a5bc09770fd
child 335017 621834e42a7c7478aee3bced70fcf083c8138d95
push id11698
push userahunt@mozilla.com
push dateFri, 26 Feb 2016 18:23:22 +0000
reviewersme
bugs760956
milestone47.0a1
Bug 760956 - Post: remove unneeded getPinnedSites and getTopSites from BrowserDB r=me MozReview-Commit-ID: 7Q5dOMVnqKP
mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
@@ -68,22 +68,16 @@ public interface BrowserDB {
      * Can return <code>null</code>. <code>CursorLoader</code> will handle this correctly.
      */
     public abstract Cursor filter(ContentResolver cr, CharSequence constraint,
                                   int limit, EnumSet<BrowserDB.FilterFlags> flags);
 
     /**
      * @return a cursor over top sites (high-ranking bookmarks and history).
      * Can return <code>null</code>.
-     */
-    public abstract Cursor getTopSites(ContentResolver cr, int limit);
-
-    /**
-     * @return a cursor over top sites (high-ranking bookmarks and history).
-     * Can return <code>null</code>.
      * Returns no more than <code>limit</code> results.
      * Suggested sites will be limited to being within the first <code>suggestedRangeLimit</code> results.
      */
     public abstract Cursor getTopSites(ContentResolver cr, int suggestedRangeLimit, int limit);
 
     public abstract void updateVisitedHistory(ContentResolver cr, String uri);
 
     public abstract void updateHistoryTitle(ContentResolver cr, String uri, String title);
@@ -164,17 +158,16 @@ public interface BrowserDB {
             String title, String guid, long parent, long added, long modified,
             long position, String keyword, int type);
 
     public abstract void updateFaviconInBatch(ContentResolver cr,
             Collection<ContentProviderOperation> operations, String url,
             String faviconUrl, String faviconGuid, byte[] data);
 
 
-    public abstract Cursor getPinnedSites(ContentResolver cr, int limit);
     public abstract void pinSite(ContentResolver cr, String url, String title, int position);
     public abstract void unpinSite(ContentResolver cr, int position);
 
     public abstract boolean hideSuggestedSite(String url);
     public abstract void setSuggestedSites(SuggestedSites suggestedSites);
     public abstract SuggestedSites getSuggestedSites();
     public abstract boolean hasSuggestedImageUrl(String url);
     public abstract String getSuggestedImageUrlForUrl(String url);
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
@@ -639,40 +639,16 @@ public class LocalBrowserDB implements B
                                              Combined.HISTORY_ID },
                               constraint,
                               limit,
                               null,
                               selection, selectionArgs);
     }
 
     @Override
-    public Cursor getTopSites(ContentResolver cr, int limit) {
-        // Filter out unvisited bookmarks and the ones that don't have real
-        // parents (e.g. pinned sites or reading list items).
-        String selection = DBUtils.concatenateWhere(Combined.HISTORY_ID + " <> -1",
-                                             Combined.URL + " NOT IN (SELECT " +
-                                             Bookmarks.URL + " FROM bookmarks WHERE " +
-                                             DBUtils.qualifyColumn("bookmarks", Bookmarks.PARENT) + " < ? AND " +
-                                             DBUtils.qualifyColumn("bookmarks", Bookmarks.IS_DELETED) + " == 0)");
-        String[] selectionArgs = new String[] { String.valueOf(Bookmarks.FIXED_ROOT_ID) };
-
-        return filterAllSites(cr,
-                              new String[] { Combined._ID,
-                                             Combined.URL,
-                                             Combined.TITLE,
-                                             Combined.BOOKMARK_ID,
-                                             Combined.HISTORY_ID },
-                              "",
-                              limit,
-                              AboutPages.URL_FILTER,
-                              selection,
-                              selectionArgs);
-    }
-
-    @Override
     public void updateVisitedHistory(ContentResolver cr, String uri) {
         ContentValues values = new ContentValues();
 
         values.put(History.URL, uri);
         values.put(History.DATE_LAST_VISITED, System.currentTimeMillis());
         values.put(History.IS_DELETED, 0);
 
         // This will insert a new history entry if one for this URL
@@ -1580,28 +1556,16 @@ public class LocalBrowserDB implements B
                   values,
                   Bookmarks.POSITION + " = ? AND " +
                   Bookmarks.PARENT + " = ?",
                   new String[] { Integer.toString(position),
                                  String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID) });
     }
 
     @Override
-    public Cursor getPinnedSites(ContentResolver cr, int limit) {
-        return cr.query(bookmarksUriWithLimit(limit),
-                        new String[] { Bookmarks._ID,
-                                       Bookmarks.URL,
-                                       Bookmarks.TITLE,
-                                       Bookmarks.POSITION },
-                        Bookmarks.PARENT + " == ?",
-                        new String[] { String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID) },
-                        Bookmarks.POSITION + " ASC");
-    }
-
-    @Override
     public void unpinSite(ContentResolver cr, int position) {
         cr.delete(mBookmarksUriWithProfile,
                   Bookmarks.PARENT + " == ? AND " + Bookmarks.POSITION + " = ?",
                   new String[] {
                       String.valueOf(Bookmarks.FIXED_PINNED_LIST_ID),
                       Integer.toString(position)
                   });
     }
--- a/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
@@ -201,20 +201,16 @@ public class StubBrowserDB implements Br
     }
 
     @RobocopTarget
     public Cursor filter(ContentResolver cr, CharSequence constraint, int limit,
                          EnumSet<BrowserDB.FilterFlags> flags) {
         return null;
     }
 
-    public Cursor getTopSites(ContentResolver cr, int limit) {
-        return null;
-    }
-
     public void updateVisitedHistory(ContentResolver cr, String uri) {
     }
 
     public void updateHistoryTitle(ContentResolver cr, String uri, String title) {
     }
 
     @RobocopTarget
     public Cursor getAllVisitedHistory(ContentResolver cr) {
@@ -348,20 +344,16 @@ public class StubBrowserDB implements Br
                                      Collection<ContentProviderOperation> operations,
                                      String url, String faviconUrl,
                                      String faviconGuid, byte[] data) {
     }
 
     public void pinSite(ContentResolver cr, String url, String title, int position) {
     }
 
-    public Cursor getPinnedSites(ContentResolver cr, int limit) {
-        return null;
-    }
-
     public void unpinSite(ContentResolver cr, int position) {
     }
 
     @RobocopTarget
     public Cursor getBookmarkForUrl(ContentResolver cr, String url) {
         return null;
     }