Merge pull request #108 from NordicSemiconductor/bug/logging

Bug/logging

Author: sylwester-zielinski

app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import no.nordicsemi.android.logger.LoggerAppRunner
 import no.nordicsemi.android.nrftoolbox.BuildConfig
 import no.nordicsemi.android.nrftoolbox.ProfileDestination
 import no.nordicsemi.android.nrftoolbox.R
@@ -24,7 +25,6 @@ private const val DFU_PACKAGE_NAME = "no.nordicsemi.android.dfu"
 private const val DFU_LINK = "https://play.google.com/store/apps/details?id=no.nordicsemi.android.dfu"
 
 private const val LOGGER_PACKAGE_NAME = "no.nordicsemi.android.log"
-private const val LOGGER_LINK = "https://play.google.com/store/apps/details?id=no.nordicsemi.android.log"
 
 @Composable
 fun HomeScreen() {
@@ -148,12 +148,7 @@ fun HomeScreen() {
                 } ?: R.string.dfu_module_install
 
                 FeatureButton(R.drawable.ic_logger, R.string.logger_module, R.string.logger_module_full, null, loggerDescription) {
-                    val intent = packageManger.getLaunchIntentForPackage(LOGGER_PACKAGE_NAME)
-                    if (intent != null) {
-                        context.startActivity(intent)
-                    } else {
-                        uriHandler.openUri(LOGGER_LINK)
-                    }
+                    viewModel.openLogger()
                 }
 
                 Spacer(modifier = Modifier.height(16.dp))

app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt

@@ -12,6 +12,7 @@ import no.nordicsemi.android.cgms.repository.CGMRepository
 import no.nordicsemi.android.csc.repository.CSCRepository
 import no.nordicsemi.android.hrs.service.HRSRepository
 import no.nordicsemi.android.hts.repository.HTSRepository
+import no.nordicsemi.android.logger.LoggerAppRunner
 import no.nordicsemi.android.navigation.NavigationManager
 import no.nordicsemi.android.nrftoolbox.ProfileDestination
 import no.nordicsemi.android.nrftoolbox.repository.ActivitySignals
@@ -32,6 +33,7 @@ class HomeViewModel @Inject constructor(
     prxRepository: PRXRepository,
     rscsRepository: RSCSRepository,
     uartRepository: UARTRepository,
+    private val loggerAppRunner: LoggerAppRunner
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(HomeViewState())
@@ -74,4 +76,8 @@ class HomeViewModel @Inject constructor(
     fun openProfile(destination: ProfileDestination) {
         navigationManager.navigateTo(destination.destination.id)
     }
+
+    fun openLogger() {
+        loggerAppRunner.runLogger()
+    }
 }

lib_log/src/main/java/no/nordicsemi/android/logger/LoggerAppRunner.kt

@@ -0,0 +1,44 @@
+package no.nordicsemi.android.logger
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.ui.platform.AndroidUriHandler
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+private const val LOGGER_PACKAGE_NAME = "no.nordicsemi.android.log"
+private const val LOGGER_LINK = "https://play.google.com/store/apps/details?id=no.nordicsemi.android.log"
+
+class LoggerAppRunner @Inject constructor(
+    @ApplicationContext
+    private val context: Context
+) {
+
+    fun runLogger() {
+        val packageManger = context.packageManager
+        val uriHandler = AndroidUriHandler(context)
+
+        val intent = packageManger.getLaunchIntentForPackage(LOGGER_PACKAGE_NAME)
+        if (intent != null) {
+            context.startActivity(intent)
+        } else {
+            uriHandler.openUri(LOGGER_LINK)
+        }
+    }
+
+    fun runLogger(uri: Uri?) {
+        val packageManger = context.packageManager
+
+        val intent = packageManger.getLaunchIntentForPackage(LOGGER_PACKAGE_NAME)
+
+        val targetUri = if (intent != null && uri != null) {
+            uri
+        } else {
+            Uri.parse(LOGGER_LINK)
+        }
+        val launchIntent = Intent(Intent.ACTION_VIEW, targetUri)
+        launchIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        context.startActivity(launchIntent)
+    }
+}

lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt

@@ -2,15 +2,23 @@ package no.nordicsemi.android.logger
 
 import android.content.Context
 import android.util.Log
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.qualifiers.ApplicationContext
 import no.nordicsemi.android.log.LogContract
 import no.nordicsemi.android.log.LogSession
 import no.nordicsemi.android.log.Logger
 import no.nordicsemi.android.log.annotation.LogLevel
 
 internal const val LOG_TAG = "nRF Toolbox"
 
-class ToolboxLogger(
+class ToolboxLogger @AssistedInject constructor(
+    @ApplicationContext
     private val context: Context,
+    private val appRunner: LoggerAppRunner,
+    @Assisted("profile")
+    private val profile: String,
+    @Assisted("key")
     private val key: String,
 ) {
 
@@ -21,11 +29,17 @@ class ToolboxLogger(
         if (logSession != null) {
             Logger.log(logSession, LogContract.Log.Level.fromPriority(level), message)
         }
-        Log.println(level, LOG_TAG, message)
+        val logPriority = if (level <= Log.ASSERT) level else Log.INFO
+        Log.println(logPriority, LOG_TAG, message)
+    }
+
+    fun openLogger() {
+        appRunner.runLogger(logSession?.sessionUri)
     }
 
     private fun getLogger(): LogSession? {
-        logSession = logSession ?: Logger.newSession(context, key, LOG_TAG)
+        logSession = logSession ?: Logger.newSession(context, profile, key, LOG_TAG)
+        logSession?.sessionsUri
         return logSession
     }
 }

lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLoggerFactory.kt

@@ -0,0 +1,10 @@
+package no.nordicsemi.android.logger
+
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+
+@AssistedFactory
+interface ToolboxLoggerFactory {
+
+    fun create(@Assisted("profile") profile: String, @Assisted("key") key: String): ToolboxLogger
+}

app/src/main/res/drawable/ic_logger.xml renamed to lib_log/src/main/res/drawable/ic_logger.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="1024dp"
-    android:height="1024dp"
+    android:width="80dp"
+    android:height="80dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
   <path

lib_theme/build.gradle

@@ -1,6 +1,8 @@
 apply from: rootProject.file("library.gradle")
 
 dependencies {
+    implementation project(":lib_log")
+
     implementation libs.material
 
     implementation libs.nordic.theme

lib_theme/src/main/java/no/nordicsemi/android/theme/view/TopAppBar.kt

@@ -1,5 +1,6 @@
 package no.nordicsemi.android.theme.view
 
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
@@ -10,8 +11,13 @@ import androidx.compose.material3.SmallTopAppBar
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.theme.R
 
 @Composable
@@ -68,6 +74,48 @@ fun BackIconAppBar(text: String, onClick: () -> Unit) {
                     contentDescription = stringResource(id = R.string.back_screen),
                 )
             }
+        },
+        actions = {
+            IconButton(onClick = { onClick() }) {
+                Icon(
+                    painterResource(id = R.drawable.ic_logger),
+                    contentDescription = stringResource(id = R.string.back_screen),
+                    tint = MaterialTheme.colorScheme.onPrimary,
+                    modifier = Modifier.size(24.dp)
+                )
+            }
+        }
+    )
+}
+
+@Composable
+fun LoggerIconAppBar(text: String, onClick: () -> Unit, onLoggerClick: () -> Unit) {
+    SmallTopAppBar(
+        title = { Text(text) },
+        colors = TopAppBarDefaults.smallTopAppBarColors(
+            scrolledContainerColor = MaterialTheme.colorScheme.primary,
+            containerColor = colorResource(id = R.color.appBarColor),
+            titleContentColor = MaterialTheme.colorScheme.onPrimary,
+            actionIconContentColor = MaterialTheme.colorScheme.onPrimary,
+            navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,
+        ),
+        navigationIcon = {
+            IconButton(onClick = { onClick() }) {
+                Icon(
+                    Icons.Default.ArrowBack,
+                    contentDescription = stringResource(id = R.string.back_screen),
+                )
+            }
+        },
+        actions = {
+            IconButton(onClick = { onLoggerClick() }) {
+                Icon(
+                    painterResource(id = R.drawable.ic_logger),
+                    contentDescription = stringResource(id = R.string.back_screen),
+                    tint = MaterialTheme.colorScheme.onPrimary,
+                    modifier = Modifier.size(24.dp)
+                )
+            }
         }
     )
 }

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

