diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2f37213b..16581bec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -31,7 +31,7 @@ #Mon Feb 14 14:46:55 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/lib_scanner/src/main/java/no/nordicsemi/android/toolbox/scanner/ScannerDestination.kt b/lib_scanner/src/main/java/no/nordicsemi/android/toolbox/scanner/ScannerDestination.kt index 8e86d360..5fb80fb9 100644 --- a/lib_scanner/src/main/java/no/nordicsemi/android/toolbox/scanner/ScannerDestination.kt +++ b/lib_scanner/src/main/java/no/nordicsemi/android/toolbox/scanner/ScannerDestination.kt @@ -9,6 +9,7 @@ import no.nordicsemi.android.common.ui.scanner.DeviceSelected import no.nordicsemi.android.common.ui.scanner.ScannerScreen import no.nordicsemi.android.common.ui.scanner.ScanningCancelled import no.nordicsemi.android.kotlin.ble.core.ServerDevice +import java.util.* val ScannerDestinationId = createDestination("uiscanner-destination") @@ -18,7 +19,7 @@ val ScannerDestination = defineDestination(ScannerDestinationId) { val arg = navigationViewModel.parameterOf(ScannerDestinationId) ScannerScreen( - uuid = arg, + uuid = ParcelUuid(UUID.fromString("00001816-0000-1000-8000-00805f9b34fb")), onResult = { when (it) { is DeviceSelected -> navigationViewModel.navigateUpWithResult(ScannerDestinationId, it.device) 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 a8a22517..85f67a79 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 @@ -37,7 +37,6 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import no.nordicsemi.android.common.logger.NordicLogger -import no.nordicsemi.android.common.logger.NordicLoggerFactory import no.nordicsemi.android.csc.data.CSCServicesData import no.nordicsemi.android.kotlin.ble.core.ServerDevice import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState @@ -45,7 +44,6 @@ import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSizes import no.nordicsemi.android.service.ServiceManager -import no.nordicsemi.android.ui.view.StringConst import javax.inject.Inject import javax.inject.Singleton @@ -54,8 +52,6 @@ class CSCRepository @Inject constructor( @ApplicationContext private val context: Context, private val serviceManager: ServiceManager, - private val loggerFactory: NordicLoggerFactory, - private val stringConst: StringConst ) { private var logger: NordicLogger? = null @@ -66,8 +62,6 @@ class CSCRepository @Inject constructor( internal val data = _data.asStateFlow() val isRunning = data.map { it.connectionState == GattConnectionState.STATE_CONNECTED } - val hasBeenDisconnected = - data.map { it.connectionState != GattConnectionState.STATE_CONNECTED && it.connectionState != GattConnectionState.STATE_CONNECTING } fun launch(device: ServerDevice) { serviceManager.startService(CSCService::class.java, device) diff --git a/settings.gradle.kts b/settings.gradle.kts index b0a6d835..8383a4f7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -49,7 +49,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("no.nordicsemi.android.gradle:version-catalog:1.3.1") + from("no.nordicsemi.android.gradle:version-catalog:1.3.3") } } }