This repository has been archived by the owner on Apr 12, 2022. It is now read-only.
Keys Backup can be setup twice #9510 #3127
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
bmarty
reviewed
Apr 17, 2019
| processOnCreate() | ||
| } else { | ||
| //we should prompt | ||
| AlertDialog.Builder(context) |
There was a problem hiding this comment.
The dialog should not be in the model
| @@ -1294,6 +1294,11 @@ Why choose Riot.im? | |||
| <string name="keys_backup_setup_step3_save_button_title">Save as File</string> | |||
| <string name="recovery_key_export_saved_as_warning">The recovery key has been saved to \'%s\'.\n\nWarning: this file may be deleted if the application is uninstalled.</string> | |||
|
|
|||
| <string name="keys_backup_setup_override_backup_prompt_tile">A backup already exist in this location</string> | |||
There was a problem hiding this comment.
A backup already exists in this location on your homeserver
|
|
||
| //Force remote backup state update to update the banner if needed | ||
| if (mSession.getCrypto() != null) { | ||
| mSession.getCrypto().getKeysBackup().checkAndStartKeysBackup(); |
bmarty
reviewed
Apr 25, 2019
| @@ -190,30 +203,22 @@ class KeysBackupSetupSharedViewModel : ViewModel() { | |||
| keysBackup.getCurrentVersion(object : SimpleApiCallback<KeysVersionResult?>(failureCallBack) { | |||
| override fun onSuccess(info: KeysVersionResult?) { | |||
| loadingStatus.value = null | |||
| if (info?.version.isNullOrBlank()) { | |||
| if (info?.version.isNullOrBlank() || forceOverride) { | |||
| //should not happen | |||
| processOnCreate() | ||
| } else { | ||
| //we should prompt | ||
| loadingStatus.value = null |
There was a problem hiding this comment.
This line is not necessary (it's done line 205)
| } | ||
|
|
||
| fun processOnCreate() { | ||
| keysBackup.createKeysBackupVersion(megolmBackupCreationInfo!!, object : SimpleApiCallback<KeysVersion>(failureCallBack) { |
There was a problem hiding this comment.
The loading status is not set to true before this call?
| @@ -1294,6 +1294,11 @@ Why choose Riot.im? | |||
| <string name="keys_backup_setup_step3_save_button_title">Save as File</string> | |||
| <string name="recovery_key_export_saved_as_warning">The recovery key has been saved to \'%s\'.\n\nWarning: this file may be deleted if the application is uninstalled.</string> | |||
|
|
|||
| <string name="keys_backup_setup_override_backup_prompt_tile">A backup already exist on your HomeServer</string> | |||
There was a problem hiding this comment.
Suggested change
| <string name="keys_backup_setup_override_backup_prompt_tile">A backup already exist on your HomeServer</string> | |
| <string name="keys_backup_setup_override_backup_prompt_tile">A backup already exists on your homeserver</string> |
| <string name="keys_backup_setup_override_backup_prompt_tile">A backup already exist on your HomeServer</string> | ||
| <string name="keys_backup_setup_override_backup_prompt_description">It looks like you already have setup key backup from another device. Do you want to replace it with the one you’re creating?</string> | ||
| <string name="keys_backup_setup_override_replace">Replace</string> | ||
| <string name="keys_backup_setup_override_stop">Stop</string> |
There was a problem hiding this comment.
Suggested change
| <string name="keys_backup_setup_override_stop">Stop</string> | |
| <string name="keys_backup_setup_override_stop">Cancel</string> |
33 tasks
bmarty
added a commit
to element-hq/element-android
that referenced
this pull request
Jun 17, 2019
bmarty
added a commit
to element-hq/element-android
that referenced
this pull request
Jun 17, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #9510
Check for existing backup in the last step of the setup.
Check remote state when VectorHomeActivity is resumed to update banner.