Sync with blek

Author: sylwester-zielinski

app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt

@@ -115,7 +115,6 @@ data class DeviceInfo(
 ) {
     val name = device?.name ?: "Unknown"
     val address = device?.address ?: "Unknown"
-    val rssi = device?.highestRssi ?: 0
 }
 
 @Composable
@@ -148,8 +147,7 @@ private fun BasicViewsScreen(
         device?.let {
             Device(
                 deviceName = it.name,
-                deviceAddress = it.address,
-                rssi = it.rssi,
+                deviceAddress = it.address
             )
         }
 
@@ -162,8 +160,7 @@ private fun BasicViewsScreen(
 @Composable
 private fun Device(
     deviceName: String,
-    deviceAddress: String,
-    rssi: Int,
+    deviceAddress: String
 ) {
     Box(modifier = Modifier
         .clip(RoundedCornerShape(10.dp))
@@ -173,9 +170,7 @@ private fun Device(
         DeviceListItem(
             name = deviceName,
             address = deviceAddress,
-        ) {
-            RssiIcon(rssi = rssi)
-        }
+        )
     }
 }
 

settings.gradle.kts

@@ -49,7 +49,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:1.5.1")
+            from("no.nordicsemi.android.gradle:version-catalog:1.5.2")
         }
     }
 }

uiscanner/src/main/java/no/nordicsemi/android/common/ui/scanner/main/viewmodel/ScannerViewModel.kt

@@ -43,12 +43,14 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import no.nordicsemi.android.common.ui.scanner.repository.DevicesScanFilter
 import no.nordicsemi.android.common.ui.scanner.repository.ScannerRepository
 import no.nordicsemi.android.common.ui.scanner.repository.ScanningState
-import no.nordicsemi.android.kotlin.ble.core.ServerDevice
+import no.nordicsemi.android.kotlin.ble.scanner.aggregator.BleScanResultAggregator
+import no.nordicsemi.android.kotlin.ble.scanner.data.AggregatedBleScanItemWithRecord
 import no.nordicsemi.android.kotlin.ble.scanner.errors.ScanFailedError
 import no.nordicsemi.android.kotlin.ble.scanner.errors.ScanningFailedException
 import javax.inject.Inject
@@ -80,15 +82,17 @@ internal class ScannerViewModel @Inject constructor(
 
     private fun relaunchScanning() {
         currentJob?.cancel()
+        val aggregator = BleScanResultAggregator()
         currentJob = scannerRepository.getScannerState()
+            .map { aggregator.aggregate(it) }
             .filter { it.isNotEmpty() }
             .combine(filterConfig) { result, config  ->
                 result.applyFilters(config)
             }
             .onStart { _state.value = ScanningState.Loading }
             .cancellable()
             .onEach {
-                _state.value = ScanningState.DevicesDiscovered(it)
+                _state.value = ScanningState.DevicesDiscovered(it.map { it.device })
             }
             .catch {
                 _state.value = (it as? ScanningFailedException)?.let {
@@ -101,11 +105,10 @@ internal class ScannerViewModel @Inject constructor(
     // This can't be observed in View Model Scope, as it can exist even when the
     // scanner is not visible. Scanner state stops scanning when it is not observed.
     // .stateIn(viewModelScope, SharingStarted.Lazily, ScanningState.Loading)
-    private fun List<ServerDevice>.applyFilters(config: DevicesScanFilter) =
-            filter { !config.filterUuidRequired || it.serviceUuids.contains(uuid) }
+    private fun List<AggregatedBleScanItemWithRecord>.applyFilters(config: DevicesScanFilter) =
+            filter { !config.filterUuidRequired || it.lastScanResult?.scanRecord?.serviceUuids?.contains(uuid) == true }
             .filter { !config.filterNearbyOnly || it.highestRssi >= FILTER_RSSI }
-            .filter { !config.filterWithNames || it.hasName }
-
+            .filter { !config.filterWithNames || it.device.name.isNotEmpty() }
 
     fun setFilterUuid(uuid: ParcelUuid?) {
         this.uuid = uuid