cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid crashing when importing an invalid image (#171)

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-04-24 17:34:06 +02:00
parent 1169bed9a5
commit 32c24c3eae
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/fairscan/app/ui/screens/camera/CameraViewModel.kt
View File

@@ -36,6 +36,7 @@ import org.fairscan.app.domain.CapturedPage
import org.fairscan.app.platform.extractDocumentFromBitmap import org.fairscan.app.platform.extractDocumentFromBitmap
import org.fairscan.imageprocessing.ImageSize import org.fairscan.imageprocessing.ImageSize
import org.fairscan.imageprocessing.detectDocumentQuad import org.fairscan.imageprocessing.detectDocumentQuad
import java.util.concurrent.CancellationException
sealed interface CameraEvent { sealed interface CameraEvent {
data class ImageCaptured(val page: CapturedPage) : CameraEvent data class ImageCaptured(val page: CapturedPage) : CameraEvent
@@ -203,6 +204,7 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
_importState.value = ImportState.Importing(0, uris.size) _importState.value = ImportState.Importing(0, uris.size)
uris.forEachIndexed { index, uri -> uris.forEachIndexed { index, uri ->
ensureActive() ensureActive()
try {
val photoToImport = imageLoader.load(uri) val photoToImport = imageLoader.load(uri)
ensureActive() ensureActive()
val page = processCapturedImage(photoToImport, 0) val page = processCapturedImage(photoToImport, 0)
@@ -210,6 +212,11 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
page?.let { page?.let {
_events.emit(CameraEvent.ImageCaptured(it)) _events.emit(CameraEvent.ImageCaptured(it))
} }
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
logger.e("Import", "Failed to import image: $uri", e)
}
_importState.value = ImportState.Importing(index + 1, uris.size) _importState.value = ImportState.Importing(index + 1, uris.size)
} }
_importState.value = ImportState.Idle _importState.value = ImportState.Idle