Bug 1254797 - Pre: fix variable name being negation of value r=me
This variable was renamed to be positive instead of negative but the value/usage wasn't adapted.
MozReview-Commit-ID: H1DeZMmvTXC
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
@@ -756,28 +756,28 @@ public class BrowserProvider extends Sha
// We could access the underlying data here, however SuggestedSites also performs filtering on the suggested
// sites list, which means we'd need to process the lists within SuggestedSites in any case. If we're doing
// that processing, there is little real between us using a MatrixCursor, or a Map (or List) instead of the
// MatrixCursor.
final Cursor suggestedSitesCursor = suggestedSites.get(suggestedGridLimit);
String[] suggestedSiteArgs = new String[0];
- boolean hasProcessedAnySuggestedSites = true;
+ boolean hasProcessedAnySuggestedSites = false;
final int idColumnIndex = suggestedSitesCursor.getColumnIndexOrThrow(Bookmarks._ID);
final int urlColumnIndex = suggestedSitesCursor.getColumnIndexOrThrow(Bookmarks.URL);
final int titleColumnIndex = suggestedSitesCursor.getColumnIndexOrThrow(Bookmarks.TITLE);
while (suggestedSitesCursor.moveToNext()) {
// We'll be using this as a subquery, hence we need to avoid the preceding UNION ALL
- if (!hasProcessedAnySuggestedSites) {
+ if (hasProcessedAnySuggestedSites) {
suggestedSitesBuilder.append(" UNION ALL");
} else {
- hasProcessedAnySuggestedSites = false;
+ hasProcessedAnySuggestedSites = true;
}
suggestedSitesBuilder.append(" SELECT" +
" ? AS " + Bookmarks._ID + "," +
" ? AS " + Bookmarks.URL + "," +
" ? AS " + Bookmarks.TITLE);
suggestedSiteArgs = DBUtils.appendSelectionArgs(suggestedSiteArgs,
new String[] {
@@ -807,17 +807,17 @@ public class BrowserProvider extends Sha
TopSites.TYPE_TOP + " AS " + TopSites.TYPE +
" FROM " + Combined.VIEW_NAME +
" WHERE " + ignoreForTopSitesWhereClause +
" ORDER BY " + BrowserContract.getFrecencySortOrder(true, false) +
" LIMIT " + totalLimit,
ignoreForTopSitesArgs);
- if (!hasProcessedAnySuggestedSites) {
+ if (hasProcessedAnySuggestedSites) {
db.execSQL("INSERT INTO " + TABLE_TOPSITES +
// We need to LIMIT _after_ selecting the relevant suggested sites, which requires us to
// use an additional internal subquery, since we cannot LIMIT a subquery that is part of UNION ALL.
// Hence the weird SELECT * FROM (SELECT ...relevant suggested sites... LIMIT ?)
" SELECT * FROM (SELECT " +
Bookmarks._ID + ", " +
Bookmarks._ID + " AS " + Combined.BOOKMARK_ID + ", " +
" -1 AS " + Combined.HISTORY_ID + ", " +