From 91d96681eba011b31468649a1c69510e355ca76c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Aug 2024 16:06:38 +0200 Subject: [PATCH] More cleanup --- .../src/main/res/values/strings.xml | 121 ++++++++++++------ .../stylable_qr_code_instructions_view.xml | 11 -- .../stylable_qr_code_login_header_view.xml | 11 -- ..._qr_code_login_instruction_with_border.xml | 14 -- vector/src/main/res/drawable/ic_qr_code.xml | 9 -- .../drawable/ic_qr_code_login_connected.xml | 9 -- .../res/drawable/ic_qr_code_login_failed.xml | 10 -- .../res/layout/view_qr_code_login_header.xml | 48 ------- .../view_qr_code_login_instructions.xml | 101 --------------- 9 files changed, 80 insertions(+), 254 deletions(-) delete mode 100644 library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml delete mode 100644 library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml delete mode 100644 vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml delete mode 100644 vector/src/main/res/drawable/ic_qr_code.xml delete mode 100644 vector/src/main/res/drawable/ic_qr_code_login_connected.xml delete mode 100644 vector/src/main/res/drawable/ic_qr_code_login_failed.xml delete mode 100644 vector/src/main/res/layout/view_qr_code_login_header.xml delete mode 100644 vector/src/main/res/layout/view_qr_code_login_instructions.xml diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index 2a98069c2e..ef02e525af 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -2228,7 +2228,8 @@ If you don’t know your password, go back to reset it. This is not a valid user identifier. Expected format: \'@user:homeserver.org\' Unable to find a valid homeserver. Please check your identifier - Scan QR code + + Scan QR code Seen by @@ -3475,9 +3476,10 @@ Session name Custom session names can help you recognize your devices more easily. Please be aware that session names are also visible to people you communicate with. - Sign in with QR Code - You can use this device to sign in a mobile or web device with a QR code. There are two ways to do this: - + + Sign in with QR Code + + You can use this device to sign in a mobile or web device with a QR code. There are two ways to do this: Inactive sessions Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.\n\nRemoving inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious. Unverified sessions @@ -3515,45 +3517,82 @@ Tap top right to see the option to feedback. Try it out - 1 - 2 - 3 + + 1 + + 2 + + 3 - Scan QR code - Use the camera on this device to scan the QR code shown on your other device: - Sign in with QR code - Use your signed in device to scan the QR code below: - Scan the QR code below with your device that’s signed out. - Secure connection established - Check your signed in device, the code below should be displayed. Confirm that the code below matches with that device: - Unsuccessful connection - Linking with this device is not supported. - The linking wasn’t completed in the required time. - The request was denied on the other device. - The request failed. - A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your internet connection(s); Your device(s); - The other device is already signed in. - The other device must be signed in. - That QR code is invalid. - The sign in was cancelled on the other device. - The homeserver doesn\'t support sign in with QR code. - Open the app on your other device - Go to Settings -> Security & Privacy - Select \'Show QR code\' - Start at the sign in screen - Select \'Sign in with QR code\' - Start at the sign in screen - Select \'Scan QR code\' - Show QR code in this device - Signing in a mobile device? - Scan QR code - Connecting to device - Signing you in - No match? - Try again - Confirm - Please ensure that you know the origin of this code. By linking devices, you will provide someone with full access to your account. + + Scan QR code + + Use the camera on this device to scan the QR code shown on your other device: + + Sign in with QR code + + Use your signed in device to scan the QR code below: + + Scan the QR code below with your device that’s signed out. + + Secure connection established + + Check your signed in device, the code below should be displayed. Confirm that the code below matches with that device: + + Unsuccessful connection + + Linking with this device is not supported. + + The linking wasn’t completed in the required time. + + The request was denied on the other device. + + The request failed. + + A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your internet connection(s); Your device(s); + + The other device is already signed in. + + The other device must be signed in. + + That QR code is invalid. + + The sign in was cancelled on the other device. + + The homeserver doesn\'t support sign in with QR code. + + Open the app on your other device + + Go to Settings -> Security & Privacy + + Select \'Show QR code\' + + Start at the sign in screen + + Select \'Sign in with QR code\' + + Start at the sign in screen + + Select \'Scan QR code\' + + Show QR code in this device + + Signing in a mobile device? + + Scan QR code + + Connecting to device + + Signing you in + + No match? + + Try again + + Confirm + + Please ensure that you know the origin of this code. By linking devices, you will provide someone with full access to your account. Apply bold format diff --git a/library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml b/library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml deleted file mode 100644 index c9a4bb9d05..0000000000 --- a/library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml b/library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml deleted file mode 100644 index 99f56084d9..0000000000 --- a/library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml b/vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml deleted file mode 100644 index cb99e4467c..0000000000 --- a/vector/src/main/res/drawable/circle_qr_code_login_instruction_with_border.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/vector/src/main/res/drawable/ic_qr_code.xml b/vector/src/main/res/drawable/ic_qr_code.xml deleted file mode 100644 index 1ebdc169c9..0000000000 --- a/vector/src/main/res/drawable/ic_qr_code.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/vector/src/main/res/drawable/ic_qr_code_login_connected.xml b/vector/src/main/res/drawable/ic_qr_code_login_connected.xml deleted file mode 100644 index 48f5c6a383..0000000000 --- a/vector/src/main/res/drawable/ic_qr_code_login_connected.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/vector/src/main/res/drawable/ic_qr_code_login_failed.xml b/vector/src/main/res/drawable/ic_qr_code_login_failed.xml deleted file mode 100644 index f49e07c066..0000000000 --- a/vector/src/main/res/drawable/ic_qr_code_login_failed.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/vector/src/main/res/layout/view_qr_code_login_header.xml b/vector/src/main/res/layout/view_qr_code_login_header.xml deleted file mode 100644 index 4a734ec21e..0000000000 --- a/vector/src/main/res/layout/view_qr_code_login_header.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - diff --git a/vector/src/main/res/layout/view_qr_code_login_instructions.xml b/vector/src/main/res/layout/view_qr_code_login_instructions.xml deleted file mode 100644 index fee3e2c5d6..0000000000 --- a/vector/src/main/res/layout/view_qr_code_login_instructions.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -