From 40093790c72383f69243ff30c24e6d619fa757bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?=
 <sylwester.zielinski@nordicsemi.no>
Date: Mon, 4 Apr 2022 16:24:46 +0200
Subject: [PATCH] Add text loggin to UART profile

---
 .../java/no/nordicsemi/android/logger/ToolboxLogger.kt    | 5 ++---
 .../java/no/nordicsemi/android/uart/data/UARTManager.kt   | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt b/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt
index cc66e512..1354b732 100644
--- a/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt
+++ b/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt
@@ -1,8 +1,6 @@
 package no.nordicsemi.android.logger
 
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import android.util.Log
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
@@ -31,7 +29,8 @@ class ToolboxLogger @AssistedInject constructor(
         if (logSession != null) {
             Logger.log(logSession, LogContract.Log.Level.fromPriority(level), message)
         }
-        Log.println(level, LOG_TAG, message)
+        val logPriority = if (level <= Log.ASSERT) level else Log.INFO
+        Log.println(logPriority, LOG_TAG, message)
     }
 
     fun openLogger() {
diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
index 1d0f91d9..2205529b 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
@@ -21,6 +21,7 @@
  */
 package no.nordicsemi.android.uart.data
 
+import android.annotation.SuppressLint
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothGattService
@@ -36,6 +37,7 @@ import no.nordicsemi.android.ble.WriteRequest
 import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse
 import no.nordicsemi.android.ble.ktx.asFlow
 import no.nordicsemi.android.ble.ktx.asValidResponseFlow
+import no.nordicsemi.android.ble.ktx.suspend
 import no.nordicsemi.android.logger.ToolboxLogger
 import no.nordicsemi.android.service.ConnectionObserverAdapter
 import no.nordicsemi.android.utils.EMPTY
@@ -83,9 +85,11 @@ internal class UARTManager(
 
     private inner class UARTManagerGattCallback : BleManagerGattCallback() {
 
+        @SuppressLint("WrongConstant")
         override fun initialize() {
             setNotificationCallback(txCharacteristic).asFlow().onEach {
                 val text: String = it.getStringValue(0) ?: String.EMPTY
+                log(10, "\"$text\" received")
                 data.value = data.value.copy(messages = data.value.messages + UARTOutputRecord(text))
             }.launchIn(scope)
 
@@ -134,6 +138,7 @@ internal class UARTManager(
         }
     }
 
+    @SuppressLint("WrongConstant")
     fun send(text: String) {
         if (rxCharacteristic == null) return
         if (!TextUtils.isEmpty(text)) {
@@ -147,7 +152,8 @@ internal class UARTManager(
                 if (!useLongWrite) {
                     request.split()
                 }
-                request.enqueue()
+                request.suspend()
+                log(10, "\"$text\" sent")
             }
         }
     }