Noissue - Lint adjustments and optimizations

adblockplussbrowser/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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.sbrowser.contentblocker.engine;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.adblockplus.sbrowser.contentblocker.engine.Subscription.Type;
 
 import android.util.Log;
 
 /**
  * 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<>();
 
   private final Engine engine;
   private final File subscriptionFolder;
   private final File cacheFolder;
   private final boolean wasUnitialized;

[jens, 2017/06/02 10:50:01]

This member and the corresponding getter have a typo and should be named
'wasUninitialized', right? 

[diegocarloslima, 2017/06/02 21:03:42]

Acknowledged.

 
   private Subscriptions(final Engine engine, final File appFolder, final File cacheFolder)
   {
     this.engine = engine;
     this.subscriptionFolder = appFolder;
     this.wasUnitialized = !this.subscriptionFolder.exists();
     this.cacheFolder = cacheFolder;
   }
 
   public boolean wasUnitialized()
   {
     return this.wasUnitialized;
   }
 
   public File createAndWriteFile() throws IOException
   {
     for (;;)
     {
-      final File file = new File(this.cacheFolder, String.format("tmp-%d.txt",
+      final File file = new File(this.cacheFolder, String.format(Locale.ENGLISH, "tmp-%d.txt",

[anton, 2017/06/02 07:39:56]

what's a purpose of setting locale explicitly?

[diegocarloslima, 2017/06/02 21:03:42]

Mainly because it produces a Lint warning: Implicitly using the default locale
is a common source of bugs: Use String.format(Locale, ...) instead. For this
specific line of code AFAIK, there's no problem for using the default locale,
it's just to get rid of the warning.

           (int) (Math.random() * 1e8)));
       if (!file.exists())
       {
         Log.d(TAG, "Writing filters to " + file);
         this.writeFile(file);
         return file;
       }
     }
   }
 
   List<SubscriptionInfo> getSubscriptions(final Engine engine)
   {
     final ArrayList<SubscriptionInfo> subs = new ArrayList<>();
     for (final Subscription sub : this.subscriptions.values())
     {
       subs.add(SubscriptionInfo.create(engine, sub));
     }
     return subs;
   }
 
   void getSubscriptions(final List<Subscription> list)

[jens, 2017/06/02 10:50:01]

I think the method name has a typo and should be changed to
"addSubscriptions(final List<Subscription> list)"

[diegocarloslima, 2017/06/02 21:03:42]

Hmm, maybe loadSubscriptions makes more sense, since it will load the
subscriptions in the provided list, instead of adding the Subscriptions in the
provided list into another (internal) list

[jens, 2017/06/06 09:39:55]

Acknowledged.

   {
     list.addAll(this.subscriptions.values());
   }
 
   public boolean hasSubscription(final String id)
   {
     return this.subscriptions.containsKey(id);
   }
 
   public boolean isSubscriptionEnabled(final String id)
@@ skipping 178 matching lines @@
     if (sub != null)
     {
       if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFile(sub),
           this.getFiltersFile(sub)))
       {
         this.engine.requestUpdateBroadcast();
       }
     }
   }
 }