Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show "declined" for declined voice and video calls instead of "missed".

Browse Source 
Closes #14081
Fixes #14080
This commit is contained in:
Ciphreon
2025-04-05 23:03:22 +02:00
committed by Michelle Tang
parent 2608e9165c
commit de3088f706
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/CallPreference.kt
View File

@@ -83,18 +83,25 @@ object CallPreference {
@StringRes
private fun getMissedCallString(isVideo: Boolean, callEvent: CallTable.Event): Int {
return if (callEvent == CallTable.Event.MISSED_NOTIFICATION_PROFILE) {
if (isVideo) {
R.string.MessageRecord_missed_video_call_notification_profile
} else {
R.string.MessageRecord_missed_voice_call_notification_profile
}
} else {
if (isVideo) {
R.string.MessageRecord_missed_video_call
} else {
R.string.MessageRecord_missed_voice_call
}
return when (callEvent) {
CallTable.Event.MISSED_NOTIFICATION_PROFILE ->
if (isVideo) {
R.string.MessageRecord_missed_video_call_notification_profile
} else {
R.string.MessageRecord_missed_voice_call_notification_profile
}
CallTable.Event.NOT_ACCEPTED ->
if (isVideo) {
R.string.MessageRecord_declined_video_call
} else {
R.string.MessageRecord_declined_voice_call
}
else ->
if (isVideo) {
R.string.MessageRecord_missed_video_call
} else {
R.string.MessageRecord_missed_voice_call
}
}
}

2
app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
View File

@@ -267,6 +267,8 @@ public class MmsMessageRecord extends MessageRecord {
int message;
if (call.getEvent() == CallTable.Event.MISSED_NOTIFICATION_PROFILE) {
message = isVideoCall ? R.string.MessageRecord_missed_video_call_notification_profile : R.string.MessageRecord_missed_voice_call_notification_profile;
} else if (call.getEvent() == CallTable.Event.NOT_ACCEPTED) {
message = isVideoCall ? R.string.MessageRecord_declined_video_call : R.string.MessageRecord_declined_voice_call;
} else {
message = isVideoCall ? R.string.MessageRecord_missed_video_call : R.string.MessageRecord_missed_voice_call;
}

4
app/src/main/res/values/strings.xml
View File

@@ -1787,6 +1787,10 @@
<string name="MessageRecord_missed_voice_call">Missed voice call</string>
<!-- Update message shown when receiving an incoming 1:1 video call and not answered -->
<string name="MessageRecord_missed_video_call">Missed video call</string>
<!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
<string name="MessageRecord_declined_voice_call">Declined voice call</string>
<!-- Update message shown when receiving an incoming 1:1 video call and not answered -->
<string name="MessageRecord_declined_video_call">Declined video call</string>
<!-- Update message shown when receiving an incoming voice call and declined due to notification profile -->
<string name="MessageRecord_missed_voice_call_notification_profile">Missed voice call while notification profile on</string>
<!-- Update message shown when receiving an incoming video call and declined due to notification profile -->