Index: jni/JniLogSystem.cpp
diff --git a/jni/JniLogSystem.cpp b/jni/JniLogSystem.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b21b13e25058fa96c2e13068d5446d8f0f017979
--- /dev/null
+++ b/jni/JniLogSystem.cpp
@@ -0,0 +1,98 @@
+/*
+ * 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"
+
+static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
+{
+  try
+  {
+    return JniPtrToLong(new JniLogSystemCallback(env, callbackObject));
+  }
+  CATCH_THROW_AND_RETURN(env, 0)
+}
+
+static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
+{
+  delete JniLongToTypePtr<JniLogSystemCallback>(ptr);
+}
+
+JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject)
+  : JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem()
+{
+  logLevelClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("LogSystem$LogLevel"))));
+}
+
+void JniLogSystemCallback::operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source)
+{
+  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 = 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 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_libadblockplus_LogSystem_registerNatives(JNIEnv *env, jclass clazz)
+{
+  env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
+}