From b87a3dd92c614d5f9fc565e28179146cd45e66d4 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 8 Jan 2024 10:57:03 +0100
Subject: [PATCH] Display meeting subject in message description

---
 app/build.gradle                                      | 2 +-
 app/src/main/java/org/linphone/utils/LinphoneUtils.kt | 9 +++++++--
 app/src/main/res/values/strings.xml                   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8fc09d5fa..b82ef8783 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
     // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.11.0'
 
     // https://github.com/coil-kt/coil/blob/main/LICENSE.txt Apache v2.0
     def coil_version = "2.5.0"
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index 2bae91f3e..f75d352c2 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -42,6 +42,7 @@ import org.linphone.core.ChatMessage
 import org.linphone.core.ChatRoom
 import org.linphone.core.ConferenceInfo
 import org.linphone.core.Core
+import org.linphone.core.Factory
 import org.linphone.core.tools.Log
 import org.linphone.ui.main.contacts.model.ContactAvatarModel
 
@@ -320,8 +321,12 @@ class LinphoneUtils {
             if (text.isEmpty()) {
                 val firstContent = message.contents.firstOrNull()
                 if (firstContent?.isIcalendar == true) {
-                    text = AppUtils.getString(
-                        R.string.message_meeting_invitation_content_description
+                    val conferenceInfo = Factory.instance().createConferenceInfoFromIcalendarContent(
+                        firstContent
+                    )
+                    text = AppUtils.getFormattedString(
+                        R.string.message_meeting_invitation_content_description,
+                        conferenceInfo?.subject.orEmpty()
                     )
                 } else if (firstContent?.isVoiceRecording == true) {
                     text = AppUtils.getString(R.string.message_voice_message_content_description)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fbfbcbba..c28ff5e0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -529,6 +529,6 @@
     <string name="call_zrtp_sas_validation_skip"><u>Skip</u></string>
 
     <!-- Keep <i></i> in following strings translations! -->
-    <string name="message_meeting_invitation_content_description"><i>meeting invite</i></string>
+    <string name="message_meeting_invitation_content_description"><i>meeting invite: </i>%s</string>
     <string name="message_voice_message_content_description"><i>voice message</i></string>
 </resources>
\ No newline at end of file