mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display voice recording default message instead of file name, like for conference invitations

Browse source
This commit is contained in:
Sylvain Berfini 2023-01-13 15:13:45 +01:00
parent cc2b97fba4
commit 31826d5b43
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt
View file

@ -165,6 +165,10 @@ class ChatRoomData(private val chatRoom: ChatRoom) : ContactDataInterface {
val body = AppUtils.getString(R.string.conference_invitation) val body = AppUtils.getString(R.string.conference_invitation)
builder.append(body) builder.append(body)
builder.setSpan(StyleSpan(Typeface.ITALIC), builder.length - body.length, builder.length, 0) builder.setSpan(StyleSpan(Typeface.ITALIC), builder.length - body.length, builder.length, 0)
} else if (content.isVoiceRecording) {
val body = AppUtils.getString(R.string.chat_message_voice_recording)
builder.append(body)
builder.setSpan(StyleSpan(Typeface.ITALIC), builder.length - body.length, builder.length, 0)
} else if (content.isFile || content.isFileTransfer) { } else if (content.isFile || content.isFileTransfer) {
builder.append(content.name + " ") builder.append(content.name + " ")
} else if (content.isText) { } else if (content.isText) {

6
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -708,9 +708,11 @@ class NotificationsManager(private val context: Context) {
val displayName = friend?.name ?: LinphoneUtils.getDisplayName(message.fromAddress) val displayName = friend?.name ?: LinphoneUtils.getDisplayName(message.fromAddress)
var text = "" var text = ""
val isConferenceInvite = message.contents.firstOrNull()?.isIcalendar ?: false val firstContent = message.contents.firstOrNull()
text = if (isConferenceInvite) { text = if (firstContent?.isIcalendar == true) {
AppUtils.getString(R.string.conference_invitation_received_notification) AppUtils.getString(R.string.conference_invitation_received_notification)
} else if (firstContent?.isVoiceRecording == true) {
AppUtils.getString(R.string.chat_message_voice_recording_received_notification)
} else { } else {
message.contents.find { content -> content.isText }?.utf8Text ?: "" message.contents.find { content -> content.isText }?.utf8Text ?: ""
} }

2
app/src/main/res/values-fr/strings.xml
View file

@ -756,4 +756,6 @@
<string name="conference_schedule_send_updated_invite_chat">Envoyer la mise à jour par &appName;</string> <string name="conference_schedule_send_updated_invite_chat">Envoyer la mise à jour par &appName;</string>
<string name="conference_schedule_send_updated_invite_email">Envoyer la mise à jour par courriel</string> <string name="conference_schedule_send_updated_invite_email">Envoyer la mise à jour par courriel</string>
<string name="call_screenshot_taken">Capture sauvegardée : %s</string> <string name="call_screenshot_taken">Capture sauvegardée : %s</string>
<string name="chat_message_voice_recording_received_notification">Vous avez reçu un message vocal</string>
<string name="chat_message_voice_recording">Message vocal</string>
</resources> </resources>

2
app/src/main/res/values/strings.xml
View file

@ -231,6 +231,8 @@
<string name="chat_message_removal_info">Message will be deleted</string> <string name="chat_message_removal_info">Message will be deleted</string>
<string name="chat_message_abort_removal">Abort</string> <string name="chat_message_abort_removal">Abort</string>
<string name="chat_message_download_already_in_progress">Please wait for first download to finish before starting a new one</string> <string name="chat_message_download_already_in_progress">Please wait for first download to finish before starting a new one</string>
<string name="chat_message_voice_recording_received_notification">You have received a voice message</string>
<string name="chat_message_voice_recording">Voice message</string>
<!-- Recordings --> <!-- Recordings -->
<string name="recordings_empty_list">No recordings</string> <string name="recordings_empty_list">No recordings</string>