Issue 4463 - Content blocker unavailable error message

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

Index: src/org/adblockplus/sbrowser/contentblocker/engine/Subscriptions.java
===================================================================
--- a/src/org/adblockplus/sbrowser/contentblocker/engine/Subscriptions.java
+++ b/src/org/adblockplus/sbrowser/contentblocker/engine/Subscriptions.java
@@ -46,19 +46,19 @@ final class Subscriptions
   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;
-    this.subscriptionFolder = new File(appFolder, "subscriptions");
+    this.subscriptionFolder = appFolder;
     this.wasUnitialized = !this.subscriptionFolder.exists();
-    this.cacheFolder = new File(cacheFolder, "subscriptions");
+    this.cacheFolder = cacheFolder;
   }
 
   public boolean wasUnitialized()
   {
     return this.wasUnitialized;
   }
 
   public File createAndWriteFile() throws IOException
@@ -179,18 +179,17 @@ final class Subscriptions
       }
     }
 
     final BufferedWriter w = new BufferedWriter(
         new OutputStreamWriter(new FileOutputStream(output), "UTF-8"));
     try
     {
       Log.d(TAG, "Writing " + filters.size() + " filters");
-      w.write("[Adblock Plus 2.0]\n");
-      w.write("! This file was automatically created.\n");
+      Engine.writeFilterHeaders(w);
       for (final String filter : filters)
       {
         w.write(filter);
         w.write('\n');
       }
     }
     finally
     {