Support Acceptable Ads

src/plugin/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
 
 #include "AdblockPlusClient.h"
 
@@ skipping 325 matching lines @@
 }
 
 std::vector<SubscriptionDescription> CAdblockPlusClient::GetListedSubscriptions()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_LISTED_SUBSCRIPTIONS, response)) 
     return std::vector<SubscriptionDescription>();
   return ReadSubscriptions(response);
 }
 
+// Returns true if Acceptable Ads are enabled, false otherwise.
+bool CAdblockPlusClient::AcceptableAdsStatus()

[Felix Dahlke, 2014/06/30 17:24:04]

How about IsAcceptableAdsEnabled()? That'd make the comment redundant.

+{
+  std::vector<SubscriptionDescription> subscriptions = GetListedSubscriptions();
+  std::wstring aaUrl = GetPref(L"subscriptions_exceptionsurl", L"");
+  for (std::vector<SubscriptionDescription>::iterator subscription = subscriptions.begin(); subscription < subscriptions.end(); subscription ++)

[Felix Dahlke, 2014/06/30 17:24:04]

!= for iterators, not <

Also no whitespace before "++"

+  {
+    if (subscription->url == aaUrl)
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
 void CAdblockPlusClient::SetSubscription(const std::wstring& url)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_SET_SUBSCRIPTION << ToUtf8String(url);
   CallEngine(request);
 }
 
+void CAdblockPlusClient::AddSubscription(const std::wstring& url)
+{
+  Communication::OutputBuffer request;
+  request << Communication::PROC_ADD_SUBSCRIPTION << ToUtf8String(url);
+  CallEngine(request);
+}
+
+void CAdblockPlusClient::RemoveSubscription(const std::wstring& url)
+{
+  Communication::OutputBuffer request;
+  request << Communication::PROC_REMOVE_SUBSCRIPTION << ToUtf8String(url);
+  CallEngine(request);
+}
+
+
 void CAdblockPlusClient::UpdateAllSubscriptions()
 {
   CallEngine(Communication::PROC_UPDATE_ALL_SUBSCRIPTIONS);
 }
 
 std::vector<std::wstring> CAdblockPlusClient::GetExceptionDomains()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_GET_EXCEPTION_DOMAINS, response)) 
     return std::vector<std::wstring>();
@@ skipping 143 matching lines @@
 bool CAdblockPlusClient::TogglePluginEnabled()
 {
   DEBUG_GENERAL("TogglePluginEnabled");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_TOGGLE_PLUGIN_ENABLED, response)) 
     return false;
   bool currentEnabledState;
   response >> currentEnabledState;
   return currentEnabledState;
 }