From a888c0cac81520a83e2bfc25466952f17774a003 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 19 Feb 2020 23:21:35 +0200
Subject: [PATCH] - Only show baresip lib debug messages when Debug has been
 enabled.

---
 app/src/main/cpp/baresip.c                               | 4 ++--
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt | 5 +++--
 app/src/main/kotlin/com/tutpro/baresip/Config.kt         | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c
index 71c7b8c2..a5e16a10 100644
--- a/app/src/main/cpp/baresip.c
+++ b/app/src/main/cpp/baresip.c
@@ -386,7 +386,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
 JNIEXPORT void JNICALL
 Java_com_tutpro_baresip_BaresipService_baresipStart(JNIEnv *env, jobject instance,
         jstring javaPath, jstring javaIpV4Addr, jstring javaIpV6Addr,
-        jstring javaNetInterface, jint javaNetAf) {
+        jstring javaNetInterface, jint javaNetAf, jint javaLogLevel) {
 
     LOGD("starting baresip\n");
 
@@ -421,7 +421,7 @@ Java_com_tutpro_baresip_BaresipService_baresipStart(JNIEnv *env, jobject instanc
 
     conf_path_set(path);
 
-    log_enable_debug(true);
+    log_level_set((enum log_level)javaLogLevel);
 
     err = conf_configure();
     if (err) {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index b10000c7..83fe42c2 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -304,7 +304,7 @@ class BaresipService: Service() {
                 if ((ipV4Addr == "") && (ipV6Addr == ""))
                     Log.w(LOG_TAG, "Starting baresip without IP addresses")
                 Thread(Runnable { baresipStart(filesPath, ipV4Addr, ipV6Addr, "",
-                        Api.AF_UNSPEC)
+                        Api.AF_UNSPEC, logLevel)
                 }).start()
 
                 isServiceRunning = true
@@ -1058,7 +1058,7 @@ class BaresipService: Service() {
     }
 
     external fun baresipStart(path: String, ipV4Addr: String, ipV6Addr: String, netInterface: String,
-                              netAf: Int)
+                              netAf: Int, logLevel: Int)
     external fun baresipStop(force: Boolean)
 
     companion object {
@@ -1092,6 +1092,7 @@ class BaresipService: Service() {
         var netInterface = ""
         var filesPath = ""
         var downloadsPath = ""
+        var logLevel = 2
 
         val uas = ArrayList<UserAgent>()
         val status = ArrayList<Int>()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index b6e4fad5..fd4c1571 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -49,12 +49,13 @@ object Config {
 
         if (!config.contains("log_level")) {
             config = "${config}log_level 2\n"
-            Api.log_level_set(2)
             Log.logLevel = Log.LogLevel.WARN
+            BaresipService.logLevel = 2
         } else {
             val ll = variable("log_level")[0].toInt()
-            Api.log_level_set(ll)
+            replaceVariable("log_level", "$ll")
             Log.logLevelSet(ll)
+            BaresipService.logLevel = ll
         }
 
         if (config.contains("net_interface")) {