Support Acceptable Ads

src/engine/Main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
@@ skipping 96 matching lines @@
       case Communication::PROC_LISTED_SUBSCRIPTIONS:
       {
         WriteSubscriptions(response, filterEngine->GetListedSubscriptions());
         break;
       }
       case Communication::PROC_SET_SUBSCRIPTION:
       {
         std::string url;
         request >> url;
 
+        AdblockPlus::JsValuePtr valuePtr = filterEngine->GetPref("subscriptions_exceptionsurl");
+        std::string aaUrl = "";
+        if (valuePtr->IsNull())

[Eric, 2014/07/18 19:26:48]

Missing a ! negation?

[Oleksandr, 2014/07/18 19:44:00]

Wow! That's awkward now :D
On 2014/07/18 19:26:48, Eric wrote:

[Eric, 2014/07/18 19:52:10]

There's always the infrequently used !!! operator, for when you really, really
want that value negated.

+        {
+          aaUrl = valuePtr->AsString();
+        }
         std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+
+        // Remove all subscriptions, besides the Acceptable Ads
         for (size_t i = 0, count = subscriptions.size(); i < count; i++)
-          subscriptions[i]->RemoveFromList();
+        {
+          if (subscriptions[i]->GetProperty("url")->AsString() != aaUrl)
+          {
+            subscriptions[i]->RemoveFromList();
+          }
+        }
 
         filterEngine->GetSubscription(url)->AddToList();
         break;
       }
+      case Communication::PROC_ADD_SUBSCRIPTION:
+      {
+        std::string url;
+        request >> url;
+
+        filterEngine->GetSubscription(url)->AddToList();
+        break;
+      }
+      case Communication::PROC_REMOVE_SUBSCRIPTION:
+      {
+        std::string url;
+        request >> url;
+
+        filterEngine->GetSubscription(url)->RemoveFromList();
+        break;
+      }
       case Communication::PROC_UPDATE_ALL_SUBSCRIPTIONS:
       {
         std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
         for (size_t i = 0, count = subscriptions.size(); i < count; i++)
           subscriptions[i]->UpdateFilters();
         break;
       }
       case Communication::PROC_GET_EXCEPTION_DOMAINS:
       {
         std::vector<AdblockPlus::FilterPtr> filters = filterEngine->GetListedFilters();
@@ skipping 284 matching lines @@
     }
     catch (std::runtime_error e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }