From 8c9be7302231558b46dc160eb1867a0e8dc1b348 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com> Date: Wed, 26 Nov 2025 18:58:55 +0100 Subject: [PATCH] Restore behavior when saving PDF for both success and failure --- app/src/main/java/org/fairscan/app/MainActivity.kt | 8 +++----- .../org/fairscan/app/ui/screens/export/ExportViewModel.kt | 8 ++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/fairscan/app/MainActivity.kt b/app/src/main/java/org/fairscan/app/MainActivity.kt index 0d781c4..6b5d0b6 100644 --- a/app/src/main/java/org/fairscan/app/MainActivity.kt +++ b/app/src/main/java/org/fairscan/app/MainActivity.kt @@ -116,11 +116,9 @@ class MainActivity : ComponentActivity() { exportViewModel.onRequestPdfSave(context, homeViewModel) } } - is ExportEvent.ShowToast -> { - Toast.makeText(context, event.message, Toast.LENGTH_SHORT).show() - } - ExportEvent.PdfSaved -> { - Toast.makeText(context, "PDF saved", Toast.LENGTH_SHORT).show() + is ExportEvent.SaveError -> { + val text = getString(R.string.error_save) + Toast.makeText(context, text, Toast.LENGTH_SHORT).show() } } } diff --git a/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt b/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt index c02e32a..15e2957 100644 --- a/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt +++ b/app/src/main/java/org/fairscan/app/ui/screens/export/ExportViewModel.kt @@ -42,8 +42,7 @@ private const val PDF_MIME_TYPE = "application/pdf" sealed interface ExportEvent { data object RequestSavePdf : ExportEvent - data class ShowToast(val message: String) : ExportEvent - data object PdfSaved : ExportEvent + data object SaveError : ExportEvent } class ExportViewModel(container: AppContainer): ViewModel() { @@ -153,12 +152,9 @@ class ExportViewModel(container: AppContainer): ViewModel() { targetFile.absolutePath, pdf.pageCount ) - - _events.emit(ExportEvent.PdfSaved) - } catch (e: Exception) { logger.e("FairScan", "Failed to save PDF", e) - _events.emit(ExportEvent.ShowToast("Error while saving PDF")) + _events.emit(ExportEvent.SaveError) } }