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

Avoid crash when processing a captured image fails (#93)

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2026-01-16 14:12:47 +01:00
parent 855dbe75ed
commit 48985fb6b4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/proguard-rules.pro vendored
View File

@@ -26,3 +26,5 @@
-keep class org.fairscan.app.RecentDocument* { *; } -keep class org.fairscan.app.RecentDocument* { *; }
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { *; } -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { *; }
# to have at least org.opencv.core.CvException
-keep class org.opencv.core.** { *; }

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

@@ -116,10 +116,15 @@ class CameraViewModel(appContainer: AppContainer): ViewModel() {
fun onImageCaptured(imageProxy: ImageProxy?) { fun onImageCaptured(imageProxy: ImageProxy?) {
if (imageProxy != null) { if (imageProxy != null) {
viewModelScope.launch { viewModelScope.launch {
try {
val source = imageProxy.toBitmap() val source = imageProxy.toBitmap()
val page = processCapturedImage(source, imageProxy.imageInfo.rotationDegrees) val page = processCapturedImage(source, imageProxy.imageInfo.rotationDegrees)
imageProxy.close() imageProxy.close()
onCaptureProcessed(page) onCaptureProcessed(page)
} catch (e: RuntimeException) {
logger.e("Camera", "Failed to process captured image", e)
onCaptureProcessed(null)
}
} }
} else { } else {
onCaptureProcessed(null) onCaptureProcessed(null)