From b9c16355b01d35064c9cd2e1c532739192977161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Fri, 1 Apr 2022 13:27:07 +0200 Subject: [PATCH] Change keys for nRF Logger. --- .../java/no/nordicsemi/android/log/ToolboxLogger.kt | 10 +++------- .../nordicsemi/android/bps/repository/BPSRepository.kt | 5 ++--- .../android/cgms/repository/CGMRepository.kt | 5 ++--- .../nordicsemi/android/csc/repository/CSCRepository.kt | 5 ++--- .../nordicsemi/android/gls/repository/GLSRepository.kt | 5 ++--- .../no/nordicsemi/android/hrs/service/HRSRepository.kt | 5 ++--- .../nordicsemi/android/hts/repository/HTSRepository.kt | 5 ++--- .../nordicsemi/android/prx/repository/PRXRepository.kt | 5 ++--- .../android/rscs/repository/RSCSRepository.kt | 5 ++--- .../android/uart/repository/UARTRepository.kt | 5 ++--- 10 files changed, 21 insertions(+), 34 deletions(-) diff --git a/lib_log/src/main/java/no/nordicsemi/android/log/ToolboxLogger.kt b/lib_log/src/main/java/no/nordicsemi/android/log/ToolboxLogger.kt index d48742c2..5aad0cea 100644 --- a/lib_log/src/main/java/no/nordicsemi/android/log/ToolboxLogger.kt +++ b/lib_log/src/main/java/no/nordicsemi/android/log/ToolboxLogger.kt @@ -2,17 +2,13 @@ package no.nordicsemi.android.log import android.content.Context import android.util.Log -import dagger.hilt.android.qualifiers.ApplicationContext import no.nordicsemi.android.log.annotation.LogLevel -import javax.inject.Inject -import javax.inject.Singleton internal const val LOG_TAG = "nRF Toolbox" -@Singleton -class ToolboxLogger @Inject constructor( - @ApplicationContext +class ToolboxLogger( private val context: Context, + private val key: String, ) { private var logSession: LogSession? = null @@ -26,7 +22,7 @@ class ToolboxLogger @Inject constructor( } private fun getLogger(): LogSession? { - logSession = logSession ?: Logger.newSession(context, "key", LOG_TAG) + logSession = logSession ?: Logger.newSession(context, 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 93849269..f01a8644 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 @@ -18,13 +18,12 @@ import javax.inject.Inject @ViewModelScoped internal class BPSRepository @Inject constructor( @ApplicationContext - private val context: Context, - private val logger: ToolboxLogger + private val context: Context ) { fun downloadData(device: BluetoothDevice): Flow> = callbackFlow { val scope = this - val manager = BPSManager(context, scope, logger) + val manager = BPSManager(context, scope, ToolboxLogger(context, "BPS")) 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 76f4769a..39d36352 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 @@ -20,8 +20,7 @@ import javax.inject.Singleton class CGMRepository @Inject constructor( @ApplicationContext private val context: Context, - private val serviceManager: ServiceManager, - private val logger: ToolboxLogger + private val serviceManager: ServiceManager ) { private var manager: CGMManager? = null @@ -36,7 +35,7 @@ class CGMRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = CGMManager(context, scope, logger) + val manager = CGMManager(context, scope, ToolboxLogger(context, "CGMS")) 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 9681f49d..7fdaed7a 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 @@ -21,8 +21,7 @@ import javax.inject.Singleton class CSCRepository @Inject constructor( @ApplicationContext private val context: Context, - private val serviceManager: ServiceManager, - private val logger: ToolboxLogger + private val serviceManager: ServiceManager ) { private var manager: CSCManager? = null @@ -37,7 +36,7 @@ class CSCRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = CSCManager(context, scope, logger) + val manager = CSCManager(context, scope, ToolboxLogger(context, "CSC")) 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 30c9dde3..f3a497f1 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 @@ -22,15 +22,14 @@ import javax.inject.Inject @ViewModelScoped internal class GLSRepository @Inject constructor( @ApplicationContext - private val context: Context, - private val logger: ToolboxLogger + private val context: Context ) { private var manager: GLSManager? = null fun downloadData(device: BluetoothDevice): Flow> = callbackFlow { val scope = this - val managerInstance = manager ?: GLSManager(context, scope, logger).apply { + val managerInstance = manager ?: GLSManager(context, scope, ToolboxLogger(context, "GLS")).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 5a1f4f6f..4d5ba9f5 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 @@ -20,8 +20,7 @@ import javax.inject.Singleton class HRSRepository @Inject constructor( @ApplicationContext private val context: Context, - private val serviceManager: ServiceManager, - private val logger: ToolboxLogger + private val serviceManager: ServiceManager ) { private var manager: HRSManager? = null @@ -36,7 +35,7 @@ class HRSRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = HRSManager(context, scope, logger) + val manager = HRSManager(context, scope, ToolboxLogger(context, "HRS")) 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 da55b0c2..f3ce5923 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 @@ -20,8 +20,7 @@ import javax.inject.Singleton class HTSRepository @Inject constructor( @ApplicationContext private val context: Context, - private val serviceManager: ServiceManager, - private val logger: ToolboxLogger + private val serviceManager: ServiceManager ) { private var manager: HTSManager? = null @@ -36,7 +35,7 @@ class HTSRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = HTSManager(context, scope, logger) + val manager = HTSManager(context, scope, ToolboxLogger(context, "HTS")) 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 ba99dbe8..0a74710b 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 @@ -20,8 +20,7 @@ class PRXRepository @Inject internal constructor( private val context: Context, private val serviceManager: ServiceManager, private val proximityServerManager: ProximityServerManager, - private val alarmHandler: AlarmHandler, - private val logger: ToolboxLogger + private val alarmHandler: AlarmHandler ) { private var manager: PRXManager? = null @@ -38,7 +37,7 @@ class PRXRepository @Inject internal constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = PRXManager(context, scope, logger) + val manager = PRXManager(context, scope, ToolboxLogger(context, "PRX")) 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 006873c4..8adcb6d1 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 @@ -20,8 +20,7 @@ import javax.inject.Singleton class RSCSRepository @Inject constructor( @ApplicationContext private val context: Context, - private val serviceManager: ServiceManager, - private val logger: ToolboxLogger + private val serviceManager: ServiceManager ) { private var manager: RSCSManager? = null @@ -36,7 +35,7 @@ class RSCSRepository @Inject constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = RSCSManager(context, scope, logger) + val manager = RSCSManager(context, scope, ToolboxLogger(context, "RSCS")) 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 a63d2c3e..8d5daa4f 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 @@ -20,8 +20,7 @@ class UARTRepository @Inject internal constructor( @ApplicationContext private val context: Context, private val serviceManager: ServiceManager, - private val configurationDataSource: ConfigurationDataSource, - private val logger: ToolboxLogger + private val configurationDataSource: ConfigurationDataSource ) { private var manager: UARTManager? = null @@ -38,7 +37,7 @@ class UARTRepository @Inject internal constructor( } fun start(device: BluetoothDevice, scope: CoroutineScope) { - val manager = UARTManager(context, scope, logger) + val manager = UARTManager(context, scope, ToolboxLogger(context, "UART")) this.manager = manager manager.dataHolder.status.onEach {