Issue 4772 - Add temporary fix for removing unsupported filters

src/org/adblockplus/sbrowser/contentblocker/engine/Subscriptions.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 23 matching lines @@
 
 /**
  * This class holds all listed subscriptions and manages the subscription
  * aggregation cache folder.
  */
 final class Subscriptions
 {
   private static final String TAG = Subscriptions.class.getSimpleName();
   private static final String[] USER_SUBSCRIPTIONS =
   { Engine.USER_FILTERS_TITLE, Engine.USER_EXCEPTIONS_TITLE };
-  // Filters that begin with '|$' , '||$' , '@@|$' or '@@||$'

[Felix Dahlke, 2017/02/07 15:34:15]

Nit: Maybe reference the issue? e.g.:

// Filters that begin with ... need to be removed,
// see https://issues.adblockplus.org/ticket/1337

+  // Filters that begin with '|$' , '||$' , '@@|$' or '@@||$' need to be removed
+  // See https://issues.adblockplus.org/ticket/4772
   private static final String UNSUPPORTED_FILTERS_REGEX =  "^(\\|\\$|\\|\\|\\$|@@\\|\\$|@@\\|\\|\\$).*";
   private final HashMap<String, Subscription> subscriptions = new HashMap<String, Subscription>();
 
   private final Engine engine;
   private final File subscriptionFolder;
   private final File cacheFolder;
   private final boolean wasUnitialized;
 
   private Subscriptions(final Engine engine, final File appFolder, final File cacheFolder)
   {
@@ skipping 128 matching lines @@
     final BufferedWriter w = new BufferedWriter(
         new OutputStreamWriter(new FileOutputStream(output), "UTF-8"));
     try
     {
       Log.d(TAG, "Writing " + filters.size() + " filters");
       Engine.writeFilterHeaders(w);
       for (final String filter : filters)
       {
         // This is a temporary fix to not write filters that might crash Samsung Internet
         // See https://issues.adblockplus.org/ticket/4772
-        if (isFilterSupported(filter))
+        if (!filter.matches(UNSUPPORTED_FILTERS_REGEX))
         {
           w.write(filter);
           w.write('\n');
         }
         else
         {
           Log.d(TAG, "Ignoring unsupported filter: " + filter);
         }
       }
     }
     finally
     {
       w.close();
     }
-  }
-
-  private static boolean isFilterSupported(String filter)
-  {
-    if (filter.matches(UNSUPPORTED_FILTERS_REGEX))

[Felix Dahlke, 2017/02/07 15:34:15]

Seems we can simplify the function to:

return !filter.matches(UNSUPPORTED_FILTERS_REGEX);

Might as well inline it, but up to you.

-    {
-      return false;
-    }
-    return true;
   }
 
   public Subscription add(final Subscription sub)
   {
     final String id = sub.getId();
     if (!this.subscriptions.containsKey(id))
     {
       this.subscriptions.put(id, sub);
       return sub;
     }
@@ skipping 62 matching lines @@
     if (sub != null)
     {
       if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFile(sub),
           this.getFiltersFile(sub)))
       {
         this.engine.requestUpdateBroadcast();
       }
     }
   }
 }