aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-02-22 23:24:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change keys for nRF Logger.

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-04-01 13:27:07 +02:00
parent 91d1968d3b
commit b9c16355b0
10 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib_log/src/main/java/no/nordicsemi/android/log/ToolboxLogger.kt
View File

@@ -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
}
}

5
profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt
View File

@@ -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<BleManagerResult<BPSData>> = callbackFlow {
val scope = this
val manager = BPSManager(context, scope, logger)
val manager = BPSManager(context, scope, ToolboxLogger(context, "BPS"))
manager.dataHolder.status.onEach {
trySend(it)

5
profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt
View File

@@ -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 {

5
profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
View File

@@ -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 {

5
profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt
View File

@@ -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<BleManagerResult<GLSData>> = 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)

5
profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
View File

@@ -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 {

5
profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
View File

@@ -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 {

5
profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
View File

@@ -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)

5
profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
View File

@@ -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 {

5
profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
View File

@@ -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 {