Bug 1236387 - Add a URL and length filter for search history suggestions r=ahunt

MozReview-Commit-ID: 9EFgukC0imw

--HG--
extra : amend_source : 809bf6d603c931b0cafacf05b8b5d2469765b8e3

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -161,6 +161,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 import java.util.Vector;
+import java.util.regex.Pattern;
 
 public class BrowserApp extends GeckoApp
                         implements TabsPanel.TabsLayoutChangeListener,
@@ -2433,6 +2434,11 @@ public class BrowserApp extends GeckoApp
             return;
         }
 
+        // Filter out URLs and long suggestions
+        if (query.length() > 50 || Pattern.matches("^(https?|ftp|file)://.*", query)) {
+            return;
+        }
+
         final GeckoProfile profile = getProfile();
         // Don't bother storing search queries in guest mode
         if (profile.inGuestMode()) {

mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java

@@ -39,7 +39,9 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.regex.Pattern;
 
 class SearchEngineRow extends AnimatedHeightLayout {
     // Duration for fade-in animation
@@ -383,6 +385,18 @@ class SearchEngineRow extends AnimatedHeightLayout {
 
         // Remove duplicates of search engine suggestions from saved searches.
         List<String> searchHistorySuggestions = (rawSearchHistorySuggestions != null) ? rawSearchHistorySuggestions : new ArrayList<String>();
+
+        // Filter out URLs and long search suggestions
+        Iterator<String> searchistoryIterator = searchHistorySuggestions.iterator();
+        while (searchistoryIterator.hasNext()) {
+            final String currentSearchHistory = searchistoryIterator.next();
+
+            if (currentSearchHistory.length() > 50 || Pattern.matches("^(https?|ftp|file)://.*", currentSearchHistory)) {
+                searchHistorySuggestions.remove(currentSearchHistory);
+            }
+        }
+
+
         List<String> searchEngineSuggestions = new ArrayList<String>();
         for (String suggestion : searchEngine.getSuggestions()) {
             searchHistorySuggestions.remove(suggestion);