Issue 4463 - Content blocker unavailable error message

src/org/adblockplus/sbrowser/contentblocker/engine/Engine.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 37 matching lines @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
 public final class Engine
 {
   private static final String TAG = Engine.class.getSimpleName();
 
-  public static final String ABP_VERSION = "2.0";

[Felix Dahlke, 2016/09/30 07:11:41]

I think we can safely hard code it (the way it was before) - if this would ever
change, it wouldn't be compatible with SBrowser anymore.

[diegocarloslima, 2016/09/30 14:06:38]

OK I'll revert that change

-
   // TODO make use of this regex's
   public static final Pattern RE_SUBSCRIPTION_HEADER = Pattern.compile(
       "\\[Adblock(?:\\s*Plus\\s*([\\d\\.]+)?)?\\]", Pattern.CASE_INSENSITIVE);
   public static final Pattern RE_FILTER_META = Pattern.compile("^\\s*!\\s*(\\w+)\\s*:\\s*(.*)");
   public static final Pattern RE_FILTER_ELEMHIDE = Pattern
       .compile("^([^\\/\\*\\|\\@\"!]*?)#(\\@)?(?:([\\w\\-]+|\\*)((?:\\([\\w\\-]+(?:[$^*]?=[^\\(\\)\"]*)?\\))*)|#([^{}]+))$");
   public static final Pattern RE_FILTER_REGEXP = Pattern
       .compile("^(@@)?\\/.*\\/(?:\\$~?[\\w\\-]+(?:=[^,\\s]+)?(?:,~?[\\w\\-]+(?:=[^,\\s]+)?)*)?$");
   public static final Pattern RE_FILTER_OPTIONS = Pattern
       .compile("\\$(~?[\\w\\-]+(?:=[^,\\s]+)?(?:,~?[\\w\\-]+(?:=[^,\\s]+)?)*)$");
@@ skipping 401 matching lines @@
       finally
       {
         writer.close();
       }
     }
     return dummyFilterFile;
   }
 
   public static void writeFilterHeaders(Writer writer) throws IOException
   {
-    writer.write("[Adblock Plus" + ABP_VERSION + "]\n");

[Felix Dahlke, 2016/09/30 07:11:41]

Shouldn't there be a space between "Adblock Plus" and the version?

+    writer.write("[Adblock Plus 2.0]\n");
     writer.write("! This file was automatically created.\n");
   }
 
   private static File getCachedFilterFile(Context context)
   {
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
     final String cachedFilterPath = prefs.getString(context.getString(R.string.key_cached_filter_path), null);
     if (cachedFilterPath != null)
     {
       return new File(cachedFilterPath);
     }
 
     return null;
   }
 
   private static File getDummyFilterFile(Context context)
   {
     return new File(getFilterCacheDir(context), "dummy.txt");
   }
 
   private static File getFilterCacheDir(Context context)
   {
-     return new File(context.getCacheDir(), "subscriptions");
+    return new File(context.getCacheDir(), "subscriptions");
   }
 
   private static File getSubscriptionsDir(Context context)
   {
-     return new File(context.getFilesDir(), "subscriptions");
+    return new File(context.getFilesDir(), "subscriptions");
   }
 
   URL createDownloadURL(final Subscription sub) throws IOException
   {
     final StringBuilder sb = new StringBuilder();
 
     sb.append(sub.getURL());
     if (sub.getURL().getQuery() != null)
     {
       sb.append('&');
@@ skipping 192 matching lines @@
       Log.d(TAG, headers.toString());
       this.downloader.enqueueDownload(this.createDownloadURL(sub), sub.getId(), headers);
     }
   }
 
   public void connectivityChanged()
   {
     this.downloader.connectivityChanged();
   }
 }