Issue 4769 - Supporting adding whitelisted websites on ABP for Samsung Internet

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 '@@||$'
-  // 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)
   {
     this.engine = engine;
@@ skipping 118 matching lines @@
       {
         Log.d(TAG, "Adding filters for '" + s.getId() + "'");
         s.clearFilters();
         s.deserializeFilters(this.getFiltersFile(s));
         s.getFilters(filters);
         s.clearFilters();
       }
     }
 
     final BufferedWriter w = new BufferedWriter(
-        new OutputStreamWriter(new FileOutputStream(output), "UTF-8"));
+        new OutputStreamWriter(new FileOutputStream(output), Engine.CHARSET_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 (!filter.matches(UNSUPPORTED_FILTERS_REGEX))
-        {
-          w.write(filter);
-          w.write('\n');
-        }
-        else
-        {
-          Log.d(TAG, "Ignoring unsupported filter: " + filter);
-        }
+        w.write(filter);
+        w.write('\n');
       }
     }
     finally
     {
       w.close();
     }
   }
 
   public Subscription add(final Subscription sub)
   {
@@ skipping 68 matching lines @@
     if (sub != null)
     {
       if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFile(sub),
           this.getFiltersFile(sub)))
       {
         this.engine.requestUpdateBroadcast();
       }
     }
   }
 }