From 31e15ddfca2f149407f389269f88585969722d40 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 17 Sep 2025 13:36:15 +0200 Subject: [PATCH] Prevent app crash when trying to open a corrupted PDF sent/received by chat --- .../org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt | 7 ++++++- app/src/main/res/values-fr/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt index a623ee8b3..b35c042e6 100644 --- a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt @@ -291,7 +291,12 @@ class FileViewModel Log.e("$TAG Can't open PDF, probably protected by a password: $se") pdfCurrentPage.postValue("0") pdfPages.postValue("0") - showRedToast(R.string.conversation_pdf_file_cant_be_opened_error_toast, R.drawable.warning_circle) + showRedToast(R.string.conversation_pdf_password_protected_file_cant_be_opened_error_toast, R.drawable.warning_circle) + } catch (e: Exception) { + Log.e("$TAG Can't open PDF, it may be corrupted: $e") + pdfCurrentPage.postValue("0") + pdfPages.postValue("0") + showRedToast(R.string.conversation_pdf_file_error_toast, R.drawable.warning_circle) } } } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ac7236c06..40130bbcc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -552,7 +552,8 @@ Ouvrir la galerie Choisir un fichier Impossible d\'ouvrir le fichier ! - Impossible d\'ouvrir un PDF protégé par mot de passe + Impossible d\'ouvrir un PDF protégé par mot de passe + Impossible d\'ouvrir ce PDF, le fichier est peut-être corrompu Modification du message Modifié Supprimer le message ? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d752f78b4..f3ae00480 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -595,7 +595,8 @@ Open gallery Pick file File can\'t be opened! - Can\'t open password protected PDFs yet + Can\'t open password protected PDFs yet + Can\'t open this PDF, file may be corrupted Message being edited Edited Delete this message?