chore: meege upstream branch

.github/workflows/ci_master.yml

@@ -48,6 +48,46 @@ jobs:
           files: |
             android_app/app/build/outputs/apk/debug/openScale-debug.apk
 
+  # Publish the "Supported scales in openScale" wiki page, generated from the handler registry by
+  # ScaleCatalogTest. The page is a build artifact: hand edits in the wiki are overwritten, while
+  # the remarks column and the photo gallery are edited in
+  # android_app/app/src/test/resources/scale_catalog_{remarks.txt,gallery.md}.
+  publish-scale-catalog:
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "21"
+      - name: Checkout wiki
+        run: git clone "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.wiki.git" wiki
+      - name: Generate the supported scales page
+        working-directory: android_app
+        env:
+          SCALE_CATALOG_OUT: ${{ github.workspace }}/wiki/Supported-scales-in-openScale.md
+        run: |
+          ./gradlew testDebugUnitTest --tests '*ScaleCatalogTest'
+          # A skipped (up-to-date) test task would leave the page untouched and the job green.
+          test -s "$SCALE_CATALOG_OUT"
+      - name: Push the page if it changed
+        working-directory: wiki
+        run: |
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "Wiki already up to date."
+            exit 0
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add Supported-scales-in-openScale.md
+          git commit -m "Update supported scales from the handler registry (${GITHUB_SHA::7})"
+          git push
+
   # Keep the `weblate` branch (Weblate's push target) in sync with master so
   # Weblate's rebased translation pushes stay fast-forward and don't fail.
   sync-weblate:

README.md

@@ -42,7 +42,7 @@ openScale has built-in support for a number of Bluetooth (BLE or "smart") scales
 - Silvercrest SBF75, SBF77
 - Vigorun
 - Xiaomi Mi scale v1 and v2
-- Yunmai Mini and SE
+- Yunmai Mini, SE and X
 - iHealth HS3
 - Easy Home 64050
 - and many more

android_app/app/build.gradle.kts

