Issue 4931 - add possibility to not send data depending on connection properties

src/FilterEngine.cpp

 /*
  * 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 156 matching lines @@
   };
 }
 
 FilterEngine::FilterEngine(const JsEnginePtr& jsEngine)
   : jsEngine(jsEngine), firstRun(false), updateCheckId(0)
 {
 }
 
 void FilterEngine::CreateAsync(const JsEnginePtr& jsEngine,
   const FilterEngine::OnCreatedCallback& onCreated,
-  const FilterEngine::CreateParameters& params)
+  const FilterEngine::CreationParameters& params)
 {
   FilterEnginePtr filterEngine(new FilterEngine(jsEngine));
   auto sync = std::make_shared<Sync>();
-  auto isConnectionAllowed = params.isConnectionAllowed;
-  if (isConnectionAllowed)
+  auto isConnectionAllowedCallback = params.isConnectionAllowedCallback;
+  if (isConnectionAllowedCallback)
     jsEngine->SetIsConnectionAllowedCallback([sync, jsEngine]()->bool
     {
       sync->Wait();
       return jsEngine->IsConnectionAllowed();
     });
-  jsEngine->SetEventCallback("_init", [jsEngine, filterEngine, onCreated, sync, isConnectionAllowed](JsValueList& params)
+  jsEngine->SetEventCallback("_init", [jsEngine, filterEngine, onCreated, sync, isConnectionAllowedCallback](JsValueList& params)
   {
     filterEngine->firstRun = params.size() && params[0]->AsBool();
-    if (isConnectionAllowed)
+    if (isConnectionAllowedCallback)
     {
       std::weak_ptr<FilterEngine> weakFilterEngine = filterEngine;
-      jsEngine->SetIsConnectionAllowedCallback([weakFilterEngine, isConnectionAllowed]()->bool
+      jsEngine->SetIsConnectionAllowedCallback([weakFilterEngine, isConnectionAllowedCallback]()->bool
       {
         auto filterEngine = weakFilterEngine.lock();
         if (!filterEngine)
           return false;
-        auto prefValue = filterEngine->GetAllowedConnectionType();
-        if (prefValue->IsUndefined())
-          return isConnectionAllowed(nullptr);
-        auto allowedConnectionType = prefValue->AsString();
-        return isConnectionAllowed(&allowedConnectionType);
+        return isConnectionAllowedCallback(filterEngine->GetAllowedConnectionType().get());
       });
     }
     sync->Set();
     onCreated(filterEngine);
     jsEngine->RemoveEventCallback("_init");
   });
 
   // Lock the JS engine while we are loading scripts, no timeouts should fire
   // until we are done.
   const JsContext context(jsEngine);
 
   // Set the preconfigured prefs
   JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
   for (FilterEngine::Prefs::const_iterator it = params.preconfiguredPrefs.begin();
     it != params.preconfiguredPrefs.end(); it++)
   {
     preconfiguredPrefsObject->SetProperty(it->first, it->second);
   }
   jsEngine->SetGlobalProperty("_preconfiguredPrefs", preconfiguredPrefsObject);
   // Load adblockplus scripts
   for (int i = 0; !jsSources[i].empty(); i += 2)
     jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
 }
 
 FilterEnginePtr FilterEngine::Create(const JsEnginePtr& jsEngine,
-  const FilterEngine::CreateParameters& params)
+  const FilterEngine::CreationParameters& params)
 {
   FilterEnginePtr retValue;
   Sync sync;
   CreateAsync(jsEngine, [&retValue, &sync](const FilterEnginePtr& filterEngine)
   {
     retValue = filterEngine;
     sync.Set();
   }, params);
   sync.Wait();
   return retValue;
@@ skipping 275 matching lines @@
 void FilterEngine::RemoveFilterChangeCallback()
 {
   jsEngine->RemoveEventCallback("filterChange");
 }
 
 void FilterEngine::SetAllowedConnectionType(const std::string* value)
 {
   SetPref("allowed_connection_type", value ? jsEngine->NewValue(*value) : nullptr);
 }
 
-JsValuePtr FilterEngine::GetAllowedConnectionType()
-{
-  return GetPref("allowed_connection_type");
+std::unique_ptr<std::string> FilterEngine::GetAllowedConnectionType()
+{
+   auto prefValue = GetPref("allowed_connection_type");
+   if (prefValue->IsUndefined())
+     return nullptr;
+   return std::unique_ptr<std::string>(new std::string(prefValue->AsString()));
 }
 
 void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)
 {
   std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
   callback(action, item);
 }
 
 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
@@ skipping 47 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }