Merge pull request #634 from NordicSemiconductor/bugfix/timeouts

Adding missing `timeout` methods

Author: philips77

ble/src/main/java/no/nordicsemi/android/ble/ConditionalWaitRequest.java

@@ -3,8 +3,10 @@
 import android.os.Handler;
 import android.util.Log;
 
+import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import no.nordicsemi.android.ble.callback.AfterCallback;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.FailCallback;
@@ -49,6 +51,13 @@ public ConditionalWaitRequest<T> setHandler(@Nullable final Handler handler) {
 		return this;
 	}
 
+	@NonNull
+	@Override
+	public ConditionalWaitRequest<T> timeout(@IntRange(from = 0) final long timeout) {
+		super.timeout(timeout);
+		return this;
+	}
+
 	@Override
 	@NonNull
 	public ConditionalWaitRequest<T> done(@NonNull final SuccessCallback callback) {

ble/src/main/java/no/nordicsemi/android/ble/ReadRequest.java

@@ -29,8 +29,10 @@
 import android.os.Handler;
 import android.util.Log;
 
+import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import no.nordicsemi.android.ble.callback.AfterCallback;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.DataReceivedCallback;
@@ -86,6 +88,13 @@ public ReadRequest setHandler(@Nullable final Handler handler) {
 		return this;
 	}
 
+	@NonNull
+	@Override
+	public ReadRequest timeout(@IntRange(from = 0) final long timeout) {
+		super.timeout(timeout);
+		return this;
+	}
+
 	@Override
 	@NonNull
 	public ReadRequest done(@NonNull final SuccessCallback callback) {

ble/src/main/java/no/nordicsemi/android/ble/WaitForReadRequest.java

@@ -9,6 +9,7 @@
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import no.nordicsemi.android.ble.callback.AfterCallback;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
 import no.nordicsemi.android.ble.callback.DataSentCallback;
@@ -80,6 +81,13 @@ public WaitForReadRequest setHandler(@Nullable final Handler handler) {
 		return this;
 	}
 
+	@NonNull
+	@Override
+	public WaitForReadRequest timeout(@IntRange(from = 0) final long timeout) {
+		super.timeout(timeout);
+		return this;
+	}
+
 	@Override
 	@NonNull
 	public WaitForReadRequest done(@NonNull final SuccessCallback callback) {

ble/src/main/java/no/nordicsemi/android/ble/WriteRequest.java

@@ -29,11 +29,12 @@
 import android.os.Handler;
 import android.util.Log;
 
-import java.util.Arrays;
-
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
+import java.util.Arrays;
+
 import no.nordicsemi.android.ble.annotation.WriteType;
 import no.nordicsemi.android.ble.callback.AfterCallback;
 import no.nordicsemi.android.ble.callback.BeforeCallback;
@@ -111,6 +112,13 @@ public WriteRequest setHandler(@Nullable final Handler handler) {
 		return this;
 	}
 
+	@NonNull
+	@Override
+	public WriteRequest timeout(@IntRange(from = 0) final long timeout) {
+		super.timeout(timeout);
+		return this;
+	}
+
 	@Override
 	@NonNull
 	public WriteRequest done(@NonNull final SuccessCallback callback) {