Bug 1254797 - Pre: fix variable name being negation of value r=me draft
authorAndrzej Hunt <andrzej@ahunt.org>
Wed, 09 Mar 2016 20:10:34 -0800
changeset 340717 baa0f654fa7e74902bf5248a142c2fcd3fb75ca5
parent 338556 1832f51ba1a518c64fdb2f3affeb2b470e89d0c9
child 340718 c1effa9a983e0d4609fe6800f4f5cfdb899030c7
child 341675 97a9398708f7781047dbb065fbe947835def507c
push id13041
push userbmo:ahunt@mozilla.com
push dateTue, 15 Mar 2016 21:51:53 +0000
reviewersme
bugs1254797
milestone47.0a1
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
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
@@ -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 + ", " +