From 73237ee3353f69c7d26443346559fac1510ce91a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 6 May 2025 12:53:28 +0200
Subject: [PATCH] Added toast for meeting update error + fixed other toasts

---
 .../ui/call/viewmodel/CurrentCallViewModel.kt        |  4 ++--
 .../ui/main/contacts/viewmodel/ContactViewModel.kt   |  4 ++--
 .../meetings/viewmodel/ScheduleMeetingViewModel.kt   | 12 +++++++++++-
 app/src/main/res/values-fr/strings.xml               | 12 ++++++------
 app/src/main/res/values/strings.xml                  |  2 +-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index 69a69ad8e..22a2ccab2 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -421,7 +421,7 @@ class CurrentCallViewModel
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
                 chatRoomCreationErrorEvent.postValue(
-                    Event(R.string.conversation_creation_error_toast)
+                    Event(R.string.conversation_failed_to_create_toast)
                 )
             }
         }
@@ -1442,7 +1442,7 @@ class CurrentCallViewModel
             )
             operationInProgress.postValue(false)
             chatRoomCreationErrorEvent.postValue(
-                Event(R.string.conversation_creation_error_toast)
+                Event(R.string.conversation_failed_to_create_toast)
             )
         }
     }
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
index 2667c2d01..5a16246b2 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
@@ -211,7 +211,7 @@ class ContactViewModel
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
                 chatRoomCreationErrorEvent.postValue(
-                    Event(R.string.conversation_creation_error_toast)
+                    Event(R.string.conversation_failed_to_create_toast)
                 )
             }
         }
