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

End of day push

Browse Source
This commit is contained in:
alansley 2024-08-02 16:21:16 +10:00
parent 1a2df3798a
commit bc94cb78db
2 changed files with 3 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/preferences/SettingsActivity.kt
View File

@ -391,7 +391,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
showSessionDialog { showSessionDialog {
title(R.string.profileDisplayPictureSet) title(R.string.profileDisplayPictureSet)
view(R.layout.dialog_change_avatar) view(R.layout.dialog_change_avatar)
button(R.string.activity_settings_upload) { startAvatarSelection() } button(R.string.save) { startAvatarSelection() }
if (prefs.getProfileAvatarId() != 0) { if (prefs.getProfileAvatarId() != 0) {
button(R.string.remove) { removeProfilePicture() } button(R.string.remove) { removeProfilePicture() }

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

@ -52,19 +52,16 @@
<!-- REQUIRED: Title on media picker when you go to send an image - this can be either to a specific Button on the `Set Display Picture` dialog used to instigate choosing a profile picture to set. <!-- REQUIRED: Title on media picker when you go to send an image - this can be either to a specific Button on the `Set Display Picture` dialog used to instigate choosing a profile picture to set.
person, to to a closed group, or to a community (in the latter two cases it will show the group name). person, to to a closed group, or to a community (in the latter two cases it will show the group name).
Figma: Unable to locate usage in Figma. Figma: Unable to locate usage in Figma.
Morgan 2024/07/31: "Added to Crowdin as `attachmentsSendTo` (not yet exported)" - leaving for now until I know the exact string substitution key -AL 2024/08/02
--> -->
<string name="MediaPickerActivity_send_to">Send to %s</string> <string name="MediaPickerActivity_send_to">Send to %s</string>
<!-- REQUIRED: Button on the `Set Display Picture` dialog used to instigate choosing a profile picture to set.
Figma: Unable to locate usage in Figma.
-->
<string name="activity_settings_upload">Upload</string>
<!-- USED as text for the Legacy ExpiryType enum defined in State.kt - however, I don' think <!-- 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 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 may still need to cater to _seeing_ Legacy disappearing messages from clients which haven't
been updated, perhaps? been updated, perhaps?
Figma: https://www.figma.com/design/tEgZ8ujg76DdtPwEJv8zFp/Disappearing-Messages?t=25H0THKH9VADKm9s-0 Figma: https://www.figma.com/design/tEgZ8ujg76DdtPwEJv8zFp/Disappearing-Messages?t=25H0THKH9VADKm9s-0
Morgan 2024/07/31: "once the Onboarding release has gone out we can remove the "Legacy" disappearing message settings (there is a PR for iOS to do so already)"
--> -->
<string name="expiration_type_disappear_legacy">Legacy</string> <string name="expiration_type_disappear_legacy">Legacy</string>