Issue 5556 - use FilterEngine& instead of FilterEnginePtr because FilterEnginePtr is not available

libadblockplus-android/jni/JniFilterEngine.cpp

 /*
  * 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 36 matching lines @@
 }
 
 namespace
 {
   struct JniFilterEngine
   {
     AdblockPlus::ITimer* timer;
     AdblockPlus::FilterEnginePtr filterEngine;
   };
 
-  AdblockPlus::FilterEnginePtr& GetFilterEnginePtrRef(jlong ptr)
+  AdblockPlus::FilterEngine& GetFilterEngineRef(jlong ptr)
   {
-    return JniLongToTypePtr<JniFilterEngine>(ptr)->filterEngine;
+    return *JniLongToTypePtr<JniFilterEngine>(ptr)->filterEngine;
   }
 }
 
 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jniJsEnginePtr, jlong isAllowedConnectionCallbackPtr)
 {
   try
   {
     auto jniJsEngine = JniLongToTypePtr<JniJsEngine>(jniJsEnginePtr);
     auto jsEngine = jniJsEngine->jsEngine;
     auto jniFilterEngine = new JniFilterEngine();
@@ skipping 33 matching lines @@
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
   delete JniLongToTypePtr<JniFilterEngine>(ptr);
 }
 
 static jboolean JNICALL JniIsFirstRun(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+    AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
-    return engine->IsFirstRun() ? JNI_TRUE : JNI_FALSE;
+    return engine.IsFirstRun() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE);
 }
 
 static jobject JNICALL JniGetFilter(JNIEnv* env, jclass clazz, jlong ptr, jstring jText)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   std::string text = JniJavaToStdString(env, jText);
 
   try
   {
-    return NewJniFilter(env, engine->GetFilter(text));
+    return NewJniFilter(env, engine.GetFilter(text));
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
 static jobject JNICALL JniGetListedFilters(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
-    std::vector<AdblockPlus::Filter> filters = engine->GetListedFilters();
+    std::vector<AdblockPlus::Filter> filters = engine.GetListedFilters();
 
     jobject list = NewJniArrayList(env);
 
     for (std::vector<AdblockPlus::Filter>::iterator it = filters.begin(), end = filters.end(); it != end; it++)
     {
       JniAddObjectToList(env, list, *JniLocalReference<jobject>(env, NewJniFilter(env, std::move(*it))));
     }
 
     return list;
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
 static jobject JNICALL JniGetSubscription(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   std::string url = JniJavaToStdString(env, jUrl);
 
   try
   {
-    return NewJniSubscription(env, engine->GetSubscription(url));
+    return NewJniSubscription(env, engine.GetSubscription(url));
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
 static void JNICALL JniShowNextNotification(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   std::string url = JniJavaToStdString(env, jUrl);
 
   try
   {
-    engine->ShowNextNotification(url);
+    engine.ShowNextNotification(url);
   }
   CATCH_AND_THROW(env);
 }
 
 static void JNICALL JniSetShowNotificationCallback(JNIEnv* env, jclass clazz,
                                                   jlong ptr, jlong callbackPtr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   JniShowNotificationCallback* const callback =
       JniLongToTypePtr<JniShowNotificationCallback>(callbackPtr);
 
   auto showNotificationCallback = [callback](AdblockPlus::Notification&& notification)
   {
     callback->Callback(std::move(notification));
   };
 
   try
   {
-    engine->SetShowNotificationCallback(showNotificationCallback);
+    engine.SetShowNotificationCallback(showNotificationCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniRemoveShowNotificationCallback(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
-    engine->RemoveShowNotificationCallback();
+    engine.RemoveShowNotificationCallback();
   }
   CATCH_AND_THROW(env);
 }
 
 static jobject JNICALL JniGetListedSubscriptions(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
-    return SubscriptionsToArrayList(env, engine->GetListedSubscriptions());
+    return SubscriptionsToArrayList(env, engine.GetListedSubscriptions());
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
 static jobject JNICALL JniFetchAvailableSubscriptions(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
-    return SubscriptionsToArrayList(env, engine->FetchAvailableSubscriptions());
+    return SubscriptionsToArrayList(env, engine.FetchAvailableSubscriptions());
   }
   CATCH_THROW_AND_RETURN(env, 0);
 }
 
 static void JNICALL JniRemoveUpdateAvailableCallback(JNIEnv* env, jclass clazz,
                                                      jlong ptr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   try
   {
-    engine->RemoveUpdateAvailableCallback();
+    engine.RemoveUpdateAvailableCallback();
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetUpdateAvailableCallback(JNIEnv* env, jclass clazz,
                                                   jlong ptr, jlong callbackPtr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   JniUpdateAvailableCallback* const callback =
       JniLongToTypePtr<JniUpdateAvailableCallback>(callbackPtr);
 
   const AdblockPlus::FilterEngine::UpdateAvailableCallback updateAvailableCallback =
       std::bind(&JniUpdateAvailableCallback::Callback, callback,
                      std::placeholders::_1);
   try
   {
-    engine->SetUpdateAvailableCallback(updateAvailableCallback);
+    engine.SetUpdateAvailableCallback(updateAvailableCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniRemoveFilterChangeCallback(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
-    engine->RemoveFilterChangeCallback();
+    engine.RemoveFilterChangeCallback();
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetFilterChangeCallback(JNIEnv* env, jclass clazz,
     jlong ptr, jlong filterPtr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   JniFilterChangeCallback* callback = JniLongToTypePtr<JniFilterChangeCallback>(
       filterPtr);
 
   auto filterCallback = [callback](const std::string& arg, AdblockPlus::JsValue&& jsValue)
   {
     callback->Callback(arg, std::move(jsValue));
   };
 
   try
   {
-    engine->SetFilterChangeCallback(filterCallback);
+    engine.SetFilterChangeCallback(filterCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniForceUpdateCheck(JNIEnv* env, jclass clazz, jlong ptr, jlong updaterPtr)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   JniUpdateCheckDoneCallback* callback =
       JniLongToTypePtr<JniUpdateCheckDoneCallback>(updaterPtr);
 
   AdblockPlus::FilterEngine::UpdateCheckDoneCallback
       updateCheckDoneCallback = 0;
 
   if (updaterPtr)
   {
     updateCheckDoneCallback =
         std::bind(&JniUpdateCheckDoneCallback::Callback, callback,
                        std::placeholders::_1);
   }
 
   try
   {
-    engine->ForceUpdateCheck(updateCheckDoneCallback);
+    engine.ForceUpdateCheck(updateCheckDoneCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static jobject JNICALL JniGetElementHidingSelectors(JNIEnv* env, jclass clazz,
     jlong ptr, jstring jDomain)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string domain = JniJavaToStdString(env, jDomain);
 
   try
   {
-    std::vector<std::string> selectors = engine->GetElementHidingSelectors(
+    std::vector<std::string> selectors = engine.GetElementHidingSelectors(
         domain);
 
     jobject list = NewJniArrayList(env);
 
     for (std::vector<std::string>::iterator it = selectors.begin(), end =
         selectors.end(); it != end; it++)
     {
       JniAddObjectToList(env, list,
           *JniLocalReference<jstring>(env, env->NewStringUTF(it->c_str())));
     }
 
     return list;
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jobject JNICALL JniMatches(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl, jobject jContentType, jstring jDocumentUrl)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
   AdblockPlus::FilterEngine::ContentType contentType =
       ConvertContentType(env, jContentType);
   std::string documentUrl = JniJavaToStdString(env, jDocumentUrl);
 
   try
   {
-    AdblockPlus::FilterPtr filterPtr = engine->Matches(url, contentType, documentUrl);
+    AdblockPlus::FilterPtr filterPtr = engine.Matches(url, contentType, documentUrl);
 
     return filterPtr.get() ? NewJniFilter(env, std::move(*filterPtr)) : 0;
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JavaStringArrayToStringVector(JNIEnv* env, jobjectArray jArray,
     std::vector<std::string>& out)
 {
   if (jArray)
   {
     jsize len = env->GetArrayLength(jArray);
 
     for (jsize i = 0; i < len; i++)
     {
       out.push_back(
           JniJavaToStdString(env,
               *JniLocalReference<jstring>(env,
                   static_cast<jstring>(
                       env->GetObjectArrayElement(jArray, i)))));
     }
   }
 }
 
 static jobject JNICALL JniMatchesMany(JNIEnv* env, jclass clazz, jlong ptr,
     jstring jUrl, jobject jContentType, jobjectArray jDocumentUrls)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
   AdblockPlus::FilterEngine::ContentType contentType =
       ConvertContentType(env, jContentType);
 
   std::vector<std::string> documentUrls;
   JavaStringArrayToStringVector(env, jDocumentUrls, documentUrls);
 
   try
   {
-    AdblockPlus::FilterPtr filterPtr = engine->Matches(url, contentType, documentUrls);
+    AdblockPlus::FilterPtr filterPtr = engine.Matches(url, contentType, documentUrls);
 
     return (filterPtr.get() ? NewJniFilter(env, std::move(*filterPtr)) : 0);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jboolean JNICALL JniIsDocumentWhitelisted(JNIEnv* env, jclass clazz, jlong ptr,
     jstring jUrl, jobjectArray jDocumentUrls)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
   std::vector<std::string> documentUrls;
   JavaStringArrayToStringVector(env, jDocumentUrls, documentUrls);
   try
   {
-    return engine->IsDocumentWhitelisted(url, documentUrls) ?
+    return engine.IsDocumentWhitelisted(url, documentUrls) ?
         JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsElemhideWhitelisted(JNIEnv* env, jclass clazz, jlong ptr,
     jstring jUrl, jobjectArray jDocumentUrls)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
   std::vector<std::string> documentUrls;
   JavaStringArrayToStringVector(env, jDocumentUrls, documentUrls);
   try
   {
-    return engine->IsElemhideWhitelisted(url, documentUrls) ?
+    return engine.IsElemhideWhitelisted(url, documentUrls) ?
         JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jobject JNICALL JniGetPref(JNIEnv* env, jclass clazz, jlong ptr, jstring jPref)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string pref = JniJavaToStdString(env, jPref);
 
   try
   {
-    return NewJniJsValue(env, engine->GetPref(pref));
+    return NewJniJsValue(env, engine.GetPref(pref));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniSetPref(JNIEnv* env, jclass clazz, jlong ptr, jstring jPref, jlong jsValue)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string pref = JniJavaToStdString(env, jPref);
   const AdblockPlus::JsValue& value = JniGetJsValue(jsValue);
 
   try
   {
-    engine->SetPref(pref, value);
+    engine.SetPref(pref, value);
   }
   CATCH_AND_THROW(env)
 }
 
 static jstring JNICALL JniGetHostFromURL(JNIEnv* env, jclass clazz, jlong ptr, jstring jurl)
 {
   if (jurl == NULL)
   {
     return NULL;
   }
 
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string url = JniJavaToStdString(env, jurl);
   try
   {
-    std::string host = engine->GetHostFromURL(url);
+    std::string host = engine.GetHostFromURL(url);
 
     return JniStdStringToJava(env, host);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniSetAllowedConnectionType(JNIEnv* env, jclass clazz, jlong ptr, jstring jvalue)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   std::string stdValue;
   const std::string* value = (jvalue != NULL
     ? &(stdValue = JniJavaToStdString(env, jvalue))
     : NULL);
 
   try
   {
-    engine->SetAllowedConnectionType(value);
+    engine.SetAllowedConnectionType(value);
   }
   CATCH_AND_THROW(env)
 }
 
 static jstring JNICALL JniGetAllowedConnectionType(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
-    std::unique_ptr<std::string> value = engine->GetAllowedConnectionType();
+    AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
+    std::unique_ptr<std::string> value = engine.GetAllowedConnectionType();
 
     if (value == NULL)
     {
       return NULL;
     }
 
     return JniStdStringToJava(env, *value.get());
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniSetAcceptableAdsEnabled(JNIEnv* env, jclass clazz, jlong ptr, jboolean jvalue)
 {
-  AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
+  AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
   try
   {
-    engine->SetAAEnabled(jvalue == JNI_TRUE);
+    engine.SetAAEnabled(jvalue == JNI_TRUE);
   }
   CATCH_AND_THROW(env)
 }
 
 static jboolean JNICALL JniIsAcceptableAdsEnabled(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
-    return engine->IsAAEnabled() ? JNI_TRUE : JNI_FALSE;
+    AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
+    return engine.IsAAEnabled() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jstring JNICALL JniGetAcceptableAdsSubscriptionURL(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    AdblockPlus::FilterEnginePtr& engine = GetFilterEnginePtrRef(ptr);
-    std::string url = engine->GetAAUrl();
+    AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
+    std::string url = engine.GetAAUrl();
     return JniStdStringToJava(env, url);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniUpdateFiltersAsync(JNIEnv* env, jclass clazz, jlong ptr, jstring jSubscriptionUrl)
 {
   std::string subscriptionUrl = JniJavaToStdString(env, jSubscriptionUrl);
   auto jniFilterEngine = JniLongToTypePtr<JniFilterEngine>(ptr);
-  std::weak_ptr<AdblockPlus::FilterEngine> weakFilterEngine = jniFilterEngine->filterEngine;
-  jniFilterEngine->timer->SetTimer(std::chrono::milliseconds(0), [weakFilterEngine, subscriptionUrl]
+  jniFilterEngine->timer->SetTimer(std::chrono::milliseconds(0), [jniFilterEngine, subscriptionUrl]
   {
-    auto filterEngine = weakFilterEngine.lock();
-    if (!filterEngine)
-    {
-      return;
-    }
-    for (auto& subscription : filterEngine->GetListedSubscriptions())
+    auto& filterEngine = *jniFilterEngine->filterEngine;
+    for (auto& subscription : filterEngine.GetListedSubscriptions())
     {
       if (stringBeginsWith(subscriptionUrl, subscription.GetProperty("url").AsString()))
       {
         subscription.UpdateFilters();
         return;
       }
     }
   });
 }
 
@@ skipping 28 matching lines @@
   { (char*)"isAcceptableAdsEnabled", (char*)"(J)Z", (void*)JniIsAcceptableAdsEnabled },
   { (char*)"getAcceptableAdsSubscriptionURL", (char*)"(J)Ljava/lang/String;", (void*)JniGetAcceptableAdsSubscriptionURL },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor },
   { (char*)"updateFiltersAsync", (char*)"(JLjava/lang/String;)V", (void*)JniUpdateFiltersAsync }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }