fixed compiler warnings

Author: oliexdev

android_app/app/build.gradle.kts

@@ -8,7 +8,6 @@ import java.util.TimeZone
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt.android)
     alias(libs.plugins.ksp)
@@ -24,12 +23,12 @@ ksp {
 
 android {
     namespace = "com.health.openscale"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.health.openscale"
         minSdk = 31
-        targetSdk = 36
+        targetSdk = 37
         versionCode = 75
         versionName = "3.1.1"
 
@@ -50,7 +49,7 @@ android {
                     keystoreProperties.load(fis)
                 }
                 propertiesLoaded = true
-            } catch (e: FileNotFoundException) {
+            } catch (_: FileNotFoundException) {
                 project.logger.warn("Keystore properties file not found: ${keystorePropertiesFile.absolutePath}. Release signing might fail if not configured via environment variables.")
                 propertiesLoaded = false
             }
@@ -75,7 +74,7 @@ android {
                     keystoreOSSProperties.load(fis)
                 }
                 propertiesLoaded = true
-            } catch (e: FileNotFoundException) {
+            } catch (_: FileNotFoundException) {
                 project.logger.warn("OSS Keystore properties file not found: ${keystoreOSSPropertiesFile.absolutePath}. OSS signing might fail if not configured via environment variables.")
                 propertiesLoaded = false
             }
@@ -135,22 +134,37 @@ android {
         }
     }
 
-    applicationVariants.all {
-        val variant = this
-        val buildType = variant.buildType.name
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+
+    testOptions {
+        // JVM unit tests touch android.util.Log (via LogManager); return defaults
+        // instead of throwing "not mocked" so pure-logic tests can run on the JVM.
+        unitTests.isReturnDefaultValues = true
+    }
+}
+
+androidComponents {
+    onVariants { variant ->
         // Include the version number for every build type except debug.
-        val baseName = if (buildType == "debug") {
-            "openScale-$buildType"
+        val baseName = if (variant.buildType == "debug") {
+            "openScale-${variant.buildType}"
         } else {
-            "openScale-${defaultConfig.versionName}-$buildType"
+            "openScale-${android.defaultConfig.versionName}-${variant.buildType}"
         }
 
-        // APK naming.
-        outputs.all {
-            val output = this
-            if (output is com.android.build.gradle.internal.api.BaseVariantOutputImpl) {
-                output.outputFileName = "$baseName.apk"
-            }
+        // APK naming. outputFileName is the official replacement for the removed
+        // applicationVariants API but still marked @Incubating in AGP 9.
+        @Suppress("UnstableApiUsage")
+        variant.outputs.forEach { output ->
+            output.outputFileName.set("$baseName.apk")
         }
 
         // AAB naming: the outputs API above only covers APKs, so rename the
@@ -171,24 +185,9 @@ android {
             }
         }
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-
-    testOptions {
-        // JVM unit tests touch android.util.Log (via LogManager); return defaults
-        // instead of throwing "not mocked" so pure-logic tests can run on the JVM.
-        unitTests.isReturnDefaultValues = true
-    }
 }
 
+
 dependencies {
 
     implementation(libs.androidx.core.ktx)

android_app/app/src/main/java/com/health/openscale/core/bluetooth/ScaleFactory.kt

@@ -78,14 +78,15 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * Factory class responsible for creating appropriate [ScaleCommunicator] instances
  * for different Bluetooth scale devices.
  */
 @Singleton
 class ScaleFactory @Inject constructor(
-    @ApplicationContext private val applicationContext: Context,
+    @param:ApplicationContext private val applicationContext: Context,
     private val settingsFacade: SettingsFacade,
     private val measurementFacade: MeasurementFacade,
     private val userFacade: UserFacade,
@@ -155,7 +156,7 @@ class ScaleFactory @Inject constructor(
         val effectiveTuning: TuningProfile = run {
             val saved: String? = runCatching {
                 runBlocking(Dispatchers.IO) {
-                    withTimeout(250) {
+                    withTimeout(250.milliseconds) {
                         settingsFacade.savedBluetoothTuneProfile.firstOrNull()
                     }
                 }
@@ -205,7 +206,7 @@ class ScaleFactory @Inject constructor(
      * @return A [ScaleCommunicator] instance if a suitable handler or adapter is found, otherwise null.
      */
     fun createCommunicator(deviceInfo: ScannedDeviceInfo): ScaleCommunicator? {
-        val primaryIdentifier = deviceInfo.name ?: "UnknownDevice"
+        val primaryIdentifier = deviceInfo.name
         LogManager.d(TAG, "createCommunicator: Searching for communicator for '${primaryIdentifier}' (${deviceInfo.address}). Handler hint: '${deviceInfo.determinedHandlerDisplayName}'")
 
         // 1. Check if a modern Kotlin handler explicitly supports the device.

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/ActiveEraBF06Handler.kt

@@ -72,7 +72,7 @@ class ActiveEraBF06Handler : ScaleDeviceHandler() {
     override fun supportFor(device: ScannedDeviceInfo): DeviceSupport? {
         // Match by name heuristics and/or advertised service UUID
         val name = device.name.lowercase()
-        val hasSvc = device.serviceUuids?.any { it == SERVICE } == true
+        val hasSvc = device.serviceUuids.any { it == SERVICE }
         if (
             hasSvc ||
             name.contains("AE BS-06".lowercase())
@@ -196,7 +196,7 @@ class ActiveEraBF06Handler : ScaleDeviceHandler() {
             0x00 // checksum placeholder
         )
         // original legacy code summed 2..(len-3). We keep that to stay protocol-compatible.
-        pkt[pkt.lastIndex] = sumChecksum(pkt, from = 2, toExclusive = pkt.size - 3)
+        pkt[pkt.lastIndex] = sumChecksum(pkt, toExclusive = pkt.size - 3)
         return pkt
     }
 
@@ -355,10 +355,10 @@ class ActiveEraBF06Handler : ScaleDeviceHandler() {
 
     // --- Small helpers --------------------------------------------------------
 
-    /** Legacy "sumChecksum": sum of bytes in [from, toExclusive) truncated to 8-bit. */
-    private fun sumChecksum(data: ByteArray, from: Int, toExclusive: Int): Byte {
+    /** Legacy "sumChecksum": sum of bytes in [2, toExclusive) truncated to 8-bit. */
+    private fun sumChecksum(data: ByteArray, toExclusive: Int): Byte {
         var sum = 0
-        for (i in from until toExclusive) sum = (sum + (data[i].toInt() and 0xFF)) and 0xFF
+        for (i in 2 until toExclusive) sum = (sum + (data[i].toInt() and 0xFF)) and 0xFF
         return sum.toByte()
     }
 

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/BroadcastScaleAdapter.kt

@@ -34,6 +34,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.UUID
+import kotlin.time.Duration.Companion.milliseconds
 
 // -------------------------------------------------------------------------------------------------
 // Broadcast adapter (no GATT)
@@ -119,8 +120,8 @@ class BroadcastScaleAdapter(
                     lastForwardAtMs = t
                     LogManager.d(TAG, "Measurement stabilized → BroadcastComplete for ${peripheral.address}")
                     _events.tryEmit(BluetoothEvent.BroadcastComplete(peripheral.address))
-                    stopScanInternal(peripheral.address)
-                    cleanup(peripheral.address)
+                    stopScanInternal()
+                    cleanup()
                     broadcastAttached = false
                 }
             }
@@ -164,24 +165,24 @@ class BroadcastScaleAdapter(
         } catch (e: Exception) {
             LogManager.e(TAG, "Failed to start broadcast scan: ${e.message}", e)
             _events.tryEmit(BluetoothEvent.ConnectionFailed(address, e.message ?: context.getString(R.string.bt_error_generic)))
-            cleanup(address)
+            cleanup()
             return
         }
 
         // Arm scan timeout for this attempt
         scanTimeoutJob?.cancel()
         scanTimeoutJob = scope.launch {
-            delay(tuning.maxScanMs)
+            delay(tuning.maxScanMs.milliseconds)
             if (!isScanning) return@launch
             LogManager.w(TAG, "Broadcast scan timed out for $address")
-            stopScanInternal(address)
+            stopScanInternal()
 
             attempt++
             if (attempt <= tuning.common.maxRetries) {
-                delay(tuning.common.retryBackoffMs)
+                delay(tuning.common.retryBackoffMs.milliseconds)
                 startScanAttempt(address)
             } else {
-                cleanup(address)
+                cleanup()
                 // keep attached? we detach to be consistent with failure
                 runCatching { handler.handleDisconnected() }
                 runCatching { handler.detach() }
@@ -190,7 +191,7 @@ class BroadcastScaleAdapter(
         }
     }
 
-    private fun stopScanInternal(address: String) {
+    private fun stopScanInternal() {
         scanTimeoutJob?.cancel(); scanTimeoutJob = null
         runCatching { if (::central.isInitialized) central.stopScan() }
         isScanning = false
@@ -240,7 +241,7 @@ class BroadcastScaleAdapter(
     }
 
     override fun doDisconnect() {
-        stopScanInternal(targetAddress ?: "")
+        stopScanInternal()
         runCatching { handler.handleDisconnected() }
         runCatching { handler.detach() }
         broadcastAttached = false

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/DebugGattHandler.kt

@@ -19,7 +19,6 @@ import com.health.openscale.core.bluetooth.data.ScaleUser
 import com.health.openscale.core.service.ScannedDeviceInfo
 import java.util.Locale
 import java.util.UUID
-import kotlin.math.min
 
 /**
  * ## DebugGattHandler
@@ -117,7 +116,7 @@ class DebugGattHandler : ScaleDeviceHandler() {
             return
         }
 
-        val services = peripheral.services ?: emptyList()
+        val services = peripheral.services
         logD("=== GATT Service Dump BEGIN ===")
         if (services.isEmpty()) {
             logD( "(no services)")

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/DigooDGSO38HHandler.kt

@@ -48,7 +48,7 @@ class DigooDGSO38HHandler : ScaleDeviceHandler() {
     private val CHR_EXTRA get() = uuid16(0xFFF2) // write
 
     override fun supportFor(device: ScannedDeviceInfo): DeviceSupport? {
-        val name = device.name ?: return null
+        val name = device.name
         // Historically these scales often advertise as "Mengii". Keep both labels.
         val supported = name.equals("Mengii", true)
         if (!supported) return null

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/EbelterBodyFatB2Handler.kt

@@ -43,7 +43,7 @@ class EbelterBodyFatB2Handler : ScaleDeviceHandler() {
     private var lastPublishedFatRaw: Int = -1
 
     override fun supportFor(device: ScannedDeviceInfo): DeviceSupport? {
-        val name = (device.name ?: "").uppercase()
+        val name = device.name.uppercase()
 
         // En tus capturas sale como "Body Fat-B2"
         if (name.startsWith("BODY FAT-B2")) {

android_app/app/src/main/java/com/health/openscale/core/bluetooth/scales/EufyC20Handler.kt

@@ -2,6 +2,8 @@ package com.health.openscale.core.bluetooth.scales
 
 import android.bluetooth.le.ScanResult
 import android.util.SparseArray
+import androidx.core.util.isEmpty
+import androidx.core.util.size
 import com.health.openscale.core.bluetooth.data.ScaleMeasurement
 import com.health.openscale.core.bluetooth.data.ScaleUser
 import com.health.openscale.core.bluetooth.libs.MiScaleLib
@@ -32,7 +34,7 @@ class EufyC20Handler : ScaleDeviceHandler() {
 
     private fun extractManufacturerIds(m: Any?): Iterable<Int> = when (m) {
         is Map<*, *> -> m.keys.filterIsInstance<Int>()
-        is SparseArray<*> -> (0 until m.size()).mapNotNull { m.keyAt(it) as? Int }
+        is SparseArray<*> -> (0 until m.size).map { m.keyAt(it) }
         is List<*> -> m.mapNotNull {
             if (it is Pair<*, *>) (it.first as? Int) else null
         }
@@ -43,9 +45,7 @@ class EufyC20Handler : ScaleDeviceHandler() {
     override fun supportFor(device: ScannedDeviceInfo): DeviceSupport? {
         val m = device.manufacturerData
         if (m != null && extractManufacturerIds(m).any { it == MANUFACTURER_ID }) return deviceSupport
-        val name = device.name
-        if (name == null) return null
-        val un = name.uppercase(Locale.US)
+        val un = device.name.uppercase(Locale.US)
         if (un.startsWith("EUFY") && (un.contains("C20") || un.contains("T9130"))) {
             return deviceSupport
         }
@@ -56,12 +56,12 @@ class EufyC20Handler : ScaleDeviceHandler() {
     override fun onAdvertisement(result: ScanResult, user: ScaleUser): BroadcastAction {
         val msdRaw = result.scanRecord?.manufacturerSpecificData ?: return BroadcastAction.IGNORED
         val msd = msdRaw as? SparseArray<*> ?: return BroadcastAction.IGNORED
-        if (msd.size() == 0) return BroadcastAction.IGNORED
-        val values = (0 until msd.size()).mapNotNull { msd.valueAt(it) as? ByteArray }
+        if (msd.isEmpty()) return BroadcastAction.IGNORED
+        val values = (0 until msd.size).mapNotNull { msd.valueAt(it) as? ByteArray }
 
         val payload = values.firstOrNull { it.size >= 14 } ?: return BroadcastAction.IGNORED
 
-        return try {
+        try {
             val flags = payload[10].toInt() and 0xFF
             val hasWeight = (flags and 0x01) != 0
             val hasImpedance = (flags and 0x40) != 0