@@ -574,7 +574,7 @@ class ContactViewModel
                     )
                     operationInProgress.postValue(false)
                     chatRoomCreationErrorEvent.postValue(
-                        Event(R.string.conversation_creation_error_toast)
+                        Event(R.string.conversation_failed_to_create_toast)
                     )
                 }
             }
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
index 880da234a..50f2655df 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
@@ -113,7 +113,17 @@ class ScheduleMeetingViewModel
             when (state) {
                 ConferenceScheduler.State.Error -> {
                     operationInProgress.postValue(false)
-                    showRedToast(R.string.meeting_failed_to_schedule_toast, R.drawable.warning_circle)
+                    if (::conferenceInfo.isInitialized) {
+                        showRedToast(
+                            R.string.meeting_failed_to_edit_schedule_toast,
+                            R.drawable.warning_circle
+                        )
+                    } else {
+                        showRedToast(
+                            R.string.meeting_failed_to_schedule_toast,
+                            R.drawable.warning_circle
+                        )
+                    }
                 }
                 ConferenceScheduler.State.Ready -> {
                     val conferenceAddress = conferenceScheduler.info?.uri
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bfaf09156..d19c684c3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -173,7 +173,7 @@
     <string name="help_troubleshooting_firebase_project_title">ID du projet Firebase</string>
     <string name="help_troubleshooting_share_logs_dialog_title">Partager le lien vers journaux avec…</string>
     <string name="help_troubleshooting_debug_logs_cleaned_toast_message">Les journaux ont été nettoyés</string>
-    <string name="help_troubleshooting_debug_logs_upload_error_toast_message">Echec à l\'envoi des journaux</string>
+    <string name="help_troubleshooting_debug_logs_upload_error_toast_message">Échec à l\'envoi des journaux</string>
     <string name="help_troubleshooting_show_config_file">Afficher la configuration</string>
     <string name="help_troubleshooting_clear_native_friends_in_database">Supprimer les contacts natifs importés</string>
 
@@ -468,7 +468,6 @@
         <item quantity="one">%s est en train d\'écrire…</item>
         <item quantity="other">%s sont en train d\'écrire…</item>
     </plurals>
-    <string name="conversation_creation_error_toast">Échec de la création de la conversation !</string>
     <string name="conversation_add_participants_title">Ajouter des participants</string>
     <string name="conversation_reply_to_message_title">En réponse à :</string>
     <string name="conversation_menu_search_in_messages">Chercher</string>
@@ -617,6 +616,7 @@
     <string name="meeting_info_cancelled_toast">Réunion annulée</string>
     <string name="meeting_info_cancelled">Réunion annulée</string>
     <string name="meeting_failed_to_schedule_toast">Échec de création de la réunion !</string>
+    <string name="meeting_failed_to_edit_schedule_toast">Échec de modification de la réunion !</string>
     <string name="meeting_schedule_mandatory_field_not_filled_toast">Veuillez saisir un titre et sélectionner au moins un participant</string>
     <string name="meeting_failed_to_send_invites_toast">Échec de l\'envoi des invitations à la réunion !</string>
     <string name="meeting_failed_to_send_part_of_invites_toast">Échec de l\'envoi des invitations à certains des participants !</string>
@@ -626,7 +626,7 @@
     <string name="meeting_waiting_room_cancel">Annuler</string>
     <string name="meeting_waiting_room_joining_title">Connexion à la réunion</string>
     <string name="meeting_waiting_room_joining_subtitle">Vous allez rejoindre la réunion dans quelques instants…</string>
-    <string name="meeting_waiting_room_failed_to_join_toast">Echec de connexion à la conférence!</string>
+    <string name="meeting_waiting_room_failed_to_join_toast">Échec de connexion à la conférence!</string>
 
     <!-- Call related -->
     <string name="call_outgoing">Appel sortant</string>
@@ -719,7 +719,7 @@
     <string name="call_can_be_trusted_toast">Appareil authentifié</string>
     <string name="call_transfer_in_progress_toast">Transfert en cours</string>
     <string name="call_transfer_successful_toast">Appel transféré</string>
-    <string name="call_transfer_failed_toast">Echec du transfert</string>
+    <string name="call_transfer_failed_toast">Échec du transfert</string>
     <string name="call_error_user_busy_toast">Utilisateur occupé</string>
     <string name="call_error_user_not_found_toast">Utilisateur introuvable</string>
     <string name="call_error_incompatible_media_params_toast">Paramètres media incompatibles</string>
@@ -732,8 +732,8 @@
     <string name="conference_call_empty">En attente d\'autres participants…</string>
     <string name="conference_action_screen_sharing">Partage d\'écran</string>
     <string name="conference_action_show_participants">Participants</string>
-    <string name="conference_failed_to_create_group_call_toast">Echec de l\'appel de groupe</string>
-    <string name="conference_failed_to_merge_calls_into_conference_toast">Echec de la fusion des appels</string>
+    <string name="conference_failed_to_create_group_call_toast">Échec de l\'appel de groupe</string>
+    <string name="conference_failed_to_merge_calls_into_conference_toast">Échec de la fusion des appels</string>
     <plurals name="conference_participants_list_title" tools:ignore="MissingQuantity">
         <item quantity="one">Participant (%s)</item>
         <item quantity="other">Participants (%s)</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbb1b586b..e6a98591d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -509,7 +509,6 @@
         <item quantity="one">%s is composing…</item>
         <item quantity="other">%s are composing…</item>
     </plurals>
-    <string name="conversation_creation_error_toast">Failed to create conversation!</string>
     <string name="conversation_add_participants_title">Add participants</string>
     <string name="conversation_reply_to_message_title">Replying to:</string>
     <string name="conversation_menu_search_in_messages">Search</string>
@@ -658,6 +657,7 @@
     <string name="meeting_info_cancelled_toast">Meeting has been cancelled</string>
     <string name="meeting_info_cancelled">Meeting cancelled</string>
     <string name="meeting_failed_to_schedule_toast">Failed to schedule meeting!</string>
+    <string name="meeting_failed_to_edit_schedule_toast">Failed to edit meeting!</string>
     <string name="meeting_schedule_mandatory_field_not_filled_toast">Please fill the title and select at least one participant</string>
     <string name="meeting_failed_to_send_invites_toast">Failed to send all invites to meeting!</string>
     <string name="meeting_failed_to_send_part_of_invites_toast">Failed to send invites to some participants of the meeting!</string>