From 6ffbd9b07b94a88489c92a11e8c2f4effbcc992a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Mon, 4 Apr 2022 13:16:26 +0200 Subject: [PATCH] Change logging for nRF Toolbox --- .../main/java/no/nordicsemi/android/logger/ToolboxLogger.kt | 3 ++- .../java/no/nordicsemi/android/bps/repository/BPSRepository.kt | 2 +- .../no/nordicsemi/android/cgms/repository/CGMRepository.kt | 2 +- .../java/no/nordicsemi/android/csc/repository/CSCRepository.kt | 2 +- .../java/no/nordicsemi/android/gls/repository/GLSRepository.kt | 2 +- .../java/no/nordicsemi/android/hrs/service/HRSRepository.kt | 2 +- .../java/no/nordicsemi/android/hts/repository/HTSRepository.kt | 2 +- .../java/no/nordicsemi/android/prx/repository/PRXRepository.kt | 2 +- .../no/nordicsemi/android/rscs/repository/RSCSRepository.kt | 2 +- .../no/nordicsemi/android/uart/repository/UARTRepository.kt | 2 +- 10 files changed, 11 insertions(+), 10 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 668aab70..d0d2706e 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 @@ -11,6 +11,7 @@ internal const val LOG_TAG = "nRF Toolbox" class ToolboxLogger( private val context: Context, + private val profile: String, private val key: String, ) { @@ -25,7 +26,7 @@ class ToolboxLogger( } private fun getLogger(): LogSession? { - logSession = logSession ?: Logger.newSession(context, key, LOG_TAG) + logSession = logSession ?: Logger.newSession(context, profile, key, LOG_TAG) return logSession } } diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt index 0a8ee635..8205663e 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt @@ -23,7 +23,7 @@ internal class BPSRepository @Inject constructor( fun downloadData(device: BluetoothDevice): Flow> = callbackFlow { val scope = this - val manager = BPSManager(context, scope, ToolboxLogger(context, "BPS")) + val manager = BPSManager(context, scope, ToolboxLogger(context, "BPS", device.address)) manager.dataHolder.status.onEach { trySend(it) diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt index c68ce98c..2948f526 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt @@ -35,7 +35,7 @@ class CGMRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = CGMManager(context, scope, ToolboxLogger(context, "CGMS")) + val manager = CGMManager(context, scope, ToolboxLogger(context, "CGMS", device.address)) this.manager = manager manager.dataHolder.status.onEach { diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt index 6fafb794..a407bb46 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt @@ -36,7 +36,7 @@ class CSCRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = CSCManager(context, scope, ToolboxLogger(context, "CSC")) + val manager = CSCManager(context, scope, ToolboxLogger(context, "CSC", device.address)) this.manager = manager manager.dataHolder.status.onEach { diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt index 927f3d08..98f7cfa1 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt @@ -29,7 +29,7 @@ internal class GLSRepository @Inject constructor( fun downloadData(device: BluetoothDevice): Flow> = callbackFlow { val scope = this - val managerInstance = manager ?: GLSManager(context, scope, ToolboxLogger(context, "GLS")).apply { + val managerInstance = manager ?: GLSManager(context, scope, ToolboxLogger(context, "GLS", device.address)).apply { try { connect(device) .useAutoConnect(false) diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt index 36a67abb..1416e50e 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt @@ -35,7 +35,7 @@ class HRSRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = HRSManager(context, scope, ToolboxLogger(context, "HRS")) + val manager = HRSManager(context, scope, ToolboxLogger(context, "HRS", device.address)) this.manager = manager manager.dataHolder.status.onEach { diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt index fc24ba98..9a2d80fb 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt @@ -35,7 +35,7 @@ class HTSRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = HTSManager(context, scope, ToolboxLogger(context, "HTS")) + val manager = HTSManager(context, scope, ToolboxLogger(context, "HTS", device.address)) this.manager = manager manager.dataHolder.status.onEach { diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt index bce45b46..f07018cc 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt @@ -37,7 +37,7 @@ class PRXRepository @Inject internal constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = PRXManager(context, scope, ToolboxLogger(context, "PRX")) + val manager = PRXManager(context, scope, ToolboxLogger(context, "PRX", device.address)) this.manager = manager manager.useServer(proximityServerManager) diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt index 66e94ef9..8f54608d 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt @@ -35,7 +35,7 @@ class RSCSRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = RSCSManager(context, scope, ToolboxLogger(context, "RSCS")) + val manager = RSCSManager(context, scope, ToolboxLogger(context, "RSCS", device.address)) this.manager = manager manager.dataHolder.status.onEach { 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 0f82a40c..50175a99 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 @@ -37,7 +37,7 @@ class UARTRepository @Inject internal constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = UARTManager(context, scope, ToolboxLogger(context, "UART")) + val manager = UARTManager(context, scope, ToolboxLogger(context, "UART", device.address)) this.manager = manager manager.dataHolder.status.onEach {