Issue 4813 - UTFDataFormatException while serializing filter

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 153 matching lines @@
    * @throws IOException
    */
   private void writeFile(final File output) throws IOException
   {
     final HashSet<String> filters = new HashSet<String>();
     for (final Subscription s : this.subscriptions.values())
     {
       if (s.isEnabled())
       {
         Log.d(TAG, "Adding filters for '" + s.getId() + "'");
+        s.deserializeFilters(this.getFiltersFile(s));
+        s.copyFilters(filters);
         s.clearFilters();
-        s.deserializeFilters(this.getFiltersFile(s));
-        s.getFilters(filters);
-        s.clearFilters();
+      }
+      if ((!s.isMetaDataValid() || !s.isFiltersValid()) && s.getURL() != null)
+      {
+        this.engine.enqueueDownload(s, true);
       }
     }
 
     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)
       {
         w.write(filter);
         w.write('\n');
       }
     }
     finally
     {
       w.close();
     }
   }
 
   public Subscription add(final Subscription sub)
   {
     final String id = sub.getId();
     if (!this.subscriptions.containsKey(id))
     {
       this.subscriptions.put(id, sub);
       return sub;
     }
     return this.subscriptions.get(id);
   }
 
   public static Subscriptions initialize(final Engine engine, final File appFolder,
       final File cacheFolder)
-      throws IOException
   {
     final Subscriptions subs = new Subscriptions(engine, appFolder, cacheFolder);
 
     subs.subscriptionFolder.mkdirs();
     subs.cacheFolder.mkdirs();
 
     final File[] files = subs.subscriptionFolder.listFiles();
     for (File f : files)
     {
       if (f.getName().endsWith(".sub"))
       {
         final File metaFile = new File(f.getAbsolutePath() + ".meta");
         if (metaFile.exists())
         {
           final Subscription sub = Subscription.deserializeSubscription(metaFile);
-          subs.subscriptions.put(sub.getId(), sub);
+          if (sub != null)
+          {
+            subs.subscriptions.put(sub.getId(), sub);
+          }
         }
       }
     }
 
     subs.createUserSubscriptions();
 
     return subs;
   }
 
   /**
@@ skipping 30 matching lines @@
     if (sub != null)
     {
       if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFile(sub),
           this.getFiltersFile(sub)))
       {
         this.engine.requestUpdateBroadcast();
       }
     }
   }
 }