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 16 matching lines @@
   {
     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.

+  jclass contentTypeClass = env->GetObjectClass(jContentType);
+  jmethodID nameMethod = env->GetMethodID(contentTypeClass, "name",
                                           "()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
   {
@@ skipping 115 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);
   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::UpdateCheckDoneCallback
       updateCheckDoneCallback = 0;
 
   if (updaterPtr)
   {
     updateCheckDoneCallback =
         std::tr1::bind(&JniUpdateCheckDoneCallback::Callback, callback,
                        std::tr1::placeholders::_1);
@@ skipping 118 matching lines @@
   { (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]));
 }