Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen

mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.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 350 matching lines @@
 
   public static void queryIsLocal(final AdblockPlusApiCallback callback,
       final String url)
   {
     Log.d(TAG, "queryIsLocal for " + url);
     final Map<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("url", url);
     callFunction(callback, "isLocal", parameters);
   }
 
-  public static void queryIsPageWhitelisted(final AdblockPlusApiCallback callback,
+  public static void queryWhitelistedWebsites(final AdblockPlusApiCallback callback)
+  {
+    Log.d(TAG, "queryWhitelistedWebsites");
+    final Map<String, Object> parameters = new HashMap<>();
+    callFunction(callback, "getWhitelistedWebsites", parameters);
+  }
+
+  public static void queryIsWebsiteWhitelisted(final AdblockPlusApiCallback callback,
       final String url)
   {
-    Log.d(TAG, "queryIsPageWhitelisted for " + url);
+    Log.d(TAG, "queryIsWebsiteWhitelisted for " + url);
     final Map<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("url", url);
-    callFunction(callback, "isPageWhitelisted", parameters);
+    parameters.put("host", UrlUtils.getHostFromUrl(url));
+    callFunction(callback, "isWebsiteWhitelisted", parameters);
   }
 
-  public static void whitelistSite(final AdblockPlusApiCallback callback, final String url,
+  public static void whitelistWebsite(final AdblockPlusApiCallback callback, String url,
       final boolean whitelisted)
   {
-    Log.d(TAG, "whitelistSite for " + url);
+    Log.d(TAG, "whitelistWebsite for " + url);
     final Map<String, Object> parameters = new HashMap<String, Object>();
-    parameters.put("url", url);
+    parameters.put("url", UrlUtils.formatUrl(url));
+    parameters.put("host", UrlUtils.getHostFromUrl(url));
     parameters.put("whitelisted", whitelisted);
-    callFunction(callback, "whitelistSite", parameters, true);
+    callFunction(callback, "whitelistWebsite", parameters, true);
   }
 
   private static class AddOnRequest extends GeckoRequest
   {
     private final JSONObject value;
     private final AdblockPlusApiCallback apiCallback;
 
     AddOnRequest(final JSONObject value, final AdblockPlusApiCallback callback)
     {
       super(AddOnBridge.REQUEST_NAME, value);
@@ skipping 65 matching lines @@
       else if (ON_FILTERS_SAVE_EVENT.equals(event))
       {
         // All changes have been saved by the extension. That way, we can clear our list of
         // pending requests
         // See https://issues.adblockplus.org/ticket/2853
         clearPendingRequests();
       }
     }
   }
 }