Feature/strings updates #1659

ThomasSession · 2024-09-08T21:50:20Z

Sorting out String issues, as per tasks mentioned here: https://discord.com/channels/408081923835953153/1280040841800581172

And tickets here: https://optf.atlassian.net/browse/SES-2690

… on different bg colors

Making sure the summary was displaye properly for drop down preferences

Cleaning up icons

Latest strings Removed the LEGACY disappearing messages New title for Share activity (also formatted the lines)

Missing the real string for it!

Deleting non needed files

…microphone permission

…sions

The control message is now clickable when the phone toggle is disabled or when the microphone permission is not given

…session-android into feature/strings-updates

Updated the avatar picker to match the designs. Had to rewrite it in Compose and moved the logic to the VM. We could moev the whole settings page to compose in another step now that we have the VM set up.

Group notification option was missing Using the appropriate disappearing message string Don't show 'uploading' state for quotes/replies

AL-Session

Found a few things we might want to adjust - nothing major, but will hold off approving until we've discussed.

AL-Session · 2024-09-09T00:07:41Z

app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt

@@ -139,7 +137,7 @@ internal fun LandingScreen(
                        R.string.onboardingBubbleWelcomeToSession -> {
                            Phrase.from(stringResource(item.stringId))
                                .put(APP_NAME_KEY, stringResource(R.string.app_name))
-                                .put(EMOJI_KEY, WAVING_HAND_EMOJI)
+                                .put(EMOJI_KEY, "\uD83D\uDC4B") // this hardcoded emoji might be moved to NonTranslatableConstants eventually
                                .format().toString()


I don't see how demoting this emoji from a named constant that explains what it is to two code-points with no explanation improves anything.

AL-Session · 2024-09-09T00:43:07Z

libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt

+        var id: Long = 0
+
+        // this can throw an error
+        id = retryIfNeeded(4) {


Should the 4 in retryIfNeeded(4) go into a constant like MAX_PROFILE_PICTURE_UPLOAD_ATTEMPTS or similar?

Also, if the upload fails and exceeds the retry count then what's going to happen when we use the id below? It looks like an exception might be thrown, so should we catch & log something? Or not update the preference value? Or both?

AL-Session · 2024-09-09T00:52:49Z

libsession/src/main/res/values/strings.xml

@@ -192,8 +193,9 @@
    <string name="clearMessagesNoteToSelfDescription">Are you sure you want to clear all Note to Self messages from your device?</string>
    <string name="close">Close</string>
    <string name="closeWindow">Close Window</string>
-    <string name="communityBanDescription">This will ban the selected user from this Community. Are you sure you want to continue?</string>
+    <string name="commitHashDesktop">Commit Hash: {hash}</string>


I don't think we need this Desktop string - we just put the first 6 digits of the hash in without explanation in the SettingsActivity at the bottom.

We'll see if the script can be updated to remove iOS and desktop strings

AL-Session · 2024-09-09T00:54:12Z

libsession/src/main/res/values/strings.xml

@@ -363,6 +366,12 @@
        <item quantity="one">And %1$d other has reacted %2$s to this message.</item>
        <item quantity="other">And %1$d others have reacted %2$s to this message.</item>
    </plurals>
+    <string name="emojiReactsHoverNameDesktop">{name} reacted with {emoji_name}</string>


More Desktop strings that can be removed. Anything with Desktop in it should likely go.

We'll see if the script can be updated to remove iOS and desktop strings

AL-Session · 2024-09-09T00:57:02Z

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -523,7 +523,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                Column {
                    // add the debug menu in non release builds
                    if (BuildConfig.BUILD_TYPE != "release") {
-                        LargeItemButton(DEBUG_MENU, R.drawable.ic_settings) { push<DebugActivity>() }
+                        LargeItemButton("Debug Menu", R.drawable.ic_settings) { push<DebugActivity>() }


Not convinced this is beneficial, but up to y'all..

AL-Session · 2024-09-09T01:18:10Z

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

+        val userPublicKey = getUserPublicKey() ?: return
+
+        val mmsDb = DatabaseComponent.get(context).mmsDatabase()
+        val message = IncomingMediaMessage(


If we converted IncomingMediaMessage to Kotlin we could have named arguments, because that constructor is absolutely grim and invites mistakes!

Yeah that is a nice update that we can work on post strings

app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt

libsession/src/main/res/values/strings.xml

AL-Session · 2024-09-09T01:40:14Z

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -149,12 +138,14 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
        if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult

        val outputFile = Uri.fromFile(File(cacheDir, "cropped"))
-        val inputFile: Uri? = result.data?.data ?: tempFile?.let(Uri::fromFile)
+        val inputFile: Uri? = result.data?.data ?: viewModel.getTempFile()?.let(Uri::fromFile)


While unlikely, inputFile could be null here because createTempFile can fail - so perhaps log something rather than proceed to cropImage with a null file if inputFile is null.

Yeah, this follows the logic that was currently in place. I'm not exactly sure how it can reach a state where the VM's temp file is null. We could maybe make sure it never is. But the input file here already expects the Uri to be nullable

SessionHero01

LGTM

ThomasSession and others added 30 commits September 6, 2024 08:34

Fixing styling issue in unread scroll to bottom button

f241328

Fixing up styling of Prominent buttons and "view_user" to work better…

32acd6e

… on different bg colors

Fixing strings

28d59f9

Strings fixes

ea24ff6

Reworked preferences

97db1fe

Making sure the summary was displaye properly for drop down preferences

Updated the fake message in appearance

2704bc7

Adding the ability to copy in message details

4aa68c9

Cleaning up icons

Showing 'copy account id' in menu in 1to1 too

4d47354

Updating files tab in "All media"

ffbb7d8

Strings updates

2f4c605

Latest strings Removed the LEGACY disappearing messages New title for Share activity (also formatted the lines)

Latest strings and handling bold

81f56de

Updated constants file

86f89f8

Can save media in message details page now

d7bd0bf

Adding padding so that context menu doesn't hit the bottom of the screen

bc067b6

Strings update

3db8b46

Reverted changes on DMs

7f8e9fd

Better ripple for home FAB

14207c7

Added a control message when the current user accepts a message request

2c3e73b

Updated QR screen to show dialog when permission is permanently denied

a7843af

Missing the real string for it!

Using the Compose version of our QR scanning

fa90b74

Deleting non needed files

Comments for future changes in JoinCommunityFragment

4fd3961

New strings + new camera permission handling

139f4ba

Making sure we do not crash when making/receiving a call without the …

5795998

…microphone permission

Added a new control message type to handle missed calls due to permis…

4860adc

…sions

Changed the missed call control message logic

f44d066

The control message is now clickable when the phone toggle is disabled or when the microphone permission is not given

Do not change the text color on emioji picker

2174976

[SES-2695] Incorrect message request approval on home screen

aef0adb

WIP for new avatar selection

c38efc2

Merge branch 'feature/strings-updates' of https://github.com/oxen-io/…

c633338

…session-android into feature/strings-updates

SES-2651 - New avatar picker

c0bf015

Updated the avatar picker to match the designs. Had to rewrite it in Compose and moved the logic to the VM. We could moev the whole settings page to compose in another step now that we have the VM set up.

ThomasSession added 4 commits September 9, 2024 10:54

Fixing the remaining tasks

422b8b2

Group notification option was missing Using the appropriate disappearing message string Don't show 'uploading' state for quotes/replies

Differentiating between voice notes and regular audio

ae64189

Fixing 'Leave group dialog' from inside the group settings

4e2cef6

SES-2692 only save valid media in message details

1761024

AL-Session reviewed Sep 9, 2024

View reviewed changes

ThomasSession added 2 commits September 9, 2024 12:00

SES-2675 - Standardisingdenied mic permission

87e3f93

PR comment

85161ff

SessionHero01 self-requested a review September 9, 2024 03:49

SessionHero01 approved these changes Sep 9, 2024

View reviewed changes

Fixing Camera permissions

83b08cc

ThomasSession merged commit a6efb43 into release/1.20.0 Sep 9, 2024
0 of 2 checks passed

ThomasSession deleted the feature/strings-updates branch September 9, 2024 04:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/strings updates #1659

Feature/strings updates #1659

ThomasSession commented Sep 8, 2024

AL-Session left a comment

AL-Session Sep 9, 2024

AL-Session Sep 9, 2024

AL-Session Sep 9, 2024

AL-Session Sep 9, 2024

ThomasSession Sep 9, 2024

AL-Session Sep 9, 2024

ThomasSession Sep 9, 2024

AL-Session Sep 9, 2024

AL-Session Sep 9, 2024

ThomasSession Sep 9, 2024

AL-Session Sep 9, 2024

ThomasSession Sep 9, 2024

SessionHero01 left a comment

Feature/strings updates #1659

Feature/strings updates #1659

Conversation

ThomasSession commented Sep 8, 2024

AL-Session left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SessionHero01 left a comment

Choose a reason for hiding this comment