Skip to content

Commit 436e968

Browse files
committed
Migrating logger to the new :logger module in Commons
1 parent 03bb425 commit 436e968

File tree

1 file changed

+7
-25
lines changed
  • profile/main/src/main/java/no/nordicsemi/android/dfu/profile/main/data

1 file changed

+7
-25
lines changed

profile/main/src/main/java/no/nordicsemi/android/dfu/profile/main/data/DFUManager.kt

+7-25
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,32 @@
3232
package no.nordicsemi.android.dfu.profile.main.data
3333

3434
import android.content.Context
35-
import android.util.Log
3635
import dagger.hilt.android.qualifiers.ApplicationContext
37-
import no.nordicsemi.android.common.logger.BleLoggerAndLauncher
38-
import no.nordicsemi.android.common.logger.DefaultBleLogger
3936
import no.nordicsemi.android.common.logger.LoggerLauncher
40-
import no.nordicsemi.android.dfu.DfuBaseService
4137
import no.nordicsemi.android.dfu.DfuServiceController
4238
import no.nordicsemi.android.dfu.DfuServiceInitiator
4339
import no.nordicsemi.android.dfu.DfuServiceListenerHelper
4440
import no.nordicsemi.android.dfu.profile.main.repository.DFUService
4541
import no.nordicsemi.android.dfu.profile.scanner.data.DfuTarget
4642
import no.nordicsemi.android.dfu.settings.domain.DFUSettings
43+
import no.nordicsemi.android.log.LogSession
44+
import no.nordicsemi.android.log.Logger
4745
import javax.inject.Inject
4846

4947
internal class DFUManager @Inject constructor(
5048
@ApplicationContext private val context: Context,
5149
) {
52-
private var logger: BleLoggerAndLauncher? = null
50+
private var session: LogSession? = null
5351

5452
fun install(
5553
file: ZipFile,
5654
target: DfuTarget,
5755
settings: DFUSettings
5856
): DfuServiceController {
59-
logger = DefaultBleLogger
60-
.create(context, null, target.address, target.name)
61-
.also {
57+
session = Logger.newSession(context, target.address, target.name)
58+
?.also { session ->
6259
DfuServiceListenerHelper.registerLogListener(context) { _, level, message ->
63-
// Convert nRF Logger log level to Android log priority, used by the BleLogger.
64-
val priority = when (level) {
65-
DfuBaseService.LOG_LEVEL_DEBUG -> Log.DEBUG
66-
DfuBaseService.LOG_LEVEL_VERBOSE -> Log.VERBOSE
67-
DfuBaseService.LOG_LEVEL_INFO -> Log.INFO
68-
DfuBaseService.LOG_LEVEL_WARNING -> Log.WARN
69-
DfuBaseService.LOG_LEVEL_ERROR -> Log.ERROR
70-
else -> level
71-
}
72-
it.log(priority, message)
60+
Logger.log(session, level, message)
7361
}
7462
}
7563

@@ -101,12 +89,6 @@ internal class DFUManager @Inject constructor(
10189
}
10290

10391
fun openLogger() {
104-
logger?.launch() ?: context.packageManager
105-
.getLaunchIntentForPackage("no.nordicsemi.android.log")
106-
?.let { launchIntent ->
107-
context.startActivity(launchIntent)
108-
} ?: run {
109-
LoggerLauncher.launch(context)
110-
}
92+
LoggerLauncher.launch(context, session)
11193
}
11294
}

0 commit comments

Comments
 (0)