@@ -12,18 +12,25 @@ import kotlinx.coroutines.flow.onEach
 import no.nordicsemi.android.bps.data.BPSData
 import no.nordicsemi.android.bps.data.BPSManager
 import no.nordicsemi.android.logger.ToolboxLogger
+import no.nordicsemi.android.logger.ToolboxLoggerFactory
 import no.nordicsemi.android.service.BleManagerResult
 import javax.inject.Inject
 
 @ViewModelScoped
 internal class BPSRepository @Inject constructor(
     @ApplicationContext
-    private val context: Context
+    private val context: Context,
+    private val toolboxLoggerFactory: ToolboxLoggerFactory
 ) {
 
+    private var logger: ToolboxLogger? = null
+
     fun downloadData(device: BluetoothDevice): Flow<BleManagerResult<BPSData>> = callbackFlow {
         val scope = this
-        val manager = BPSManager(context, scope, ToolboxLogger(context, "BPS"))
+        val createdLogger = toolboxLoggerFactory.create("BPS", device.address).also {
+            logger = it
+        }
+        val manager = BPSManager(context, scope, createdLogger)
 
         manager.dataHolder.status.onEach {
             trySend(it)
@@ -36,6 +43,12 @@ internal class BPSRepository @Inject constructor(
 
         awaitClose {
             manager.disconnect().enqueue()
+            logger = null
         }
     }
+
+    fun openLogger() {
+        logger?.openLogger()
+    }
+
 }

profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt

@@ -12,6 +12,7 @@ import no.nordicsemi.android.bps.R
 import no.nordicsemi.android.bps.viewmodel.BPSViewModel
 import no.nordicsemi.android.service.*
 import no.nordicsemi.android.theme.view.BackIconAppBar
+import no.nordicsemi.android.theme.view.LoggerIconAppBar
 import no.nordicsemi.ui.scanner.ui.DeviceConnectingView
 import no.nordicsemi.ui.scanner.ui.NoDeviceView
 import no.nordicsemi.android.utils.exhaustive
@@ -26,8 +27,10 @@ fun BPSScreen() {
     Column {
         val navigateUp = { viewModel.onEvent(DisconnectEvent) }
 
-        BackIconAppBar(stringResource(id = R.string.bps_title)) {
+        LoggerIconAppBar(stringResource(id = R.string.bps_title), {
             viewModel.onEvent(DisconnectEvent)
+        }) {
+            viewModel.onEvent(OpenLoggerEvent)
         }
 
         Column(modifier = Modifier.verticalScroll(rememberScrollState())) {