Skip to content

[MS-1238] Crash fix: no longer accessing views when Fragment is destroyed #1455

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
alexandr-simprints merged 2 commits into from
Nov 10, 2025
Merged

[MS-1238] Crash fix: no longer accessing views when Fragment is destroyed #1455

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
5a39d38
[MS-1238] Unifying OCR preprocessing. Controlling preprocessing threa…
alexandr-simprints Nov 7, 2025
a870696
[MS-1238] Renaming 'state' to 'ocrState' for consistency
alexandr-simprints Nov 7, 2025
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
53 changes: 27 additions & 26 deletions ...simprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import com.simprints.infra.uibase.view.fadeOut
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
Expand Down Expand Up @@ -85,6 +86,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
private var checkAnimator: ViewPropertyAnimator? = null
private var isAnimatingCompletion: Boolean = false
private var pendingFinishAction: (() -> Unit)? = null
private var ocrPreProcessingJob: Job? = null

@Inject
lateinit var viewModelFactory: ExternalCredentialScanOcrViewModel.Factory
Expand Down Expand Up @@ -132,11 +134,11 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
}
}

override fun onDestroy() {
override fun onDestroyView() {
stopOcr()
stopCamera()
clearAnimations()
super.onDestroy()
super.onDestroyView()
}

private fun clearAnimations() {
Expand Down Expand Up @@ -299,48 +301,46 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
// Running OCR as often as we can while camera feedback is displayed to the user
viewModel.ocrOnFrameStarted()
if (viewModel.ocrConfig.useHighRes) {
captureHighResImageForOcr()
videoFrame.close()
captureHighResImageForOcr { highResImage ->
preProcessImageAndRunOcr(highResImage)
}
} else {
captureFrameFromVideoStreamForOcr(videoFrame)
preProcessImageAndRunOcr(videoFrame)
}
}
}

private fun captureFrameFromVideoStreamForOcr(imageProxy: ImageProxy) {
lifecycleScope.launch(bgDispatcher) {
private fun preProcessImageAndRunOcr(imageProxy: ImageProxy) {
ocrPreProcessingJob?.cancel()
ocrPreProcessingJob = lifecycleScope.launch(bgDispatcher) {
try {
val (bitmap, imageInfo) = imageProxy.toBitmap() to imageProxy.imageInfo
val cropConfig: OcrCropConfig = buildOcrCropConfigUseCase(
rotationDegrees = imageInfo.rotationDegrees,
cameraPreview = binding.preview,
documentScannerArea = binding.documentScannerArea,
)
viewModel.runOcrOnFrame(frame = bitmap, cropConfig)
if (ocrPreProcessingJob?.isActive == true) {
val cropConfig: OcrCropConfig = buildOcrCropConfigUseCase(
rotationDegrees = imageInfo.rotationDegrees,
cameraPreview = binding.preview,
documentScannerArea = binding.documentScannerArea,
)
viewModel.runOcrOnFrame(frame = bitmap, cropConfig)
} else {
Simber.i(
"Unable to run OCR preprocessing, coroutine context is cancelled",
tag = MULTI_FACTOR_ID,
)
}
} finally {
imageProxy.close()
}
}
}

private fun captureHighResImageForOcr() {
private fun captureHighResImageForOcr(onImageCaptured: (ImageProxy) -> Unit) {
imageCapture.takePicture(
cameraExecutor,
object : ImageCapture.OnImageCapturedCallback() {
override fun onCaptureSuccess(imageProxy: ImageProxy) {
lifecycleScope.launch(bgDispatcher) {
try {
val (bitmap, imageInfo) = imageProxy.toBitmap() to imageProxy.imageInfo
val cropConfig: OcrCropConfig = buildOcrCropConfigUseCase(
rotationDegrees = imageInfo.rotationDegrees,
cameraPreview = binding.preview,
documentScannerArea = binding.documentScannerArea,
)
viewModel.runOcrOnFrame(frame = bitmap, cropConfig)
} finally {
imageProxy.close()
}
}
onImageCaptured(imageProxy)
}

override fun onError(e: ImageCaptureException) {
Expand All @@ -357,6 +357,7 @@ internal class ExternalCredentialScanOcrFragment : Fragment(R.layout.fragment_ex
}

private fun stopOcr() {
ocrPreProcessingJob?.cancel()
if (::imageAnalysis.isInitialized) {
imageAnalysis.clearAnalyzer()
}
Expand Down
5 changes: 2 additions & 3 deletions ...imprints/feature/externalcredential/screens/scanocr/ExternalCredentialScanOcrViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.simprints.feature.externalcredential.screens.scanocr.usecase.Normaliz
import com.simprints.feature.externalcredential.screens.scanocr.usecase.ZoomOntoCredentialUseCase
import com.simprints.feature.externalcredential.screens.search.model.ScannedCredential
import com.simprints.infra.authstore.AuthStore
import com.simprints.infra.config.store.models.ExperimentalProjectConfiguration
import com.simprints.infra.config.store.models.TokenKeyType
import com.simprints.infra.config.store.models.experimental
import com.simprints.infra.config.store.tokenization.TokenizationProcessor
Expand Down Expand Up @@ -64,7 +63,7 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
private set
val isOcrActive: Boolean
get() = detectedBlocks.isNotEmpty()
private var state: ScanOcrState = ScanOcrState.EMPTY
private var ocrState: ScanOcrState = ScanOcrState.EMPTY
set(value) {
field = value
_stateLiveData.postValue(value)
Expand All @@ -91,7 +90,7 @@ internal class ExternalCredentialScanOcrViewModel @AssistedInject constructor(
}

private fun updateState(state: (ScanOcrState) -> ScanOcrState) {
this.state = state(this.state)
this.ocrState = state(this.ocrState)
}

fun getDocumentTypeRes(): Int = when (ocrDocumentType) {
Expand Down