Merge pull request #997 from mpretty-cyro/feature/libsession-logging

Added code to output libSession logs

libsession-util/src/main/cpp/CMakeLists.txt

@@ -37,6 +37,7 @@ set(SOURCES
         group_keys.cpp
         group_info.cpp
         config_common.cpp
+        logging.cpp
 )
 
 add_library( # Sets the name of the library.
@@ -65,6 +66,7 @@ find_library( # Sets the name of the path variable.
 target_link_libraries( # Specifies the target library.
         session_util
         PUBLIC
+        libsession::util
         libsession::config
         libsession::crypto
         libsodium::sodium-internal

libsession-util/src/main/cpp/logging.cpp

@@ -0,0 +1,47 @@
+#include <jni.h>
+#include <android/log.h>
+#include <string_view>
+#include <functional>
+
+#include "session/logging.hpp"
+#include "session/log_level.h"
+
+#define LOG_TAG "LibSession"
+
+extern "C" JNIEXPORT void JNICALL
+Java_network_loki_messenger_libsession_1util_util_Logger_initLogger(JNIEnv* env, jclass clazz) {
+    session::add_logger([](std::string_view msg, std::string_view category, session::LogLevel level) {
+        android_LogPriority prio = ANDROID_LOG_VERBOSE;
+
+        switch (level.level) {
+            case LOG_LEVEL_TRACE:
+                prio = ANDROID_LOG_VERBOSE;
+                break;
+
+            case LOG_LEVEL_DEBUG:
+                prio = ANDROID_LOG_DEBUG;
+                break;
+
+            case LOG_LEVEL_INFO:
+                prio = ANDROID_LOG_INFO;
+                break;
+
+            case LOG_LEVEL_WARN:
+                prio = ANDROID_LOG_WARN;
+                break;
+
+            case LOG_LEVEL_ERROR:
+            case LOG_LEVEL_CRITICAL:
+                prio = ANDROID_LOG_ERROR;
+                break;
+
+            default:
+                prio = ANDROID_LOG_INFO;
+                break;
+        }
+
+        __android_log_print(prio, LOG_TAG, "%.*s [%.*s]",
+                    static_cast<int>(msg.size()), msg.data(),
+                    static_cast<int>(category.size()), category.data());
+});
+}

libsession-util/src/main/java/network/loki/messenger/libsession_util/util/Logger.kt

@@ -0,0 +1,11 @@
+package network.loki.messenger.libsession_util.util
+
+object Logger {
+
+    init {
+        System.loadLibrary("session_util")
+    }
+
+    @JvmStatic
+    external fun initLogger()
+}