Skip to content
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

Jump to bottom

Fixes: #462: Fix race condition in method sendResponse in com.android.identity.wallet.transfer.Communication #463

Closed
wants to merge 2 commits into from
Closed

Fixes: #462: Fix race condition in method sendResponse in com.android.identity.wallet.transfer.Communication #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cb88d0
Fixes: #462: In com.android.identity.wallet.transfer.Communication se…
Jan 30, 2024
069e9db
conditionally call disconnect in SendResponse
Feb 1, 2024
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
4 changes: 2 additions & 2 deletions appholder/src/main/java/com/android/identity/wallet/fragment/TransferDocumentFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@ class TransferDocumentFragment : Fragment() {
private fun onTransferDisconnected() {
log("Disconnected")
hideButtons()
TransferManager.getInstance(requireContext()).disconnect()
TransferManager.getInstance(requireContext()).disconnect(true)
}

private fun onTransferError() {
Toast.makeText(requireContext(), "An error occurred.", Toast.LENGTH_SHORT).show()
hideButtons()
TransferManager.getInstance(requireContext()).disconnect()
TransferManager.getInstance(requireContext()).disconnect(true)
}

private fun hideButtons() {
Expand Down
23 changes: 9 additions & 14 deletions appholder/src/main/java/com/android/identity/wallet/transfer/Communication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,16 @@ class Communication private constructor(
if (progress == max) {
log("Completed...")
}
if (progress == max && closeAfterSending) {
deviceRetrievalHelper?.disconnect()
}
}
if (closeAfterSending) {
deviceRetrievalHelper?.sendDeviceResponse(
deviceResponse,
OptionalLong.of(Constants.SESSION_DATA_STATUS_SESSION_TERMINATION),
progressListener,
context.mainExecutor())
deviceRetrievalHelper?.disconnect()
} else {
deviceRetrievalHelper?.sendDeviceResponse(
deviceResponse,
OptionalLong.empty(),
progressListener,
context.mainExecutor())
}

deviceRetrievalHelper?.sendDeviceResponse(
deviceResponse,
OptionalLong.of(Constants.SESSION_DATA_STATUS_SESSION_TERMINATION),
progressListener,
context.mainExecutor())
}

fun stopPresentation(
Expand Down
10 changes: 6 additions & 4 deletions appholder/src/main/java/com/android/identity/wallet/transfer/TransferManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,13 @@ class TransferManager private constructor(private val context: Context) {
sendSessionTerminationMessage,
useTransportSpecificSessionTermination
)
disconnect()
disconnect(true)
}

fun disconnect() {
communication.disconnect()
fun disconnect(disconnectCommunication: Boolean) {
if (disconnectCommunication) {
communication.disconnect()
}
qrCommunicationSetup?.close()
transferStatusLd = MutableLiveData<TransferStatus>()
destroy()
Expand All @@ -263,7 +265,7 @@ class TransferManager private constructor(private val context: Context) {
fun sendResponse(deviceResponse: ByteArray, closeAfterSending: Boolean) {
communication.sendResponse(deviceResponse, closeAfterSending)
if (closeAfterSending) {
disconnect()
disconnect(false)
}
}

Expand Down