TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-21 15:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced string 'dialog_disappearing_messages_follow_setting_confirm' with 'confirm'

Browse Source
This commit is contained in:
alansley 2024-08-02 14:21:11 +10:00
parent 2992d590d9
commit c7fdb6aed9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
View File

@ -57,7 +57,7 @@ class DisappearingMessages @Inject constructor(
})
dangerButton(
text = if (message.expiresIn == 0L) R.string.dialog_disappearing_messages_follow_setting_confirm else R.string.set,
text = if (message.expiresIn == 0L) R.string.confirm else R.string.set,
contentDescription = if (message.expiresIn == 0L) R.string.AccessibilityId_confirm else R.string.AccessibilityId_set_button
) {
set(message.threadId, message.recipient.address, message.expiryMode, message.recipient.isClosedGroupRecipient)

6
libsession/src/main/res/values/strings.xml
View File

@ -60,11 +60,6 @@
-->
<string name="activity_settings_upload">Upload</string>
<!-- REQUIRED: Used when a users follows the disappearing messages of another user to turn them off.
Figma: https://www.figma.com/design/tEgZ8ujg76DdtPwEJv8zFp/Disappearing-Messages?node-id=0-1&t=RmpaOwy9gz7ohKSE-0
-->
<string name="dialog_disappearing_messages_follow_setting_confirm">Confirm</string>
<!-- USED as text for the Legacy ExpiryType enum defined in State.kt - however, I don' think
there's any way to set "Legacy" disappearing messages any more, that's gone. Although we
may still need to cater to _seeing_ Legacy disappearing messages from clients which haven't
@ -256,6 +251,7 @@
<string name="communityUnknown">Unknown Community</string>
<string name="communityUrl">Community URL</string>
<string name="communityUrlCopy">Copy Community URL</string>
<string name="confirm">Confirm</string>
<string name="contactContacts">Contacts</string>
<string name="contactDelete">Delete Contact</string>
<string name="contactDeleteDescription">Are you sure you want to delete <b>{name}</b> from your contacts? New messages from <b>{name}</b> will arrive as a message request.</string>