From 217514af66affe0f3d3fe678349a4eb7ee53d22a Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Fri, 18 Dec 2020 16:47:34 -0600
Subject: [PATCH] Show vault export warning as popup (#1185)

---
 src/App/Pages/Settings/ExportVaultPage.xaml   | 13 -----
 .../Settings/ExportVaultPageViewModel.cs      | 53 +++++++++++--------
 src/App/Resources/AppResources.Designer.cs    |  8 +++
 src/App/Resources/AppResources.resx           |  6 ++-
 4 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/App/Pages/Settings/ExportVaultPage.xaml b/src/App/Pages/Settings/ExportVaultPage.xaml
index 5d528959f8..a7e0810aca 100644
--- a/src/App/Pages/Settings/ExportVaultPage.xaml
+++ b/src/App/Pages/Settings/ExportVaultPage.xaml
@@ -76,19 +76,6 @@
                 <Label
                     Text="{u:I18n ExportVaultMasterPasswordDescription}"
                     StyleClass="box-footer-label, box-footer-label-switch" />
-                <Label
-                    StyleClass="box-footer-label, box-footer-label-switch"
-                    Margin="0, 20">
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span
-                                Text="{Binding Converter={StaticResource toUpper}, ConverterParameter={u:I18n Warning}}"
-                                FontAttributes="Bold" />
-                            <Span Text=": " FontAttributes="Bold" />
-                            <Span Text="{Binding ExportWarningMessage}" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
                 <StackLayout Spacing="20">
                     <Button Text="{u:I18n ExportVault}"
                             Clicked="ExportVault_Clicked"
diff --git a/src/App/Pages/Settings/ExportVaultPageViewModel.cs b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
index 6d8c2befe4..8849bcba48 100644
--- a/src/App/Pages/Settings/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -105,36 +105,43 @@ namespace Bit.App.Pages
 
             var keyHash = await _cryptoService.HashPasswordAsync(_masterPassword, null);
             MasterPassword = string.Empty;
-            
-            var storedKeyHash = await _cryptoService.GetKeyHashAsync();
-            if (storedKeyHash != null && keyHash != null && storedKeyHash == keyHash)
-            {
-                try
-                {
-                    var data = await _exportService.GetExport(FileFormatOptions[FileFormatSelectedIndex].Key);
-                    var fileFormat = FileFormatOptions[FileFormatSelectedIndex].Key;
-                    _defaultFilename = _exportService.GetFileName(null, fileFormat);
-                    _exportResult = Encoding.ASCII.GetBytes(data);
 
-                    if (!_deviceActionService.SaveFile(_exportResult, null, _defaultFilename, null))
-                    {
-                        ClearResult();
-                        await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
-                    }
-                }
-                catch (Exception ex)
+            var storedKeyHash = await _cryptoService.GetKeyHashAsync();
+            if (storedKeyHash == null || keyHash == null || storedKeyHash != keyHash)
+            {
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                return;
+            }
+
+            bool userConfirmedExport = await _platformUtilsService.ShowDialogAsync(ExportWarningMessage,
+                _i18nService.T("ExportVaultConfirmationTitle"), _i18nService.T("ExportVault"), _i18nService.T("Cancel"));
+
+            if (!userConfirmedExport)
+            {
+                return;
+            }
+
+            try
+            {
+                var data = await _exportService.GetExport(FileFormatOptions[FileFormatSelectedIndex].Key);
+                var fileFormat = FileFormatOptions[FileFormatSelectedIndex].Key;
+                _defaultFilename = _exportService.GetFileName(null, fileFormat);
+                _exportResult = Encoding.ASCII.GetBytes(data);
+
+                if (!_deviceActionService.SaveFile(_exportResult, null, _defaultFilename, null))
                 {
                     ClearResult();
                     await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
-                    System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
-#if !FDROID
-                    Crashes.TrackError(ex);
-#endif
                 }
             }
-            else
+            catch (Exception ex)
             {
-                await _platformUtilsService.ShowDialogAsync(_i18nService.T("InvalidMasterPassword"));
+                ClearResult();
+                await _platformUtilsService.ShowDialogAsync(_i18nService.T("ExportVaultFailure"));
+                System.Diagnostics.Debug.WriteLine(">>> {0}: {1}", ex.GetType(), ex.StackTrace);
+#if !FDROID
+                Crashes.TrackError(ex);
+#endif
             }
         }
 
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 87c3c05ab5..4c364fa2b1 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -2827,6 +2827,14 @@ namespace Bit.App.Resources {
             }
         }
 
+        public static string ExportVaultConfirmationTitle
+        {
+            get
+            {
+                return ResourceManager.GetString("ExportVaultConfirmationTitle", resourceCulture);
+            }
+        }
+
         public static string Warning {
             get {
                 return ResourceManager.GetString("Warning", resourceCulture);
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 6a618079fc..ab0379ee40 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1605,6 +1605,10 @@
   <data name="EncExportVaultWarning" 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>
   </data>
+  <data name="ExportVaultConfirmationTitle" xml:space="preserve">
+    <value>Confirm Vault Export</value>
+    <comment>Title for the alert to confirm vault exports.</comment>
+  </data>
   <data name="Warning" xml:space="preserve">
     <value>Warning</value>
   </data>
@@ -1792,4 +1796,4 @@
   <data name="PersonalOwnershipSubmitError" xml:space="preserve">
     <value>Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections.</value>
   </data>
-</root>
\ No newline at end of file
+</root>