Issue 6865 - Update ABP dependency to version 3.2

mobile/android/base/java/org/adblockplus/browser/SubscriptionContainer.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 29 matching lines @@
 final class SubscriptionContainer
 {
   private static final String TAG = SubscriptionContainer.class.getName();
   private final ConcurrentHashMap<String, Boolean> enableState = new ConcurrentHashMap<>();
   private final Semaphore entriesReady = new Semaphore(0);
   private final List<SubscriptionContainer.Subscription> entries = new ArrayList<>();
   private final HashMap<String, SubscriptionContainer.Subscription> urlMap = new HashMap<>();
   private final List<WeakReference<SubscriptionListener>> subscriptionListeners = new ArrayList<>();
 
   // prevent external instantiation
   private SubscriptionContainer(final Context context)

[jens, 2019/01/10 14:10:59]

To be consistent, Context should be final in all constructors and in the
loadSubscriptions() method.

[diegocarloslima, 2019/01/16 13:44:21]

Acknowledged.

   {
       loadSubscriptions(context);
   }
 
-  public final static SubscriptionContainer create(Context context)
+  public final static SubscriptionContainer create(final Context context)
   {
     return create(context, true);
   }
 
-  public final static SubscriptionContainer create(Context context, final boolean refresh)
+  public final static SubscriptionContainer create(final Context context, final boolean refresh)
   {
     final SubscriptionContainer sc = new SubscriptionContainer(context);
 
     for (final SubscriptionContainer.Subscription e : sc.entries)
     {
       sc.urlMap.put(e.url, e);
       sc.enableState.put(e.url, Boolean.FALSE);
     }
 
     if (refresh)
@@ skipping 75 matching lines @@
         iterator.remove();
       }
     }
 
     if (shouldAddListener)
     {
       this.subscriptionListeners.add(new WeakReference<>(listener));
     }
   }
 
-  private void loadSubscriptions(Context context)
+  private void loadSubscriptions(final Context context)
   {
 
     final XmlPullParser parser = Xml.newPullParser();
     try
     {
       final BufferedReader reader = new BufferedReader(new InputStreamReader(
               context.getAssets().open("extensions/subscriptions.xml")));
 
       parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
       parser.setInput(reader);
@@ skipping 157 matching lines @@
     {
       return this.specialization + " (" + this.title + ") @ " + this.url;
     }
   }
 
   public interface SubscriptionListener
   {
     void onSubscriptionUpdated();
   }
 }