Enable reset all and skip options #7721
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ElementBot
reviewed
Dec 6, 2022
vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
Outdated
Show resolved
Hide resolved
vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
Outdated
Show resolved
Hide resolved
...rc/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt
Outdated
Show resolved
Hide resolved
...r/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationViewModel.kt
Outdated
Show resolved
Hide resolved
BillCarsonFr
reviewed
Dec 7, 2022
| @@ -410,7 +410,7 @@ | |||
| <string name="action_disconnect">Disconnect</string> | |||
| <string name="action_play">Play</string> | |||
| <string name="action_dismiss">Dismiss</string> | |||
| <string name="action_reset">Reset</string> | |||
| <string name="action_reset">Proceed to Reset</string> | |||
There was a problem hiding this comment.
I'd rather create a new string, this one might be used somewhere else?
There was a problem hiding this comment.
I already checked that it is not used anywhere other than reset fragment. I will add a new string as per contribution guidelines.
| @@ -2634,9 +2634,10 @@ | |||
| <string name="failed_to_access_secure_storage">Failed to access secure storage</string> | |||
| <string name="bad_passphrase_key_reset_all_action">Forgot or lost all recovery options? Reset everything</string> | |||
| <string name="secure_backup_reset_all">Reset everything</string> | |||
| <string name="secure_backup_reset_all_no_other_devices">Only do this if you have no other device you can verify this device with.</string> | |||
| <string name="secure_backup_reset_all_no_other_devices">Resetting your verification keys cannot be undone. After resetting, you won't have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them.</string> | |||
There was a problem hiding this comment.
create a new string here? and mark this one as eventually? Check the Contributing.md for strings.
I think we can keep a short version and a longer one. Use the short in the bottomsheet and the long in the reset fragment?
| @@ -125,15 +126,17 @@ class SharedSecureStorageViewModel @AssistedInject constructor( | |||
| copy( | |||
| hasPassphrase = true, | |||
| ready = true, | |||
| step = SharedSecureStorageViewState.Step.EnterPassphrase | |||
| step = if (initialState.step == SharedSecureStorageViewState.Step.ResetAll) SharedSecureStorageViewState.Step.ResetAll | |||
| else SharedSecureStorageViewState.Step.EnterPassphrase | |||
There was a problem hiding this comment.
I find this a bit strange.
Wouldn't it be better to test if reset mode before trying to get the keyResult?
If state is not reset try to get keyResult and set the hasPassphrase/ready?
| @@ -82,9 +69,10 @@ | |||
| android:layout_marginTop="16dp" | |||
| android:layout_marginEnd="16dp" | |||
| android:layout_marginBottom="16dp" | |||
| android:text="@string/secure_backup_reset_no_history" | |||
| android:text="@string/secure_backup_reset_danger_warning" | |||
There was a problem hiding this comment.
I guess it's for consistency with web?
BillCarsonFr
approved these changes
Dec 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Content
Motivation and context
Part of element-r refactor alignment with web.
Tests
Tested devices
Checklist