From cbf7f604cd713056b5b8ddb4f5dabf5096fccaf3 Mon Sep 17 00:00:00 2001 From: OliE Date: Wed, 4 Oct 2017 17:50:18 +0200 Subject: [PATCH] update array compare method --- .../openscale/core/bluetooth/BluetoothCommunication.java | 3 +-- .../openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java index 01b386fa..071514e7 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java @@ -408,10 +408,9 @@ public abstract class BluetoothCommunication { if (device.getName().toLowerCase().equals(btDeviceName.toLowerCase())) { Log.d("BluetoothCommunication", btDeviceName + " found trying to connect..."); - bluetoothGatt = device.connectGatt(context, false, gattCallback); - searchHandler.removeCallbacksAndMessages(null); btAdapter.stopLeScan(scanCallback); + bluetoothGatt = device.connectGatt(context, false, gattCallback); } } catch (Exception e) { setBtStatus(BT_STATUS_CODE.BT_UNEXPECTED_ERROR, e.getMessage()); diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java index d6825839..ab83eb6a 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java @@ -24,6 +24,7 @@ import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleData; import com.health.openscale.core.datatypes.ScaleUser; +import java.util.Arrays; import java.util.Date; import java.util.UUID; @@ -108,7 +109,7 @@ public class BluetoothExcelvanCF369BLE extends BluetoothCommunication { // if data is body scale type if (data.length == 16 && data[0] == (byte)0xcf) { - if (!data.equals(receivedData)) { // accepts only one data of the same content + if (!Arrays.equals(data, receivedData)) { // accepts only one data of the same content receivedData = data; parseBytes(data); }