Issue 6865 - Update ABP dependency to version 3.2

mobile/android/base/java/org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.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 63 matching lines @@
 
   static
   {
     for (int i = 0; i < BUILTIN_TITLES.length; i++)
     {
       BUILTIN_URL_TO_INDEX.put(BUILTIN_LISTS[i * 2 + 1], Integer.valueOf(i));
     }
 
     IGNORED_URLS.add("https://easylist-downloads.adblockplus.org/exceptionrules.txt");
   }
 

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

Context could be final.

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

Acknowledged.

-  private synchronized static void initRecommendedSubscriptions()
+  private synchronized static void initRecommendedSubscriptions(Context context)
   {
     if (recommendedSubscriptions == null)
     {
-      recommendedSubscriptions = SubscriptionContainer.create(false);
+      recommendedSubscriptions = SubscriptionContainer.create(context, false);
 
       for (SubscriptionContainer.Subscription s : recommendedSubscriptions.getSubscriptions(false))
       {
         IGNORED_URLS.add(s.url);
       }
     }
   }
 
   public MoreSubscriptionsPreferenceGroup(final Context context, final AttributeSet attrs)
   {
@@ skipping 38 matching lines @@
     this.setEnabled(false);
     this.setShouldDisableView(true);
 
     super.onAttachedToActivity();
 
     this.progressDialog = new ProgressDialog(this.getContext());
     this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
     this.progressDialog.setMessage(this.getContext().getString(R.string.abb_adblocking_waiting));
     this.progressDialog.show();
 
-    AddOnBridge.postToHandler(new Runnable()
+    ExtensionBridge.postToHandler(new Runnable()
     {
       @Override
       public void run()
       {
-        initRecommendedSubscriptions();
+        initRecommendedSubscriptions(getContext());
         MoreSubscriptionsPreferenceGroup.this.activeSubscriptions.refresh();
 
         ThreadUtils.postToUiThread(new Runnable()
         {
           @Override
           public void run()
           {
             MoreSubscriptionsPreferenceGroup.this.initEntries();
           }
         });
@@ skipping 48 matching lines @@
   }
 
   private void addNewSubscription(final String url)
   {
     this.progressDialog = new ProgressDialog(this.getContext());
     this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
     this.progressDialog
         .setMessage(this.getContext().getString(R.string.abb_add_subscription_adding));
     this.progressDialog.show();
 
-    AddOnBridge.postToHandler(new Runnable()
+    ExtensionBridge.postToHandler(new Runnable()
     {
       @Override
       public void run()
       {
         try
         {
           final Semaphore finished = new Semaphore(0);
 
-          AddOnBridge.addSubscription(url, null, new AdblockPlusApiCallback()
+          ExtensionBridge.addSubscription(url, null, new AdblockPlusApiCallback()
           {
             @Override
             public void onApiRequestSucceeded(GeckoBundle bundle)
             {
               finished.release();
             }
 
             @Override
             public void onApiRequestFailed(String errorMessage)
             {
@@ skipping 33 matching lines @@
     this.addNewSubscription(input);
   }
 
   private static class ActiveSubscriptionContainer implements AdblockPlusApiCallback
   {
     public final HashMap<String, String> enabledSubscriptions = new HashMap<String, String>();
     private final Semaphore entriesReady = new Semaphore(0);
 
     public void refresh()
     {
-      AddOnBridge.queryActiveSubscriptions(this);
+      ExtensionBridge.queryActiveSubscriptions(this);
       this.entriesReady.acquireUninterruptibly();
     }
 
     @Override
     public void onApiRequestSucceeded(GeckoBundle bundle)
     {
       try
       {
         this.enabledSubscriptions.clear();
         for (final GeckoBundle sub : bundle.getBundleArray("value"))
@@ skipping 27 matching lines @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue)
     {
       if (preference instanceof CheckBoxPreference && newValue instanceof Boolean)
       {
         final CheckBoxPreference cbp = (CheckBoxPreference) preference;
         final boolean enable = ((Boolean) newValue).booleanValue();
 
         if (enable)
         {
-          AddOnBridge.addSubscription(cbp.getKey(), null, this);
+          ExtensionBridge.addSubscription(cbp.getKey(), null, this);
         }
         else
         {
-          AddOnBridge.removeSubscription(cbp.getKey(), this);
+          ExtensionBridge.removeSubscription(cbp.getKey(), this);
         }
       }
       return true;
     }
 
     @Override
     public void onApiRequestSucceeded(GeckoBundle bundle)
     {
       // ignored
     }
 
     @Override
     public void onApiRequestFailed(String errorMessage)
     {
       // ignored
     }
   }
 }