mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Display meeting subject in message description
This commit is contained in:
parent
cc403f2624
commit
b87a3dd92c
3 changed files with 9 additions and 4 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Loading…
Add table
Reference in a new issue