mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 15:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add extra encrypted export warning (#1299)

Browse source
This commit is contained in:
Thomas Rittson 2021-03-05 09:33:29 +10:00 committed by GitHub
parent 53c82f23bf
commit 2b81bd2c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/App/Pages/Settings/ExportVaultPageViewModel.cs
View file

@ -170,7 +170,9 @@ namespace Bit.App.Pages
switch (FileFormatOptions[FileFormatSelectedIndex].Key) switch (FileFormatOptions[FileFormatSelectedIndex].Key)
{ {
case "encrypted_json": case "encrypted_json":
ExportWarningMessage = _i18nService.T("EncExportVaultWarning"); ExportWarningMessage = _i18nService.T("EncExportKeyWarning") +
"\n\n" +
_i18nService.T("EncExportAccountWarning");
break; break;
default: default:
ExportWarningMessage = _i18nService.T("ExportVaultWarning"); ExportWarningMessage = _i18nService.T("ExportVaultWarning");

12
src/App/Resources/AppResources.Designer.cs generated
View file

@ -1,6 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -9,6 +10,7 @@
namespace Bit.App.Resources { namespace Bit.App.Resources {
using System; using System;
using System.Reflection;
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
@ -2817,9 +2819,15 @@ namespace Bit.App.Resources {
} }
} }
public static string EncExportVaultWarning { public static string EncExportKeyWarning {
get { get {
return ResourceManager.GetString("EncExportVaultWarning", resourceCulture); return ResourceManager.GetString("EncExportKeyWarning", resourceCulture);
}
}
public static string EncExportAccountWarning {
get {
return ResourceManager.GetString("EncExportAccountWarning", resourceCulture);
} }
} }

5
src/App/Resources/AppResources.resx
View file

@ -1602,9 +1602,12 @@
<data name="ExportVaultWarning" xml:space="preserve"> <data name="ExportVaultWarning" xml:space="preserve">
<value>This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.</value> <value>This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.</value>
</data> </data>
<data name="EncExportVaultWarning" xml:space="preserve"> <data name="EncExportKeyWarning" xml:space="preserve">
<value>This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file.</value> <value>This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file.</value>
</data> </data>
<data name="EncExportAccountWarning" xml:space="preserve">
<value>Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account.</value>
</data>
<data name="ExportVaultConfirmationTitle" xml:space="preserve"> <data name="ExportVaultConfirmationTitle" xml:space="preserve">
<value>Confirm Vault Export</value> <value>Confirm Vault Export</value>
<comment>Title for the alert to confirm vault exports.</comment> <comment>Title for the alert to confirm vault exports.</comment>