empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure that substrings match in the registration contact support bottom sheet.

Browse source
This commit is contained in:
Nicholas Tinsley 2024-06-13 15:36:41 -04:00
parent 0bea15c0af
commit 2ab2c6f039
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
View file

@ -80,7 +80,7 @@ class ContactSupportBottomSheetFragment : ComposeBottomSheetDialogFragment() {
private fun buildClickableString(): AnnotatedString { private fun buildClickableString(): AnnotatedString {
val troubleshootingStepsString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring) val troubleshootingStepsString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring)
val contactSupportString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_contact_support_substring) val contactSupportString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_contact_support_substring)
val completeString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_body_call_to_action) val completeString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_body_call_to_action, troubleshootingStepsString, contactSupportString)
val troubleshootingStartIndex = completeString.indexOf(troubleshootingStepsString) val troubleshootingStartIndex = completeString.indexOf(troubleshootingStepsString)
val troubleshootingEndIndex = troubleshootingStartIndex + troubleshootingStepsString.length val troubleshootingEndIndex = troubleshootingStartIndex + troubleshootingStepsString.length

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

@ -2230,8 +2230,8 @@
<string name="RegistrationActivity_support_bottom_sheet_title">Having trouble registering?</string> <string name="RegistrationActivity_support_bottom_sheet_title">Having trouble registering?</string>
<!-- A list of suggestions to try for a user having trouble entering their verification code.--> <!-- A list of suggestions to try for a user having trouble entering their verification code.-->
<string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Make sure your phone has a cellular signal to receive your SMS or call\n • Confirm you can receive a phone call to the number\n • Check that you have entered your phone number correctly.</string> <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Make sure your phone has a cellular signal to receive your SMS or call\n • Confirm you can receive a phone call to the number\n • Check that you have entered your phone number correctly.</string>
<!-- A call to action for a user having trouble entering the verification to seek further help. --> <!-- A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
<string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For more information, please follow these troubleshooting steps or Contact Support</string> <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For more information, please follow %1$s or %2$s</string>
<!-- A clickable piece of text that will take the user to our website with additional suggestions.--> <!-- A clickable piece of text that will take the user to our website with additional suggestions.-->
<string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">these troubleshooting steps</string> <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">these troubleshooting steps</string>
<!-- A clickable piece of text that will pre-fill a request for support email in the user\'s email app.--> <!-- A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->