@@ -29,8 +29,8 @@ android {
         applicationId = "com.health.openscale"
         minSdk = 31
         targetSdk = 37
-        versionCode = 75
-        versionName = "3.1.1"
+        versionCode = 76
+        versionName = "3.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["appName"] = "openScale"

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

@@ -18,9 +18,12 @@
 package com.health.openscale.core.bluetooth
 
 import android.content.Context
+import androidx.annotation.VisibleForTesting
 import com.health.openscale.core.bluetooth.scales.BeurerBF450Handler
 import com.health.openscale.core.bluetooth.scales.ScaleDeviceHandler
 import com.health.openscale.core.bluetooth.scales.AAAxHandler
+import com.health.openscale.core.bluetooth.scales.FitTrackDaraHandler
+import com.health.openscale.core.bluetooth.scales.ScaleupHandler
 import com.health.openscale.core.bluetooth.scales.ActiveEraBF06Handler
 import com.health.openscale.core.bluetooth.scales.CultSmartScaleProHandler
 import com.health.openscale.core.bluetooth.scales.BeurerSanitasHandler
@@ -36,13 +39,16 @@ import com.health.openscale.core.bluetooth.scales.EufyC20Handler
 import com.health.openscale.core.bluetooth.scales.EufyP2Handler
 import com.health.openscale.core.bluetooth.scales.EbelterBodyFatB2Handler
 import com.health.openscale.core.bluetooth.scales.EtekcityESF551Handler
+import com.health.openscale.core.bluetooth.scales.EtekcityFit8SHandler
 import com.health.openscale.core.bluetooth.scales.GattScaleAdapter
 import com.health.openscale.core.bluetooth.scales.HesleyHandler
 import com.health.openscale.core.bluetooth.scales.HoffenBbs8107Handler
 import com.health.openscale.core.bluetooth.scales.HuaweiAhCh100Handler
 import com.health.openscale.core.bluetooth.scales.HuaweiCH100SHandler
+import com.health.openscale.core.bluetooth.scales.HuaweiHagridWspHandler
 import com.health.openscale.core.bluetooth.scales.IHealthHS3Handler
 import com.health.openscale.core.bluetooth.scales.InlifeHandler
+import com.health.openscale.core.bluetooth.scales.KeepS3Handler
 import com.health.openscale.core.bluetooth.scales.LinkMode
 import com.health.openscale.core.bluetooth.scales.MGBHandler
 import com.health.openscale.core.bluetooth.scales.MedisanaBs44xHandler
@@ -51,15 +57,18 @@ import com.health.openscale.core.bluetooth.scales.MiScaleS400Handler
 import com.health.openscale.core.bluetooth.scales.XiaomiS800Handler
 import com.health.openscale.core.bluetooth.scales.BodyConnectHandler
 import com.health.openscale.core.bluetooth.scales.OkOkHandler
+import com.health.openscale.core.bluetooth.scales.OmronWlcHandler
 import com.health.openscale.core.bluetooth.scales.OneByoneHandler
 import com.health.openscale.core.bluetooth.scales.OneByoneNewHandler
 import com.health.openscale.core.bluetooth.scales.QNHandler
 import com.health.openscale.core.bluetooth.scales.QNHandlerBroadcast
 import com.health.openscale.core.bluetooth.scales.RealmeSmartScaleHandler
 import com.health.openscale.core.bluetooth.scales.RenphoES26BBHandler
 import com.health.openscale.core.bluetooth.scales.RenphoHandler
+import com.health.openscale.core.bluetooth.scales.RelaxmedicHandler
 import com.health.openscale.core.bluetooth.scales.RobiS9Handler
 import com.health.openscale.core.bluetooth.scales.RunstarR5Handler
+import com.health.openscale.core.bluetooth.scales.RunstarR6Handler
 import com.health.openscale.core.bluetooth.scales.RyFitHandler
 import com.health.openscale.core.bluetooth.scales.SanitasSbf72Handler
 import com.health.openscale.core.bluetooth.scales.SenssunHandler
@@ -68,17 +77,22 @@ import com.health.openscale.core.bluetooth.scales.SoehnleHandler
 import com.health.openscale.core.bluetooth.scales.SppScaleAdapter
 import com.health.openscale.core.bluetooth.scales.TaylorBIAHandler
 import com.health.openscale.core.bluetooth.scales.DrTrustSSW532Handler
+import com.health.openscale.core.bluetooth.scales.EEBBLHandler
 import com.health.openscale.core.bluetooth.scales.StandardBeurerSanitasHandler
 import com.health.openscale.core.bluetooth.scales.TrisaBodyAnalyzeHandler
 import com.health.openscale.core.bluetooth.scales.TuningProfile
+import com.health.openscale.core.bluetooth.scales.VitafitVT701Handler
+import com.health.openscale.core.bluetooth.scales.WeightGurusA3Handler
 import com.health.openscale.core.bluetooth.scales.YunmaiHandler
+import com.health.openscale.core.bluetooth.scales.YunmaiXHandler
 import com.health.openscale.core.facade.MeasurementFacade
 import com.health.openscale.core.facade.SettingsFacade
 import com.health.openscale.core.facade.UserFacade
 import com.health.openscale.core.utils.LogManager
 import com.health.openscale.core.service.ScannedDeviceInfo
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
@@ -99,60 +113,97 @@ class ScaleFactory @Inject constructor(
 ) {
     private val TAG = "ScaleHandlerFactory"
 
-    // List of modern Kotlin-based device handlers.
-    // Order matters: createCommunicator() returns the FIRST handler whose supportFor() is non-null.
-    // TaylorBIAHandler must stay ahead of MGBHandler — both live on service 0xFFB0, and MGBHandler
-    // also matches that service, so a later position would let MGB wrongly claim the Taylor scale.
-    private val modernKotlinHandlers: List<ScaleDeviceHandler> = listOf(
-        BeurerBF450Handler(),
-        TaylorBIAHandler(),
-        RyFitHandler(),
-        CultSmartScaleProHandler(),
-        RealmeSmartScaleHandler(),
-        YunmaiHandler(isMini = false),
-        YunmaiHandler(isMini = true),
-        TrisaBodyAnalyzeHandler(),
-        SanitasSbf72Handler(),
-        StandardBeurerSanitasHandler(),
-        SoehnleHandler(),
-        SinocareHandler(),
-        SenssunHandler(),
-        RenphoHandler(),
-        QNHandlerBroadcast(),
-        QNHandler(),
-        OneByoneHandler(),
-        OneByoneNewHandler(),
-        OkOkHandler(),
-        MiScaleS400Handler(),
-        XiaomiS800Handler(),
-        MiScaleHandler(),
-        RunstarR5Handler(),
-        RobiS9Handler(),
-        MGBHandler(),
-        MedisanaBs44xHandler(),
-        InlifeHandler(),
-        IHealthHS3Handler(),
-        HuaweiAhCh100Handler(),
-        HuaweiCH100SHandler(),
-        HoffenBbs8107Handler(),
-        HesleyHandler(),
-        ExingtechY1Handler(),
-        EbelterBodyFatB2Handler(),
-        ExcelvanCF36xHandler(),
-        EtekcityESF551Handler(),
-        EufyC20Handler(),
-        EufyP2Handler(),
-        ESCS20MHandler(),
-        RenphoES26BBHandler(),
-        DigooDGSO38HHandler(),
-        DebugGattHandler(),
-        CustomOpenScaleHandler(),
-        BeurerSanitasHandler(),
-        AAAxHandler(),
-        ActiveEraBF06Handler(),
-        DrTrustSSW532Handler(),
-        BodyConnectHandler(),
-    )
+    private val modernKotlinHandlers: List<ScaleDeviceHandler> = createHandlers()
+
+    companion object {
+        /**
+         * Builds the list of modern Kotlin-based device handlers.
+         *
+         * Order matters: [createCommunicator] returns the FIRST handler whose [ScaleDeviceHandler.supportFor]
+         * is non-null. TaylorBIAHandler, FitTrackDaraHandler, RelaxmedicHandler, RobiS9Handler and
+         * DrTrustSSW532Handler must stay ahead of MGBHandler — all live on service 0xFFB0, which
+         * MGBHandler matches on its own, so a later position would let MGB wrongly claim them.
+         *
+         * Exposed so the registry (order, device claims, duplicates) can be asserted in unit tests
+         * without building the Hilt graph — see `ScaleFactoryTest`.
+         */
+        @VisibleForTesting
+        internal fun createHandlers(): List<ScaleDeviceHandler> = listOf(
+            // Exact-name match must precede generic LeFu/0xFFF0 handlers (first match wins).
+            ActiveEraBF06Handler(),
+            KeepS3Handler(),
+            OmronWlcHandler(),
+            BeurerBF450Handler(),
+            TaylorBIAHandler(),
+            RyFitHandler(),
+            CultSmartScaleProHandler(),
+            RealmeSmartScaleHandler(),
+            YunmaiHandler(isMini = false),
+            YunmaiHandler(isMini = true),
+            YunmaiXHandler(),
+            TrisaBodyAnalyzeHandler(),
+            SanitasSbf72Handler(),
+            StandardBeurerSanitasHandler(),
+            SoehnleHandler(),
+            SinocareHandler(),
+            SenssunHandler(),
+            RenphoHandler(),
+            QNHandlerBroadcast(),
+            QNHandler(),
+            OneByoneHandler(),
+            OneByoneNewHandler(),
+            OkOkHandler(),
+            MiScaleS400Handler(),
+            XiaomiS800Handler(),
+            MiScaleHandler(),
+            RunstarR6Handler(),
+            RunstarR5Handler(),
+            RelaxmedicHandler(),
+            RobiS9Handler(),
+            VitafitVT701Handler(),
+            EEBBLHandler(),
+            FitTrackDaraHandler(),
+            DrTrustSSW532Handler(),
+            MGBHandler(),
+            MedisanaBs44xHandler(),
+            InlifeHandler(),
+            IHealthHS3Handler(),
+            HuaweiAhCh100Handler(),
+            HuaweiCH100SHandler(),
+            HuaweiHagridWspHandler(),
+            HoffenBbs8107Handler(),
+            HesleyHandler(),
+            ExingtechY1Handler(),
+            EbelterBodyFatB2Handler(),
+            ExcelvanCF36xHandler(),
+            EtekcityESF551Handler(),
+            EtekcityFit8SHandler(),
+            EufyC20Handler(),
+            EufyP2Handler(),
+            ESCS20MHandler(),
+            RenphoES26BBHandler(),
+            DigooDGSO38HHandler(),
+            CustomOpenScaleHandler(),
+            BeurerSanitasHandler(),
+            AAAxHandler(),
+            ScaleupHandler(),
+            BodyConnectHandler(),
+            WeightGurusA3Handler(),
+        )
+    }
+
+    /**
+     * Reads the current value of a settings [Flow] from a non-suspending context.
+     *
+     * Communicator creation happens on the caller's thread, so the few settings needed here are
+     * read with a short timeout rather than restructuring every call site; `null` means the value
+     * was unavailable in time and the caller falls back to its default.
+     */
+    private fun <T> readSettingBlocking(flow: Flow<T>): T? = runCatching {
+        runBlocking(Dispatchers.IO) {
+            withTimeout(250.milliseconds) { flow.firstOrNull() }
+        }
+    }.getOrNull()
 
     /**
      * Creates a [ScaleCommunicator] based on a modern [ScaleDeviceHandler].
@@ -169,13 +220,7 @@ class ScaleFactory @Inject constructor(
     ): ScaleCommunicator? {
         // Resolve effective tuning: prefer user-saved value, fall back to handler default
         val effectiveTuning: TuningProfile = run {
-            val saved: String? = runCatching {
-                runBlocking(Dispatchers.IO) {
-                    withTimeout(250.milliseconds) {
-                        settingsFacade.savedBluetoothTuneProfile.firstOrNull()
-                    }
-                }
-            }.getOrNull()
+            val saved: String? = readSettingBlocking(settingsFacade.savedBluetoothTuneProfile)
 
             saved?.let { runCatching { TuningProfile.valueOf(it) }.getOrNull() }
                 ?: support.tuningProfile
@@ -224,6 +269,13 @@ class ScaleFactory @Inject constructor(
         val primaryIdentifier = deviceInfo.name
         LogManager.d(TAG, "createCommunicator: Searching for communicator for '${primaryIdentifier}' (${deviceInfo.address}). Handler hint: '${deviceInfo.determinedHandlerDisplayName}'")
 
+        // 0. Developer mode wins over every registered handler: route to the diagnostic handler,
+        //    which dumps the GATT tree and logs notifications but stores nothing.
+        if (readSettingBlocking(settingsFacade.developerModeEnabled) == true) {
+            LogManager.i(TAG, "Developer mode active → routing '$primaryIdentifier' to DebugGattHandler. No measurement will be stored.")
+            return createModernCommunicator(DebugGattHandler(), DebugGattHandler.SUPPORT)
+        }
+
         // 1. Check if a modern Kotlin handler explicitly supports the device.
         for (handler in modernKotlinHandlers) {
             val support = handler.supportFor(deviceInfo)