| Index: jni/JniLogSystem.cpp | 
| diff --git a/jni/JniLogSystem.cpp b/jni/JniLogSystem.cpp | 
| new file mode 100644 | 
| index 0000000000000000000000000000000000000000..e67f9b53784bc1975a0a46ddb5f52d20e1c5c3cf | 
| --- /dev/null | 
| +++ b/jni/JniLogSystem.cpp | 
| @@ -0,0 +1,102 @@ | 
| +/* | 
| + * 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 | 
| + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| + * GNU General Public License for more details. | 
| + * | 
| + * You should have received a copy of the GNU General Public License | 
| + * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 
| + */ | 
| + | 
| +#include "JniCallbacks.h" | 
| + | 
| +AdblockPlus::Android::JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject) : | 
| + JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem() | 
| +{ | 
| + m_LogLevelClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("LogSystem$LogLevel")))); | 
| +} | 
| + | 
| +AdblockPlus::Android::JniLogSystemCallback::~JniLogSystemCallback() | 
| +{ | 
| +} | 
| + | 
| +void AdblockPlus::Android::JniLogSystemCallback::operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, | 
| + const std::string& source) | 
| +{ | 
| + AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM()); | 
| + | 
| + jclass clazz = env->GetObjectClass(GetCallbackObject()); | 
| + jmethodID method = env->GetMethodID(clazz, "logCallback", "(" TYP("LogSystem$LogLevel") "Ljava/lang/String;Ljava/lang/String;)V"); | 
| + | 
| + // TODO: Set log level from Java and handle it here (to reduce C++->Java calls) | 
| + | 
| + if (method) | 
| + { | 
| + const char* enumName = 0; | 
| + | 
| + switch (logLevel) | 
| + { | 
| + default: | 
| + case AdblockPlus::LogSystem::LOG_LEVEL_TRACE: | 
| + enumName = "TRACE"; | 
| + break; | 
| + case AdblockPlus::LogSystem::LOG_LEVEL_LOG: | 
| + enumName = "LOG"; | 
| + break; | 
| + case AdblockPlus::LogSystem::LOG_LEVEL_INFO: | 
| + enumName = "INFO"; | 
| + break; | 
| + case AdblockPlus::LogSystem::LOG_LEVEL_WARN: | 
| + enumName = "WARN"; | 
| + break; | 
| + case AdblockPlus::LogSystem::LOG_LEVEL_ERROR: | 
| + enumName = "ERROR"; | 
| + break; | 
| + } | 
| + | 
| + jclass enumClass = m_LogLevelClass->get(); | 
| + if (enumClass) | 
| + { | 
| + jfieldID enumField = env->GetStaticFieldID(enumClass, enumName, TYP("LogSystem$LogLevel")); | 
| + jobject jLogLevel = env->GetStaticObjectField(enumClass, enumField); | 
| + | 
| + jstring jMessage = env->NewStringUTF(message.c_str()); | 
| + jstring jSource = env->NewStringUTF(source.c_str()); | 
| + | 
| + env->CallVoidMethod(GetCallbackObject(), method, jLogLevel, jMessage, jSource); | 
| + } | 
| + | 
| + CheckAndLogJavaException(*env); | 
| + } | 
| +} | 
| + | 
| +static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject) | 
| +{ | 
| + TRY | 
| + { | 
| + return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::Android::JniLogSystemCallback(env, callbackObject)); | 
| + } | 
| + CATCH_THROW_AND_RETURN(env, 0) | 
| +} | 
| + | 
| +static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr) | 
| +{ | 
| + delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::Android::JniLogSystemCallback>(ptr); | 
| +} | 
| + | 
| +static JNINativeMethod methods[] = | 
| +{ | 
| +{ (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, | 
| +{ (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, }; | 
| + | 
| +extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_LogSystem_registerNatives(JNIEnv *env, jclass clazz) | 
| +{ | 
| + env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); | 
| +} |