Skip to content

Commit c443f09

Browse files
committed
Update the strings for the device verification flow
Part of element-hq/element-meta#2898
1 parent 68fa054 commit c443f09

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private fun IncomingVerificationBottomMenu(
238238
VerificationBottomMenu {
239239
Button(
240240
modifier = Modifier.fillMaxWidth(),
241-
text = stringResource(CommonStrings.action_start),
241+
text = stringResource(CommonStrings.action_start_verification),
242242
onClick = { eventSink(IncomingVerificationViewEvents.StartVerification) },
243243
)
244244
TextButton(

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,10 @@ private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest.
157157
}
158158
Step.Canceled -> CommonStrings.common_verification_failed
159159
Step.Ready -> R.string.screen_session_verification_compare_emojis_title
160-
Step.Completed -> CommonStrings.common_verification_complete
160+
Step.Completed -> when (request) {
161+
is VerificationRequest.Outgoing.CurrentSession -> R.string.screen_session_verification_device_verified
162+
is VerificationRequest.Outgoing.User -> CommonStrings.common_verification_complete
163+
}
161164
is Step.Verifying -> when (step.data) {
162165
is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_title
163166
is SessionVerificationData.Emojis -> R.string.screen_session_verification_compare_emojis_title

features/verifysession/impl/src/main/res/values/localazy.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
<string name="screen_identity_use_another_device">"Use another device"</string>
1212
<string name="screen_identity_waiting_on_other_device">"Waiting on other device…"</string>
1313
<string name="screen_session_verification_cancelled_subtitle">"Something doesn’t seem right. Either the request timed out or the request was denied."</string>
14-
<string name="screen_session_verification_compare_emojis_subtitle">"Confirm that the emojis below match those shown on your other session."</string>
14+
<string name="screen_session_verification_compare_emojis_subtitle">"Confirm that the emojis below match those shown on your other device."</string>
1515
<string name="screen_session_verification_compare_emojis_title">"Compare emojis"</string>
1616
<string name="screen_session_verification_compare_emojis_user_subtitle">"Confirm that the emojis below match those shown on the other user’s device."</string>
1717
<string name="screen_session_verification_compare_numbers_subtitle">"Confirm that the numbers below match those shown on your other session."</string>
1818
<string name="screen_session_verification_compare_numbers_title">"Compare numbers"</string>
19-
<string name="screen_session_verification_complete_subtitle">"Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted."</string>
19+
<string name="screen_session_verification_complete_subtitle">"Now you can read or send messages securely on your other device."</string>
2020
<string name="screen_session_verification_complete_user_subtitle">"Now you can trust the identity of this user when sending or receiving messages."</string>
21+
<string name="screen_session_verification_device_verified">"Device verified"</string>
2122
<string name="screen_session_verification_enter_recovery_key">"Enter recovery key"</string>
2223
<string name="screen_session_verification_failed_subtitle">"Either the request timed out, the request was denied, or there was a verification mismatch."</string>
2324
<string name="screen_session_verification_open_existing_session_subtitle">"Prove it’s you in order to access your encrypted message history."</string>
@@ -44,7 +45,7 @@
4445
<string name="screen_session_verification_user_responder_subtitle">"For extra security, another user wants to verify your identity. You’ll be shown a set of emojis to compare."</string>
4546
<string name="screen_session_verification_waiting_another_device_subtitle">"You should see a popup on the other device. Start the verification from there now."</string>
4647
<string name="screen_session_verification_waiting_another_device_title">"Start verification on the other device"</string>
47-
<string name="screen_session_verification_waiting_other_device_title">"Waiting for the other device"</string>
48+
<string name="screen_session_verification_waiting_other_device_title">"Start verification on the other device"</string>
4849
<string name="screen_session_verification_waiting_other_user_title">"Waiting for the other user"</string>
4950
<string name="screen_session_verification_waiting_subtitle">"Once accepted you’ll be able to continue with the verification."</string>
5051
<string name="screen_session_verification_waiting_to_accept_subtitle">"Accept the request to start the verification process in your other session to continue."</string>

0 commit comments

Comments
 (0)