Issue 4463 - Content blocker unavailable error message

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 33 matching lines @@
   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;
-    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
   {
     // TODO cache cleanups
@@ skipping 110 matching lines @@
         s.getFilters(filters);
         s.clearFilters();
       }
     }
 
     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
     {
       w.close();
     }
@@ skipping 72 matching lines @@
     if (sub != null)
     {
       if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFile(sub),
           this.getFiltersFile(sub)))
       {
         this.engine.requestUpdateBroadcast();
       }
     }
   }
 }