Skip to content

Fix issue with null BluetoothDevice field. #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2022
Merged

Fix issue with null BluetoothDevice field. #359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 86 additions & 51 deletions ble-ktx/src/main/java/no/nordicsemi/android/ble/ktx/RequestSuspend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ suspend fun Request.suspend() = suspendCancellable()
)
suspend fun WriteRequest.suspend(): Data {
var result: Data? = null
with { _, data -> result = data }.suspendCancellable()
this
.with { _, data -> result = data }
.suspendCancellable()
return result!!
}

Expand Down Expand Up @@ -63,9 +65,12 @@ suspend fun WriteRequest.suspend(): Data {
)
suspend inline fun <reified T: WriteResponse> WriteRequest.suspendForResponse(): T {
var device: BluetoothDevice? = null
then { d -> device = d }.suspend().let {
return T::class.java.newInstance().apply { onDataSent(device!!, it) }
}
return this
.before { d -> device = d }
.suspend()
.let {
T::class.java.newInstance().apply { onDataSent(device!!, it) }
}
}

/**
Expand All @@ -80,7 +85,9 @@ suspend inline fun <reified T: WriteResponse> WriteRequest.suspendForResponse():
)
suspend fun ReadRequest.suspend(): Data {
var result: Data? = null
with { _, data -> result = data }.suspendCancellable()
this
.with { _, data -> result = data }
.suspendCancellable()
return result!!
}

Expand All @@ -103,9 +110,12 @@ suspend fun ReadRequest.suspend(): Data {
)
suspend inline fun <reified T: ReadResponse> ReadRequest.suspendForResponse(): T {
var device: BluetoothDevice? = null
then { d -> device = d }.suspend().let {
return T::class.java.newInstance().apply { onDataReceived(device!!, it) }
}
return this
.before { d -> device = d }
.suspend()
.let {
T::class.java.newInstance().apply { onDataReceived(device!!, it) }
}
}

/**
Expand Down Expand Up @@ -144,7 +154,9 @@ suspend inline fun <reified T: ProfileReadResponse> ReadRequest.suspendForValidR
)
suspend fun ReadRssiRequest.suspend(): Int {
var result: Int? = null
with { _, rssi -> result = rssi }.suspendCancellable()
this
.with { _, rssi -> result = rssi }
.suspendCancellable()
return result!!
}

Expand All @@ -160,7 +172,9 @@ suspend fun ReadRssiRequest.suspend(): Int {
)
suspend fun MtuRequest.suspend(): Int {
var result: Int? = null
with { _, mtu -> result = mtu }.suspendCancellable()
this
.with { _, mtu -> result = mtu }
.suspendCancellable()
return result!!
}

Expand All @@ -176,7 +190,9 @@ suspend fun MtuRequest.suspend(): Int {
)
suspend fun PhyRequest.suspend(): Pair<Int, Int> {
var result: Pair<Int, Int>? = null
with { _, txPhy, rxPhy -> result = txPhy to rxPhy }.suspendCancellable()
this
.with { _, txPhy, rxPhy -> result = txPhy to rxPhy }
.suspendCancellable()
return result!!
}

Expand All @@ -190,18 +206,23 @@ suspend fun PhyRequest.suspend(): Pair<Int, Int> {
RequestFailedException::class,
InvalidRequestException::class
)
suspend fun WaitForValueChangedRequest.suspend(): Data = suspendCancellableCoroutine { continuation -> this
.with { _, data -> continuation.resume(data) }
.invalid { continuation.resumeWithException(InvalidRequestException(this)) }
.fail { _, status ->
val exception = when (status) {
FailCallback.REASON_BLUETOOTH_DISABLED -> BluetoothDisabledException()
FailCallback.REASON_DEVICE_DISCONNECTED -> DeviceDisconnectedException()
else -> RequestFailedException(this, status)
suspend fun WaitForValueChangedRequest.suspend(): Data = suspendCancellableCoroutine { continuation ->
var data: Data? = null
this
// DON'T USE .before callback here, it's used to get BluetoothDevice instance above.
.with { _, d -> data = d }
.invalid { continuation.resumeWithException(InvalidRequestException(this)) }
.fail { _, status ->
val exception = when (status) {
FailCallback.REASON_BLUETOOTH_DISABLED -> BluetoothDisabledException()
FailCallback.REASON_DEVICE_DISCONNECTED -> DeviceDisconnectedException()
else -> RequestFailedException(this, status)
}
continuation.resumeWithException(exception)
}
continuation.resumeWithException(exception)
}
.enqueue()
.done { continuation.resume(data!!) }
// .then is called after both .done and .fail
.enqueue()
}

/**
Expand All @@ -222,9 +243,12 @@ suspend fun WaitForValueChangedRequest.suspend(): Data = suspendCancellableCoro
)
suspend inline fun <reified T: ReadResponse> WaitForValueChangedRequest.suspendForResponse(): T {
var device: BluetoothDevice? = null
then { d -> device = d }.suspend().let {
return T::class.java.newInstance().apply { onDataReceived(device!!, it) }
}
return this
.before { d -> device = d }
.suspend()
.let {
T::class.java.newInstance().apply { onDataReceived(device!!, it) }
}
}

/**
Expand Down Expand Up @@ -260,18 +284,23 @@ suspend inline fun <reified T: ProfileReadResponse> WaitForValueChangedRequest.s
RequestFailedException::class,
InvalidRequestException::class
)
suspend fun WaitForReadRequest.suspend(): Data = suspendCancellableCoroutine { continuation -> this
.with { _, data -> continuation.resume(data) }
.invalid { continuation.resumeWithException(InvalidRequestException(this)) }
.fail { _, status ->
val exception = when (status) {
FailCallback.REASON_BLUETOOTH_DISABLED -> BluetoothDisabledException()
FailCallback.REASON_DEVICE_DISCONNECTED -> DeviceDisconnectedException()
else -> RequestFailedException(this, status)
suspend fun WaitForReadRequest.suspend(): Data = suspendCancellableCoroutine { continuation ->
var data: Data? = null
this
// DON'T USE .before callback here, it's used to get BluetoothDevice instance above.
.with { _, d -> data = d }
.invalid { continuation.resumeWithException(InvalidRequestException(this)) }
.fail { _, status ->
val exception = when (status) {
FailCallback.REASON_BLUETOOTH_DISABLED -> BluetoothDisabledException()
FailCallback.REASON_DEVICE_DISCONNECTED -> DeviceDisconnectedException()
else -> RequestFailedException(this, status)
}
continuation.resumeWithException(exception)
}
continuation.resumeWithException(exception)
}
.enqueue()
.done { continuation.resume(data!!) }
// .then is called after both .done and .fail
.enqueue()
}

/**
Expand All @@ -294,21 +323,27 @@ suspend fun WaitForReadRequest.suspend(): Data = suspendCancellableCoroutine {
)
suspend inline fun <reified T: WriteResponse> WaitForReadRequest.suspendForResponse(): T {
var device: BluetoothDevice? = null
then { d -> device = d }.suspend().let {
return T::class.java.newInstance().apply { onDataSent(device!!, it) }
}
return this
.before { d -> device = d }
.suspend()
.let {
T::class.java.newInstance().apply { onDataSent(device!!, it) }
}
}

private suspend fun Request.suspendCancellable(): Unit = suspendCancellableCoroutine { continuation -> this
.done { continuation.resume(Unit) }
.invalid { continuation.resumeWithException(InvalidRequestException(this)) }
.fail { _, status ->
val exception = when (status) {
FailCallback.REASON_BLUETOOTH_DISABLED -> BluetoothDisabledException()
FailCallback.REASON_DEVICE_DISCONNECTED -> DeviceDisconnectedException()
else -> RequestFailedException(this, status)
private suspend fun Request.suspendCancellable(): Unit = suspendCancellableCoroutine { continuation ->
this
// DON'T USE .before callback here, it's used to get BluetoothDevice instance above.
.invalid { continuation.resumeWithException(InvalidRequestException(this)) }
.fail { _, status ->
val exception = when (status) {
FailCallback.REASON_BLUETOOTH_DISABLED -> BluetoothDisabledException()
FailCallback.REASON_DEVICE_DISCONNECTED -> DeviceDisconnectedException()
else -> RequestFailedException(this, status)
}
continuation.resumeWithException(exception)
}
continuation.resumeWithException(exception)
}
.enqueue()
}
.done { continuation.resume(Unit) }
// .then is called after both .done and .fail
.enqueue()
}