Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 00:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update incoming delete message strings.

Browse Source
This commit is contained in:
Michelle Tang
2026-02-24 18:09:51 -05:00
parent 1908723fbe
commit 75795bd7d5
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -1156,7 +1156,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (!isAdminDelete && messageRecord.isOutgoing()) {
body = formatDeletedText(context.getString(R.string.ConversationItem_you_deleted_this_message));
} else if (!isAdminDelete) {
body = formatDeletedText(context.getString(R.string.ConversationItem_this_message_was_deleted));
body = formatDeletedText(context.getString(R.string.ConversationItem_s_deleted_this_message, message.getDeletedByRecipient().getDisplayName(context)));
} else {
SpannableString prefix = formatDeletedText(context.getString(R.string.ConversationItem_admin));
SpannableString suffix = formatDeletedText(context.getString(R.string.ConversationItem_deleted_this_message));

6
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
View File

@@ -700,8 +700,10 @@ public final class ConversationListItem extends ConstraintLayout implements Bind
} else if (extra != null && extra.getDeletedBy() != null) {
RecipientId individualRecipientId = thread.getIndividualRecipientId();
RecipientId deletedBy = thread.getDeletedByRecipientId();
if (individualRecipientId.equals(deletedBy)) {
return emphasisAdded(context, context.getString(thread.isOutgoing() ? R.string.ThreadRecord_you_deleted_this_message : R.string.ThreadRecord_this_message_was_deleted), defaultTint);
if (individualRecipientId.equals(deletedBy) && thread.isOutgoing()) {
return emphasisAdded(context, context.getString(R.string.ThreadRecord_you_deleted_this_message), defaultTint);
} else if (individualRecipientId.equals(deletedBy)) {
return emphasisAdded(recipientToStringAsync(deletedBy, r -> new SpannableString(context.getString(R.string.ThreadRecord_s_deleted_this_message, r.getDisplayName(context)))));
} else {
return emphasisAdded(recipientToStringAsync(deletedBy, r -> new SpannableString(context.getString(R.string.ThreadRecord_admin_deleted_this_message, r.getDisplayName(context)))));
}

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

@@ -451,6 +451,8 @@
<string name="ConversationItem_download_more">&#160; Download More</string>
<string name="ConversationItem_pending">&#160; Pending</string>
<string name="ConversationItem_this_message_was_deleted">This message was deleted</string>
<!-- Conversation message shown when someone deletes their own message. Placeholder is the name of the person. -->
<string name="ConversationItem_s_deleted_this_message">%1$s deleted this message</string>
<string name="ConversationItem_you_deleted_this_message">You deleted this message</string>
<!-- First part of a conversation message when a message has been deleted by an admin. -->
<string name="ConversationItem_admin">Admin</string>
@@ -3056,6 +3058,8 @@
<string name="ThreadRecord_view_once_media">View-once media</string>
<!-- Thread preview when someone has deleted their own message -->
<string name="ThreadRecord_this_message_was_deleted">This message was deleted</string>
<!-- Thread preview when someone has deleted their own message. Placeholder is the name of the person. -->
<string name="ThreadRecord_s_deleted_this_message">%1$s deleted this message</string>
<!-- Thread preview when you deleted a message -->
<string name="ThreadRecord_you_deleted_this_message">You deleted this message</string>
<!-- Thread preview when an admin has deleted a message -->