Skip to content

MS-825 Ignore image transfer cancellation exception to avoid breaking user flow #980

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
luhmirin-s merged 1 commit into from
Nov 20, 2024
Merged

MS-825 Ignore image transfer cancellation exception to avoid breaking user flow #980

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
11 changes: 8 additions & 3 deletions ...ure/src/main/java/com/simprints/fingerprint/capture/screen/FingerprintCaptureViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
Expand Down Expand Up @@ -164,7 +165,7 @@ internal class FingerprintCaptureViewModel @Inject constructor(

private fun start(
fingerprintsToCapture: List<IFingerIdentifier>,
fingerprintSdk: FingerprintConfiguration.BioSdk
fingerprintSdk: FingerprintConfiguration.BioSdk,
) {
if (!hasStarted) {
hasStarted = true
Expand Down Expand Up @@ -403,7 +404,11 @@ internal class FingerprintCaptureViewModel @Inject constructor(
imageTransferTask = viewModelScope.launch {
try {
val acquiredImage = bioSdkWrapper.acquireFingerprintImage()
handleImageTransferSuccess(acquiredImage)
if (isActive) {
handleImageTransferSuccess(acquiredImage)
}
} catch (_: CancellationException) {
// No-op - This is expected when job is cancelled manually, i.e. by back press
} catch (ex: Throwable) {
handleScannerCommunicationsError(ex)
}
Expand Down Expand Up @@ -665,7 +670,7 @@ internal class FingerprintCaptureViewModel @Inject constructor(

fun handleOnViewCreated(
fingerprintsToCapture: List<IFingerIdentifier>,
fingerprintSdk: FingerprintConfiguration.BioSdk
fingerprintSdk: FingerprintConfiguration.BioSdk,
) {
updateState {
it.copy(
Expand Down