Bug 1293710 - Activity Stream Highlights: Only select actual bookmarks (no folders and other special types). r?ahunt draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Fri, 02 Sep 2016 19:37:05 +0200
changeset 409816 0569fda314ae6ff620279d253ae0ca1e9cfdecee
parent 409815 9688652240077657868317f86d9143bf94abee1d
child 409817 d150ae9341171be9b39a67e314e794f368bcb132
push id28557
push users.kaspari@gmail.com
push dateMon, 05 Sep 2016 07:55:10 +0000
reviewersahunt
bugs1293710
milestone51.0a1
Bug 1293710 - Activity Stream Highlights: Only select actual bookmarks (no folders and other special types). r?ahunt MozReview-Commit-ID: A5oV8vIIyhw
mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
@@ -1167,16 +1167,17 @@ public class BrowserProvider extends Sha
                 "FROM " + Bookmarks.TABLE_NAME + " " +
                 "LEFT JOIN " + History.TABLE_NAME + " ON " +
                     DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.URL) + " = " +
                     DBUtils.qualifyColumn(History.TABLE_NAME, History.URL) + " " +
                 "WHERE " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.DATE_CREATED) + " > " + threeDaysAgo + " " +
                 "AND (" + DBUtils.qualifyColumn(History.TABLE_NAME, History.VISITS) + " <= 3 " +
                   "OR " + DBUtils.qualifyColumn(History.TABLE_NAME, History.VISITS) + " IS NULL) " +
                 "AND " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.IS_DELETED)  + " = 0 " +
+                "AND " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.TYPE) + " = " + Bookmarks.TYPE_BOOKMARK + " " +
                 // TODO: Implement block list (bug 1298783)
                 "ORDER BY " + DBUtils.qualifyColumn(Bookmarks.TABLE_NAME, Bookmarks.DATE_CREATED) + " DESC " +
                 "LIMIT " + bookmarkLimit + ")";
 
         final long last30Minutes = System.currentTimeMillis() - (1000 * 60 * 30);
         final long historyLimit = totalLimit - bookmarkLimit;
 
         // Select recent history that has not been visited much.