Issue 5121 - Use Acceptable Ads API in libadblockplus

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.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 492 matching lines @@
       {
         s.updateFilters();
       }
       finally
       {
         s.dispose();
       }
     }
   }
 
-  public boolean isAcceptableAdsEnabled()
-  {
-    final String url = getAcceptableAdsSubscriptionURL();
-    List<Subscription> subscriptions = this.filterEngine.getListedSubscriptions();
-    try
-    {
-      for (Subscription eachSubscription : subscriptions)
-      {
-        JsValue jsUrl = eachSubscription.getProperty("url");
-        try
-        {
-          if (jsUrl.toString().equals(url))
-          {
-            return true;
-          }
-        }
-        finally
-        {
-          jsUrl.dispose();
-        }
-      }
-      return false;
-    }
-    finally
-    {
-      if (subscriptions != null)
-      {
-        for (Subscription eachSubscription : subscriptions)
-        {
-          eachSubscription.dispose();
-        }
-      }
-    }
-  }
-
   public void setEnabled(final boolean enabled)
   {
     this.enabled = enabled;
   }
 
   public boolean isEnabled()
   {
     return enabled;
   }
 
   public String getAcceptableAdsSubscriptionURL()

[anton, 2017/04/07 07:13:58]

for compatibility reason (though it's just forwarding invocation to the engine)

   {
-    JsValue jsPref = this.filterEngine.getPref("subscriptions_exceptionsurl");
-    try
-    {
-      return jsPref.toString();
-    }
-    finally
-    {
-      jsPref.dispose();
-    }
+    return filterEngine.getAcceptableAdsSubscriptionURL();
+  }
+
+  public boolean isAcceptableAdsEnabled()

[anton, 2017/04/07 07:13:58]

for compatibility reason (though it's just forwarding invocation to the engine)

+  {
+    return filterEngine.isAcceptableAdsEnabled();
   }
 
   public void setAcceptableAdsEnabled(final boolean enabled)

[anton, 2017/04/07 07:13:58]

for compatibility reason (though it's just forwarding invocation to the engine)

   {
-    final String url = getAcceptableAdsSubscriptionURL();
-    final Subscription sub = this.filterEngine.getSubscription(url);
-    if (sub != null)
-    {
-      try
-      {
-        if (enabled)
-        {
-          sub.addToList();
-        }
-        else
-        {
-          sub.removeFromList();
-        }
-      }
-      finally
-      {
-        sub.dispose();
-      }
-    }
+    filterEngine.setAcceptableAdsEnabled(enabled);
   }
 
   public String getDocumentationLink()
   {
     JsValue jsPref = this.filterEngine.getPref("documentation_link");
     try
     {
       return jsPref.toString();
     }
     finally
@@ skipping 124 matching lines @@
   public void setWhitelistedDomains(List<String> domains)
   {
     this.whitelistedDomains = domains;
   }
 
   public List<String> getWhitelistedDomains()
   {
     return whitelistedDomains;
   }
 }