filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve wording

Browse Source
This commit is contained in:
Benoit Marty 2020-07-10 17:34:09 +02:00
parent 4387fd3327
commit 2c5d2ea179
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
View File

@ -176,25 +176,24 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
os.write(data.toByteArray()) os.write(data.toByteArray())
os.flush() os.flush()
} }
}?.let {
uri.toString()
} }
?: throw IOException() ?: throw IOException("Unable to write the file")
} }
.fold( .fold(
{ throwable -> { throwable ->
context?.let { activity?.let {
AlertDialog.Builder(it) AlertDialog.Builder(it)
.setTitle(R.string.dialog_title_error) .setTitle(R.string.dialog_title_error)
.setMessage(throwable.localizedMessage) .setMessage(errorFormatter.toHumanReadable(throwable))
} }
}, },
{ path -> {
viewModel.copyHasBeenMade = true viewModel.copyHasBeenMade = true
activity?.let {
context?.let {
AlertDialog.Builder(it) AlertDialog.Builder(it)
.setMessage(getString(R.string.recovery_key_export_saved_as_warning, path)) .setTitle(R.string.dialog_title_success)
.setMessage(R.string.recovery_key_export_saved)
} }
} }
) )

2
vector/src/main/res/values/strings.xml
View File

@ -126,6 +126,7 @@
<string name="dialog_title_confirmation">Confirmation</string> <string name="dialog_title_confirmation">Confirmation</string>
<string name="dialog_title_warning">Warning</string> <string name="dialog_title_warning">Warning</string>
<string name="dialog_title_error">Error</string> <string name="dialog_title_error">Error</string>
<string name="dialog_title_success">Success</string>
<!-- Bottom navigation buttons --> <!-- Bottom navigation buttons -->
<string name="bottom_action_home">Home</string> <string name="bottom_action_home">Home</string>
@ -1413,6 +1414,7 @@ Why choose Riot.im?
<string name="keys_backup_setup_step3_share_recovery_file">Share</string> <string name="keys_backup_setup_step3_share_recovery_file">Share</string>
<string name="keys_backup_setup_step3_save_button_title">Save as File</string> <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="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="recovery_key_export_saved">The recovery key has been saved.</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_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 session. Do you want to replace it with the one you’re creating?</string> <string name="keys_backup_setup_override_backup_prompt_description">It looks like you already have setup key backup from another session. Do you want to replace it with the one you’re creating?</string>