Issue 1424 - Update libadblockplus-binaries to 6f79af14ad4e

jni/JniFilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 13 matching lines @@
   jobject list = NewJniArrayList(env);
 
   for (std::vector<AdblockPlus::SubscriptionPtr>::iterator it = subscriptions.begin(), end = subscriptions.end(); it != end; it++)
   {
     JniAddObjectToList(env, list, NewJniSubscription(env, *it));
   }
 
   return list;
 }
 
+static AdblockPlus::FilterEngine::ContentType ConvertContentType(JNIEnv *env,
+    jobject jContentType)
+{
+  jclass enumClass = env->FindClass("java/lang/Enum");

[René Jeschke, 2014/09/22 12:56:26]

Could you please use "env->GetObjectClass(jContentType)" instead of the direct
env->FindClass?

[Felix Dahlke, 2014/09/22 13:20:16]

Done.

+  jmethodID nameMethod = env->GetMethodID(enumClass, "name",

[René Jeschke, 2014/09/22 12:56:26]

Is this line break really necessary?

[Felix Dahlke, 2014/09/22 13:20:16]

IMO yes - we have an 80 column rule in C++ code after all. We're not too strict
about enforcing it, but I personally tend to ensure all code I touch is fully
compliant.

[René Jeschke, 2014/09/22 13:30:06]

Ah, right. The Android project can be confusing when it comes to line-widths as
it features C++ and Java.

+                                          "()Ljava/lang/String;");
+  jstring jValue = (jstring) env->CallObjectMethod(jContentType, nameMethod);
+  const std::string value = JniJavaToStdString(env, jValue);
+  return AdblockPlus::FilterEngine::StringToContentType(value);
+}
+
 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong enginePtr)
 {
   try
   {
     AdblockPlus::JsEnginePtr& jsEngine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(enginePtr);
     return JniPtrToLong(new AdblockPlus::FilterEngine(jsEngine));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
@@ skipping 109 matching lines @@
   try
   {
     engine->SetFilterChangeCallback(filterCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniForceUpdateCheck(JNIEnv* env, jclass clazz, jlong ptr, jlong updaterPtr)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
-  JniUpdaterCallback* callback = JniLongToTypePtr<JniUpdaterCallback>(updaterPtr);
+  JniUpdateCheckDoneCallback* callback =

[René Jeschke, 2014/09/22 12:56:26]

Are those new line breaks really needed?
(See also below)

[Felix Dahlke, 2014/09/22 13:20:16]

IMO yes, see above.

+      JniLongToTypePtr<JniUpdateCheckDoneCallback>(updaterPtr);
 
-  AdblockPlus::FilterEngine::UpdaterCallback updaterCallback = 0;
+  AdblockPlus::FilterEngine::UpdateCheckDoneCallback
+      updateCheckDoneCallback = 0;
 
   if (updaterPtr)
   {
-    updaterCallback = std::tr1::bind(&JniUpdaterCallback::Callback, callback, std::tr1::placeholders::_1);
+    updateCheckDoneCallback =
+        std::tr1::bind(&JniUpdateCheckDoneCallback::Callback, callback,
+                       std::tr1::placeholders::_1);
   }
 
   try
   {
-    engine->ForceUpdateCheck(updaterCallback);
+    engine->ForceUpdateCheck(updateCheckDoneCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static jobject JNICALL JniGetElementHidingSelectors(JNIEnv* env, jclass clazz, jlong ptr, jstring jDomain)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
 
   std::string domain = JniJavaToStdString(env, jDomain);
 
   try
   {
     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, 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, jstring jContentType, jstring jDocumentUrl)
+static jobject JNICALL JniMatches(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl, jobject jContentType, jstring jDocumentUrl)
 {
   AdblockPlus::FilterEngine* engine = JniLongToTypePtr<AdblockPlus::FilterEngine>(ptr);
 
   std::string url = JniJavaToStdString(env, jUrl);
-  std::string contentType = JniJavaToStdString(env, jContentType);
+  AdblockPlus::FilterEngine::ContentType contentType =
+      ConvertContentType(env, jContentType);
   std::string documentUrl = JniJavaToStdString(env, jDocumentUrl);
 
   try
   {
     AdblockPlus::FilterPtr filter = engine->Matches(url, contentType, documentUrl);
 
     return NewJniFilter(env, filter);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
-static jobject JNICALL JniMatchesMany(JNIEnv* env, jclass clazz, jlong ptr, jstring jUrl, jstring jContentType, jobjectArray jDocumentUrls)
+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);
-  std::string contentType = JniJavaToStdString(env, jContentType);
+  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, static_cast<jstring>(env->GetObjectArrayElement(jDocumentUrls, i))));
   }
 
@@ skipping 41 matching lines @@
   { (char*)"isFirstRun", (char*)"(J)Z", (void*)JniIsFirstRun },
   { (char*)"getFilter", (char*)"(JLjava/lang/String;)" TYP("Filter"), (void*)JniGetFilter },
   { (char*)"getListedFilters", (char*)"(J)Ljava/util/List;", (void*)JniGetListedFilters },
   { (char*)"getSubscription", (char*)"(JLjava/lang/String;)" TYP("Subscription"), (void*)JniGetSubscription },
   { (char*)"getListedSubscriptions", (char*)"(J)Ljava/util/List;", (void*)JniGetListedSubscriptions },
   { (char*)"fetchAvailableSubscriptions", (char*)"(J)Ljava/util/List;", (void*)JniFetchAvailableSubscriptions },
   { (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;Ljava/lang/String;Ljava/lang/String;)" TYP("Filter"), (void*)JniMatches },
-  { (char*)"matches", (char*)"(JLjava/lang/String;Ljava/lang/String;[Ljava/lang/String;)" TYP("Filter"), (void*)JniMatchesMany },
+  { (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*)"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]));
 }