Issue 3364 - Implement JNI bindings for IsDocument/ElemhideWhitelisted

jni/JniFilterEngine.cpp

Index: jni/JniFilterEngine.cpp
diff --git a/jni/JniFilterEngine.cpp b/jni/JniFilterEngine.cpp
index b225245aed05e59bee9667fe3f77b8348d92263b..9f8fa8b3400f3ec9985a4ce9775fbcf6147500b6 100644
--- a/jni/JniFilterEngine.cpp
+++ b/jni/JniFilterEngine.cpp
@@ -311,6 +311,24 @@ static jobject JNICALL JniMatches(JNIEnv* env, jclass clazz, jlong ptr, jstring
   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)
 {
@@ -322,17 +340,7 @@ static jobject JNICALL JniMatchesMany(JNIEnv* env, jclass clazz, jlong ptr,
       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
   {
@@ -344,6 +352,40 @@ static jobject JNICALL JniMatchesMany(JNIEnv* env, jclass clazz, jlong ptr,
   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);
@@ -393,6 +435,8 @@ static JNINativeMethod methods[] =
   { (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 }