Issue 3364 - Implement JNI bindings for IsDocument/ElemhideWhitelisted

jni/JniFilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 293 matching lines @@
 
   try
   {
     AdblockPlus::FilterPtr filter = engine->Matches(url, contentType, documentUrl);
 
     return NewJniFilter(env, filter);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
+static void JavaStringArrayIntoStringVector(JNIEnv* env, jobjectArray jArray,

[Felix Dahlke, 2015/12/04 15:43:20]

Nit: Seems like the name is inconsistent with the stuff we have in Utils,
shouldn't it be `JniJavaStringArrayToStringVector` (prefixed with Jni,
s/Into/To/)?

[René Jeschke, 2015/12/04 15:55:59]

Yes, this is because this is not a function that is a direct JNI entry point
(like the other Jni* functions).

And second, this functions transforms a 'Java String array' into a
'std::vector<std::string>', by putting the elements 'into' the given vector.

I would like to leave the name as is, or change 'Into' to 'To' if this is more
like it. :-)

[Felix Dahlke, 2015/12/04 16:37:36]

I'd personally prefer "To" but I don't care that much.

[René Jeschke, 2015/12/04 16:54:47]

Done.

+    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::FilterEngine* engine =
       JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
   AdblockPlus::FilterEngine::ContentType contentType =
       ConvertContentType(env, jContentType);
 
   std::vector<std::string> documentUrls;
-
-  jsize len = env->GetArrayLength(jDocumentUrls);
-
-  for (jsize i = 0; i < len; i++)
-  {
-    documentUrls.push_back(
-        JniJavaToStdString(env,
-            *JniLocalReference<jstring>(env,
-                static_cast<jstring>(env->GetObjectArrayElement(jDocumentUrls,
-                    i)))));
-  }
+  JavaStringArrayIntoStringVector(env, jDocumentUrls, documentUrls);
 
   try
   {
     AdblockPlus::FilterPtr filter = engine->Matches(url, contentType,
         documentUrls);
 
     return NewJniFilter(env, filter);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
+static jboolean JNICALL JniIsDocumentWhitelisted(JNIEnv* env, jclass clazz, jlong ptr,
+    jstring jUrl, jobjectArray jDocumentUrls)
+{
+  AdblockPlus::FilterEngine* engine =
+      JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
+
+  std::string url = JniJavaToStdString(env, jUrl);
+  std::vector<std::string> documentUrls;
+  JavaStringArrayIntoStringVector(env, jDocumentUrls, documentUrls);
+  try
+  {
+    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::FilterEngine* engine =
+      JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
+
+  std::string url = JniJavaToStdString(env, jUrl);
+  std::vector<std::string> documentUrls;
+  JavaStringArrayIntoStringVector(env, jDocumentUrls, documentUrls);
+  try
+  {
+    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::FilterEngine* engine = JniLongToTypePtr < AdblockPlus::FilterEngine > (ptr);
 
   std::string pref = JniJavaToStdString(env, jPref);
 
   try
   {
     AdblockPlus::JsValuePtr value = engine->GetPref(pref);
 
@@ skipping 29 matching lines @@
   { (char*)"getListedSubscriptions", (char*)"(J)Ljava/util/List;", (void*)JniGetListedSubscriptions },
   { (char*)"fetchAvailableSubscriptions", (char*)"(J)Ljava/util/List;", (void*)JniFetchAvailableSubscriptions },
   { (char*)"setUpdateAvailableCallback", (char*)"(JJ)V", (void*)JniSetUpdateAvailableCallback },
   { (char*)"removeUpdateAvailableCallback", (char*)"(J)V", (void*)JniRemoveUpdateAvailableCallback },
   { (char*)"setFilterChangeCallback", (char*)"(JJ)V", (void*)JniSetFilterChangeCallback },
   { (char*)"removeFilterChangeCallback", (char*)"(J)V", (void*)JniRemoveFilterChangeCallback },
   { (char*)"forceUpdateCheck", (char*)"(JJ)V", (void*)JniForceUpdateCheck },
   { (char*)"getElementHidingSelectors", (char*)"(JLjava/lang/String;)Ljava/util/List;", (void*)JniGetElementHidingSelectors },
   { (char*)"matches", (char*)"(JLjava/lang/String;" TYP("FilterEngine$ContentType") "Ljava/lang/String;)" TYP("Filter"), (void*)JniMatches },
   { (char*)"matches", (char*)"(JLjava/lang/String;" TYP("FilterEngine$ContentType") "[Ljava/lang/String;)" TYP("Filter"), (void*)JniMatchesMany },
+  { (char*)"isDocumentWhitelisted", (char*)"(JLjava/lang/String;[Ljava/lang/String;)Z", (void*)JniIsDocumentWhitelisted },
+  { (char*)"isElemhideWhitelisted", (char*)"(JLjava/lang/String;[Ljava/lang/String;)Z", (void*)JniIsElemhideWhitelisted },
   { (char*)"getPref", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniGetPref },
   { (char*)"setPref", (char*)"(JLjava/lang/String;J)V", (void*)JniSetPref },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }