X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FImportExportActivity.kt;h=cdd1bf0d28bb8e7a04fecfb3ea3063edaa3bfc15;hp=2e55dd52cdab7b13e9d39ae0828f24c2cba7b43c;hb=97ff4463a390d0b789f19d1c45bf9fc47428c86c;hpb=31e82dfc6235a460886d7dc9cdd1fbcba8ce695c diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt index 2e55dd52..cdd1bf0d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright 2018-2022 Soren Stoutner . + * Copyright 2018-2023 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -457,9 +457,9 @@ class ImportExportActivity : AppCompatActivity() { } else { // Export is selected // Open the file picker with the export name according to the encryption type. if (encryptionSpinner.selectedItemPosition == NO_ENCRYPTION) // No encryption is selected. - browseForExportActivityResultLauncher.launch(getString(R.string.privacy_browser_settings_pbs, BuildConfig.VERSION_NAME)) + browseForExportActivityResultLauncher.launch(getString(R.string.privacy_browser_settings_pbs, BuildConfig.VERSION_NAME, ImportExportDatabaseHelper.SCHEMA_VERSION)) else // Password encryption is selected. - browseForExportActivityResultLauncher.launch(getString(R.string.privacy_browser_settings_pbs_aes, BuildConfig.VERSION_NAME)) + browseForExportActivityResultLauncher.launch(getString(R.string.privacy_browser_settings_pbs_aes, BuildConfig.VERSION_NAME, ImportExportDatabaseHelper.SCHEMA_VERSION)) } } @@ -829,7 +829,8 @@ class ImportExportActivity : AppCompatActivity() { fileProviderDirectory.mkdir() // Set the temporary pre-encrypted export file. - temporaryPreEncryptedExportFile = File(fileProviderDirectory.toString() + "/" + getString(R.string.privacy_browser_settings_pbs, BuildConfig.VERSION_NAME)) + temporaryPreEncryptedExportFile = File(fileProviderDirectory.toString() + "/" + + getString(R.string.privacy_browser_settings_pbs, BuildConfig.VERSION_NAME, ImportExportDatabaseHelper.SCHEMA_VERSION)) // Delete the temporary pre-encrypted export file if it already exists. if (temporaryPreEncryptedExportFile.exists())