mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-07 09:17:11 +02:00
Code Issues Releases Wiki Activity

gives a nameless scale a fake device name

Browse Source
This commit is contained in:
oliexdev
2024-11-24 14:31:55 +01:00
parent 81d61cb35e
commit c17fff3a87
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java
View File

@@ -17,6 +17,7 @@
package com.health.openscale.core.bluetooth; package com.health.openscale.core.bluetooth;
import android.content.Context; import android.content.Context;
import android.util.SparseArray;
import java.util.Locale; import java.util.Locale;
@@ -118,7 +119,7 @@ public class BluetoothFactory {
if (deviceName.equals("ADV") || deviceName.equals("Chipsea-BLE")) { if (deviceName.equals("ADV") || deviceName.equals("Chipsea-BLE")) {
return new BluetoothOKOK(context); return new BluetoothOKOK(context);
} }
if (deviceName.isEmpty()) { if (deviceName.equals("NoName OkOk")) {
return new BluetoothOKOK2(context); return new BluetoothOKOK2(context);
} }
if (deviceName.equals("BF105") || deviceName.equals("BF720")) { if (deviceName.equals("BF105") || deviceName.equals("BF720")) {
@@ -150,4 +151,11 @@ public class BluetoothFactory {
} }
return null; return null;
} }
public static String convertNoNameToDeviceName(SparseArray<byte[]> manufacturerSpecificData) {
String deviceName = null;
deviceName = BluetoothOKOK2.convertNoNameToDeviceName(manufacturerSpecificData);
return deviceName;
}
} }

21
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOKOK2.java
View File

@@ -15,6 +15,9 @@
*/ */
package com.health.openscale.core.bluetooth; 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.ScanFilter;
import android.bluetooth.le.ScanResult; import android.bluetooth.le.ScanResult;
import android.content.Context; import android.content.Context;
@@ -35,9 +38,6 @@ import java.util.List;
import timber.log.Timber; 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 { public class BluetoothOKOK2 extends BluetoothCommunication {
private static final int IDX_WEIGHT_MSB = 0; private static final int IDX_WEIGHT_MSB = 0;
private static final int IDX_WEIGHT_LSB = 1; private static final int IDX_WEIGHT_LSB = 1;
@@ -66,6 +66,21 @@ public class BluetoothOKOK2 extends BluetoothCommunication {
central = new BluetoothCentralManager(context, btCallback, new Handler(Looper.getMainLooper())); 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() { private final BluetoothCentralManagerCallback btCallback = new BluetoothCentralManagerCallback() {
@Override @Override
public void onDiscoveredPeripheral(@NotNull BluetoothPeripheral peripheral, @NotNull ScanResult scanResult) { public void onDiscoveredPeripheral(@NotNull BluetoothPeripheral peripheral, @NotNull ScanResult scanResult) {

8
android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothSettingsFragment.java
View File

@@ -325,8 +325,12 @@ public class BluetoothSettingsFragment extends Fragment {
BluetoothDeviceView deviceView = new BluetoothDeviceView(context); BluetoothDeviceView deviceView = new BluetoothDeviceView(context);
deviceView.setDeviceName(formatDeviceName(bleScanResult.getDevice())); deviceView.setDeviceName(formatDeviceName(bleScanResult.getDevice()));
String name = device.getName() != null ? device.getName() : ""; String deviceName = device.getName();
BluetoothCommunication btDevice = BluetoothFactory.createDeviceDriver(context, name); if (deviceName == null) {
deviceName = BluetoothFactory.convertNoNameToDeviceName(bleScanResult.getScanRecord().getManufacturerSpecificData());
}
BluetoothCommunication btDevice = BluetoothFactory.createDeviceDriver(context, deviceName);
if (btDevice != null) { if (btDevice != null) {
Timber.d("Found supported device %s (driver: %s)", Timber.d("Found supported device %s (driver: %s)",
formatDeviceName(device), btDevice.driverName()); formatDeviceName(device), btDevice.driverName());