From 9271ee49552fd83537e8be0783cd6191cfaebcdc Mon Sep 17 00:00:00 2001
From: Sylwester Zielinski <sylwester.zielinski@nordicsemi.no>
Date: Mon, 3 Apr 2023 12:58:30 +0200
Subject: [PATCH] Improve logging

---
 .../android/nrftoolbox/viewmodel/HomeViewModel.kt      |  1 -
 .../android/uart/repository/UARTRepository.kt          |  1 -
 .../nordicsemi/android/uart/repository/UARTService.kt  | 10 ++++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt
index 3e817ba0..c156e5c0 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt
@@ -43,7 +43,6 @@ import kotlinx.coroutines.flow.onEach
 import no.nordicsemi.android.analytics.AppAnalytics
 import no.nordicsemi.android.analytics.ProfileOpenEvent
 import no.nordicsemi.android.cgms.repository.CGMRepository
-import no.nordicsemi.android.common.logger.NordicBlekLogger
 import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.common.navigation.DestinationId
 import no.nordicsemi.android.common.navigation.Navigator
diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
index 0cc31462..45a706e2 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
@@ -38,7 +38,6 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import no.nordicsemi.android.common.core.simpleSharedFlow
-import no.nordicsemi.android.common.logger.NordicBlekLogger
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
 import no.nordicsemi.android.service.DisconnectAndStopEvent
diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt
index ac0cec0b..e3aeeeb5 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt
@@ -33,6 +33,7 @@ package no.nordicsemi.android.uart.repository
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.util.Log
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.filterNotNull
@@ -49,6 +50,7 @@ import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.BleGattProperty
 import no.nordicsemi.android.kotlin.ble.core.data.BleWriteType
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
+import no.nordicsemi.android.kotlin.ble.core.data.Mtu
 import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser
 import no.nordicsemi.android.service.DEVICE_DATA
 import no.nordicsemi.android.service.NotificationService
@@ -106,11 +108,11 @@ internal class UARTService : NotificationService() {
 
         client.services
             .filterNotNull()
-            .onEach { configureGatt(it, device) }
+            .onEach { configureGatt(it, device, logger) }
             .launchIn(lifecycleScope)
     }
 
-    private suspend fun configureGatt(services: BleGattServices, device: ServerDevice) {
+    private suspend fun configureGatt(services: BleGattServices, device: ServerDevice, logger: NordicBlekLogger) {
         val uartService = services.findService(UART_SERVICE_UUID)!!
         val rxCharacteristic = uartService.findCharacteristic(UART_RX_CHARACTERISTIC_UUID)!!
         val txCharacteristic = uartService.findCharacteristic(UART_TX_CHARACTERISTIC_UUID)!!
@@ -124,13 +126,17 @@ internal class UARTService : NotificationService() {
 
         txCharacteristic.getNotifications()
             .onEach { repository.onNewMessageReceived(String(it)) }
+            .onEach { logger.log(10, "Received: ${String(it)}") }
             .launchIn(lifecycleScope)
 
         repository.command
             .onEach { rxCharacteristic.splitWrite(it.toByteArray(), getWriteType(rxCharacteristic)) }
             .onEach { repository.onNewMessageSent(it) }
+            .onEach { logger.log(10, "Sent: $it") }
             .launchIn(lifecycleScope)
 
+        client.requestMtu(Mtu.max)
+
         repository.onInitComplete(device)
     }