diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt index ca08601be3..9655d8d644 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt @@ -345,7 +345,7 @@ class CallLogAdapter( } private fun presentCallInfo(call: CallLogRow.Call, date: Long) { - val callState = context.getString(getCallStateStringRes(call.record)) + val callState = context.getString(getCallStateStringRes(call.record, call.children.size)) binding.callInfo.text = context.getString( R.string.CallLogAdapter__s_dot_s, if (call.children.size > 1) { @@ -467,14 +467,15 @@ class CallLogAdapter( } @StringRes - private fun getCallStateStringRes(call: CallTable.Call): Int { + private fun getCallStateStringRes(call: CallTable.Call, missedCalls: Int): Int { return when (call.messageType) { MessageTypes.MISSED_VIDEO_CALL_TYPE, MessageTypes.MISSED_AUDIO_CALL_TYPE -> if (call.event == CallTable.Event.MISSED) R.string.CallLogAdapter__missed else R.string.CallLogAdapter__missed_notification_profile MessageTypes.OUTGOING_AUDIO_CALL_TYPE -> R.string.CallLogAdapter__outgoing MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.string.CallLogAdapter__outgoing MessageTypes.GROUP_CALL_TYPE -> when { call.type == CallTable.Type.AD_HOC_CALL -> R.string.CallLogAdapter__call_link - call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE -> R.string.CallLogAdapter__missed_notification_profile + call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE && missedCalls == 1 -> R.string.CallLogAdapter__missed_notification_profile + call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE -> R.string.CallLogAdapter__missed_notification_profile_multiple call.isDisplayedAsMissedCallInUi -> R.string.CallLogAdapter__missed call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.string.CallPreference__group_call call.direction == CallTable.Direction.INCOMING -> R.string.CallLogAdapter__incoming diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java index 4917e9dbae..4a6aa879d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java @@ -111,7 +111,7 @@ public class ChatWallpaperFragment extends Fragment { if (viewModel.isGlobal()) { resetAllWallpaper.setOnClickListener(unused -> { new MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.ChatWallpaperFragment__reset_wallpaper) + .setTitle(R.string.ChatWallpaperFragment__reset_wallpapers) .setMessage(R.string.ChatWallpaperFragment__would_you_like_to_override_all_wallpapers) .setPositiveButton(R.string.ChatWallpaperFragment__reset_default_wallpaper, (dialog, which) -> { viewModel.setWallpaper(null); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a65f01d99..80545eaa8c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5278,7 +5278,7 @@ Wallpaper preview Would you like to override all chat colors? Would you like to override all wallpapers? - Reset default colors + Reset default color Reset all colors Reset default wallpaper Reset all wallpapers @@ -6221,7 +6221,8 @@ Donation Receipts Badges - Subscription FAQ + + Donor FAQ Other ways to give @@ -7502,8 +7503,10 @@ Outgoing Missed - + Missed while notification profile on + + Missed while notification profile on Join @@ -8591,7 +8594,7 @@ Enter your recovery key - Enter the 64-digit code you recorded when you enabled backups. + Enter the 64-character code you recorded when you enabled backups. Forgot key? @@ -9020,7 +9023,7 @@ view your debug log - before submitting + before submitting. Share debug log