gives a nameless scale a fake device name

oliexdev · Nov 24, 2024 · c17fff3 · c17fff3
1 parent 81d61cb
commit c17fff3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java
@@ -17,6 +17,7 @@
 package com.health.openscale.core.bluetooth;
 
 import android.content.Context;
+import android.util.SparseArray;
 
 import java.util.Locale;
 
@@ -118,7 +119,7 @@ public static BluetoothCommunication createDeviceDriver(Context context, String
         if (deviceName.equals("ADV") || deviceName.equals("Chipsea-BLE")) {
             return new BluetoothOKOK(context);
         }
-        if (deviceName.isEmpty()) {
+        if (deviceName.equals("NoName OkOk")) {
             return new BluetoothOKOK2(context);
         }
         if (deviceName.equals("BF105") || deviceName.equals("BF720")) {
@@ -150,4 +151,11 @@ public static BluetoothCommunication createDeviceDriver(Context context, String
         }
         return null;
     }
+
+    public static String convertNoNameToDeviceName(SparseArray<byte[]> manufacturerSpecificData) {
+        String deviceName = null;
+        deviceName = BluetoothOKOK2.convertNoNameToDeviceName(manufacturerSpecificData);
+
+        return deviceName;
+    }
 }
diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOKOK2.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOKOK2.java
@@ -15,6 +15,9 @@
  */
 package com.health.openscale.core.bluetooth;
 
+import static com.health.openscale.core.utils.Converters.WeightUnit.LB;
+import static com.health.openscale.core.utils.Converters.WeightUnit.ST;
+
 import android.bluetooth.le.ScanFilter;
 import android.bluetooth.le.ScanResult;
 import android.content.Context;
@@ -35,9 +38,6 @@
 
 import timber.log.Timber;
 
-import static com.health.openscale.core.utils.Converters.WeightUnit.LB;
-import static com.health.openscale.core.utils.Converters.WeightUnit.ST;
-
 public class BluetoothOKOK2 extends BluetoothCommunication {
     private static final int IDX_WEIGHT_MSB = 0;
     private static final int IDX_WEIGHT_LSB = 1;
@@ -66,6 +66,21 @@ public BluetoothOKOK2(Context context) {
         central = new BluetoothCentralManager(context, btCallback, new Handler(Looper.getMainLooper()));
     }
 
+    static String convertNoNameToDeviceName(SparseArray<byte[]> manufacturerSpecificData) {
+        int vendorIndex = -1;
+        for (int i = 0; i < manufacturerSpecificData.size(); i++) {
+            int vendorId = manufacturerSpecificData.keyAt(i);
+            if ((vendorId & 0xff) == 0xc0) { // 0x00c0-->0xffc0
+                vendorIndex = vendorId;
+            }
+        }
+        if (vendorIndex == -1) {
+            return null;
+        }
+
+        return "NoName OkOk";
+    }
+
     private final BluetoothCentralManagerCallback btCallback = new BluetoothCentralManagerCallback() {
         @Override
         public void onDiscoveredPeripheral(@NotNull BluetoothPeripheral peripheral, @NotNull ScanResult scanResult) {

diff --git a/...app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java b/...app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
@@ -325,8 +325,12 @@ private void onDeviceFound(final ScanResult bleScanResult) {
         BluetoothDeviceView deviceView = new BluetoothDeviceView(context);
         deviceView.setDeviceName(formatDeviceName(bleScanResult.getDevice()));
 
-        String name = device.getName() != null ? device.getName() : "";
-        BluetoothCommunication btDevice = BluetoothFactory.createDeviceDriver(context, name);
+        String deviceName = device.getName();
+        if (deviceName == null) {
+            deviceName = BluetoothFactory.convertNoNameToDeviceName(bleScanResult.getScanRecord().getManufacturerSpecificData());
+        }
+
+        BluetoothCommunication btDevice = BluetoothFactory.createDeviceDriver(context, deviceName);
         if (btDevice != null) {
             Timber.d("Found supported device %s (driver: %s)",
                     formatDeviceName(device), btDevice.driverName());