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 3af6adcc..5f58fa2c 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 @@ -35,7 +35,6 @@ import com.polidea.rxandroidble2.scan.ScanSettings; import java.io.IOException; import java.net.SocketException; import java.util.UUID; -import java.util.concurrent.TimeUnit; import androidx.core.content.ContextCompat; import io.reactivex.Observable; @@ -70,7 +69,6 @@ public abstract class BluetoothCommunication { } private final int BT_RETRY_TIMES_ON_ERROR = 3; - private final int BT_DELAY = 50; // MS protected Context context; @@ -297,7 +295,6 @@ public abstract class BluetoothCommunication { */ protected void writeBytes(UUID characteristic, byte[] bytes) { final Disposable disposable = connectionObservable - .delay(BT_DELAY, TimeUnit.MILLISECONDS) .flatMapSingle(rxBleConnection -> rxBleConnection.writeCharacteristic(characteristic, bytes)) .observeOn(AndroidSchedulers.mainThread()) .retry(BT_RETRY_TIMES_ON_ERROR) @@ -322,7 +319,6 @@ public abstract class BluetoothCommunication { */ protected void readBytes(UUID characteristic) { final Disposable disposable = connectionObservable - .delay(BT_DELAY, TimeUnit.MILLISECONDS) .firstOrError() .flatMap(rxBleConnection -> rxBleConnection.readCharacteristic(characteristic)) .observeOn(AndroidSchedulers.mainThread()) @@ -344,7 +340,6 @@ public abstract class BluetoothCommunication { */ protected void setIndicationOn(UUID characteristic) { final Disposable disposable = connectionObservable - .delay(BT_DELAY, TimeUnit.MILLISECONDS) .flatMap(rxBleConnection -> rxBleConnection.setupIndication(characteristic)) .doOnNext(notificationObservable -> { Timber.d("Successful set indication on for %s", BluetoothGattUuid.prettyPrint(characteristic)); @@ -375,7 +370,6 @@ public abstract class BluetoothCommunication { */ protected void setNotificationOn(UUID characteristic) { final Disposable disposable = connectionObservable - .delay(BT_DELAY, TimeUnit.MILLISECONDS) .flatMap(rxBleConnection -> rxBleConnection.setupNotification(characteristic)) .doOnNext(notificationObservable -> { Timber.d("Successful set notification on for %s", BluetoothGattUuid.prettyPrint(characteristic)); @@ -401,7 +395,6 @@ public abstract class BluetoothCommunication { public void doBluetoothDiscoverServices() { final Disposable connectionDisposable = connectionObservable - .delay(BT_DELAY, TimeUnit.MILLISECONDS) .flatMapSingle(RxBleConnection::discoverServices) .observeOn(AndroidSchedulers.mainThread()) .retry(BT_RETRY_TIMES_ON_ERROR) @@ -528,7 +521,6 @@ public abstract class BluetoothCommunication { connectionObservable = bleDevice .establishConnection(false) - .delay(BT_DELAY, TimeUnit.MILLISECONDS) .takeUntil(disconnectTriggerSubject) .doOnError(throwable -> setBtStatus(BT_STATUS_CODE.BT_CONNECTION_RETRYING)) .observeOn(AndroidSchedulers.mainThread())