X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FImportExportActivity.java;h=3481f312dd555cd3b98054e9b7ab51c55bee1b5a;hp=a2d1797558bb86a9420e00728c6e25852ac13c72;hb=ba4a1c032dbffde044b70c804f9d3c1f1ba7b939;hpb=6b4312dc0c2d6cb059a0fbe6d4e7cd9317db34b6 diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java index a2d17975..3481f312 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019 Soren Stoutner . + * Copyright © 2018-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -21,24 +21,17 @@ package com.stoutner.privacybrowser.activities; import android.Manifest; import android.app.Activity; -import android.app.DialogFragment; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.media.MediaScannerConnection; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Environment; +import android.os.Handler; +import android.preference.PreferenceManager; import android.provider.DocumentsContract; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.view.View; @@ -52,8 +45,23 @@ import android.widget.RadioButton; import android.widget.Spinner; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import androidx.fragment.app.DialogFragment; + +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.textfield.TextInputLayout; + import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.dialogs.ImportExportStoragePermissionDialog; +import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog; +import com.stoutner.privacybrowser.helpers.DownloadLocationHelper; +import com.stoutner.privacybrowser.helpers.FileNameHelper; import com.stoutner.privacybrowser.helpers.ImportExportDatabaseHelper; import java.io.File; @@ -70,7 +78,7 @@ import javax.crypto.CipherOutputStream; import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.SecretKeySpec; -public class ImportExportActivity extends AppCompatActivity implements ImportExportStoragePermissionDialog.ImportExportStoragePermissionDialogListener { +public class ImportExportActivity extends AppCompatActivity implements StoragePermissionDialog.StoragePermissionDialogListener { // Create the encryption constants. private final int NO_ENCRYPTION = 0; private final int PASSWORD_ENCRYPTION = 1; @@ -81,17 +89,24 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp private final int OPENPGP_EXPORT_RESULT_CODE = 1; // `openKeychainInstalled` is accessed from an inner class. - boolean openKeychainInstalled; + private boolean openKeychainInstalled; @Override public void onCreate(Bundle savedInstanceState) { + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + + // Get the theme and screenshot preferences. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Disable screenshots if not allowed. - if (!MainWebViewActivity.allowScreenshots) { + if (!allowScreenshots) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } // Set the activity theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); } else { setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); @@ -103,16 +118,20 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Set the content view. setContentView(R.layout.import_export_coordinatorlayout); - // Use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar importExportAppBar = findViewById(R.id.import_export_toolbar); - setSupportActionBar(importExportAppBar); + // Set the support action bar. + Toolbar toolbar = findViewById(R.id.import_export_toolbar); + setSupportActionBar(toolbar); + + // Get a handle for the action bar. + ActionBar actionBar = getSupportActionBar(); + + // Remove the incorrect lint warning that the action bar might be null. + assert actionBar != null; // Display the home arrow on the support action bar. - ActionBar appBar = getSupportActionBar(); - assert appBar != null;// This assert removes the incorrect warning in Android Studio on the following line that `appBar` might be null. - appBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(true); - // Find out if we are running KitKat + // Find out if the system is running KitKat boolean runningKitKat = (Build.VERSION.SDK_INT == 19); // Find out if OpenKeychain is installed. @@ -133,6 +152,8 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp RadioButton exportRadioButton = findViewById(R.id.export_radiobutton); LinearLayout fileNameLinearLayout = findViewById(R.id.file_name_linearlayout); EditText fileNameEditText = findViewById(R.id.file_name_edittext); + TextView fileDoesNotExistTextView = findViewById(R.id.file_does_not_exist_textview); + TextView fileExistsWarningTextView = findViewById(R.id.file_exists_warning_textview); TextView openKeychainImportInstructionsTextView = findViewById(R.id.openkeychain_import_instructions_textview); Button importExportButton = findViewById(R.id.import_export_button); TextView storagePermissionTextView = findViewById(R.id.import_export_storage_permission_textview); @@ -151,28 +172,30 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp kitKatPasswordEncryptionTextView.setVisibility(View.GONE); openKeychainRequiredTextView.setVisibility(View.GONE); fileNameLinearLayout.setVisibility(View.GONE); + fileDoesNotExistTextView.setVisibility(View.GONE); + fileExistsWarningTextView.setVisibility(View.GONE); openKeychainImportInstructionsTextView.setVisibility(View.GONE); importExportButton.setVisibility(View.GONE); - // Create strings for the default file paths. - String defaultFilePath; - String defaultPasswordEncryptionFilePath; + // Instantiate the download location helper. + DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper(); - // Set the default file paths according to the storage permission status. - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - // Set the default file paths to use the external public directory. - defaultFilePath = Environment.getExternalStorageDirectory() + "/" + getString(R.string.privacy_browser_settings); - defaultPasswordEncryptionFilePath = defaultFilePath + ".aes"; - } else { // The storage permission has not been granted. - // Set the default file paths to use the external private directory. - defaultFilePath = getApplicationContext().getExternalFilesDir(null) + "/" + getString(R.string.privacy_browser_settings); - defaultPasswordEncryptionFilePath = defaultFilePath + ".aes"; - } + // Get the default file path. + String defaultFilePath = downloadLocationHelper.getDownloadLocation(this) + "/" + getString(R.string.settings_pbs); + + // Set the other default file paths. + String defaultPasswordEncryptionFilePath = defaultFilePath + ".aes"; + String defaultPgpFilePath = defaultFilePath + ".pgp"; // Set the default file path. fileNameEditText.setText(defaultFilePath); - // Display the encryption information when the spinner changes. + // Hide the storage permission text view if the permission has already been granted. + if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { + storagePermissionTextView.setVisibility(View.GONE); + } + + // Update the UI when the spinner changes. encryptionSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -199,9 +222,6 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Reset the default file path. fileNameEditText.setText(defaultFilePath); - - // Enable the import/export button if a file name exists. - importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty()); break; case PASSWORD_ENCRYPTION: @@ -235,9 +255,6 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Update the default file path. fileNameEditText.setText(defaultPasswordEncryptionFilePath); - - // Enable the import/export button if a password exists. - importExportButton.setEnabled(!encryptionPasswordEditText.getText().toString().isEmpty()); } break; @@ -248,8 +265,8 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Updated items based on the installation status of OpenKeychain. if (openKeychainInstalled) { // OpenKeychain is installed. - // Remove the default file path. - fileNameEditText.setText(""); + // Update the default file path. + fileNameEditText.setText(defaultPgpFilePath); // Show the file location card. fileLocationCardView.setVisibility(View.VISIBLE); @@ -261,16 +278,10 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Set the text of the import button to be `Decrypt`. importExportButton.setText(R.string.decrypt); - - // Disable the import/export button. The user needs to select a file to import first. - importExportButton.setEnabled(false); } else if (exportRadioButton.isChecked()) { // Hide the file name linear layout and the OpenKeychain import instructions. fileNameLinearLayout.setVisibility(View.GONE); openKeychainImportInstructionsTextView.setVisibility(View.GONE); - - // Enable the import/export button. - importExportButton.setEnabled(true); } } else { // OpenKeychain is not installed. // Show the OpenPGP required layout item. @@ -303,12 +314,24 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp @Override public void afterTextChanged(Editable s) { - // Enable the import/export button if a file name and password exists. - importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); + // Get the current file name. + String fileNameString = fileNameEditText.getText().toString(); + + // Convert the file name string to a file. + File file = new File(fileNameString); + + // Update the import/export button. + if (importRadioButton.isChecked()) { // The import radio button is checked. + // Enable the import button if the file and the password exists. + importExportButton.setEnabled(file.exists() && !encryptionPasswordEditText.getText().toString().isEmpty()); + } else if (exportRadioButton.isChecked()) { // The export radio button is checked. + // Enable the export button if the file string and the password exists. + importExportButton.setEnabled(!fileNameString.isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); + } } }); - // Update the status of the import/export button when the file name EditText changes. + // Update the UI when the file name EditText changes. fileNameEditText.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -322,40 +345,145 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp @Override public void afterTextChanged(Editable s) { - // Adjust the export button according to the encryption spinner position. + // Get the current file name. + String fileNameString = fileNameEditText.getText().toString(); + + // Convert the file name string to a file. + File file = new File(fileNameString); + + // Adjust the UI according to the encryption spinner position. switch (encryptionSpinner.getSelectedItemPosition()) { case NO_ENCRYPTION: - // Enable the import/export button if a file name exists. - importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty()); + // Determine if import or export is checked. + if (exportRadioButton.isChecked()) { // The export radio button is checked. + // Hide the file does not exist text view. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Display a warning if the file already exists. + if (file.exists()) { + fileExistsWarningTextView.setVisibility(View.VISIBLE); + } else { + fileExistsWarningTextView.setVisibility(View.GONE); + } + + // Enable the export button if the file name is populated. + importExportButton.setEnabled(!fileNameString.isEmpty()); + } else if (importRadioButton.isChecked()) { // The import radio button is checked. + // Hide the file exists warning text view. + fileExistsWarningTextView.setVisibility(View.GONE); + + // Check if the file exists. + if (file.exists()) { // The file exists. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Enable the import button. + importExportButton.setEnabled(true); + } else { // The file does not exist. + // Show a notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.VISIBLE); + + // Disable the import button. + importExportButton.setEnabled(false); + } + } else { // Neither radio button is checked. + // Hide the file notification text views. + fileExistsWarningTextView.setVisibility(View.GONE); + fileDoesNotExistTextView.setVisibility(View.GONE); + } break; case PASSWORD_ENCRYPTION: - // Enable the import/export button if a file name and password exists. - importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); + // Determine if import or export is checked. + if (exportRadioButton.isChecked()) { // The export radio button is checked. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Display a warning if the file already exists. + if (file.exists()) { + fileExistsWarningTextView.setVisibility(View.VISIBLE); + } else { + fileExistsWarningTextView.setVisibility(View.GONE); + } + + // Enable the export button if the file name and the password are populated. + importExportButton.setEnabled(!fileNameString.isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); + } else if (importRadioButton.isChecked()) { // The import radio button is checked. + // Hide the file exists warning text view. + fileExistsWarningTextView.setVisibility(View.GONE); + + // Check if the file exists. + if (file.exists()) { // The file exists. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Enable the import button if the password is populated. + importExportButton.setEnabled(!encryptionPasswordEditText.getText().toString().isEmpty()); + } else { // The file does not exist. + // Show a notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.VISIBLE); + + // Disable the import button. + importExportButton.setEnabled(false); + } + } else { // Neither radio button is checked. + // Hide the file notification text views. + fileExistsWarningTextView.setVisibility(View.GONE); + fileDoesNotExistTextView.setVisibility(View.GONE); + } break; case OPENPGP_ENCRYPTION: - // Enable the import/export button if OpenKeychain is installed and a file name exists. - importExportButton.setEnabled(openKeychainInstalled && !fileNameEditText.getText().toString().isEmpty()); + // Hide the file exists warning text view. + fileExistsWarningTextView.setVisibility(View.GONE); + + if (importRadioButton.isChecked()) { // The import radio button is checked. + if (file.exists()) { // The file exists. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Enable the import button if OpenKeychain is installed. + importExportButton.setEnabled(openKeychainInstalled); + } else { // The file does not exist. + // Show the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.VISIBLE); + + // Disable the import button. + importExportButton.setEnabled(false); + } + } else if (exportRadioButton.isChecked()){ // The export radio button is checked. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Enable the export button. + importExportButton.setEnabled(true); + } else { // Neither radio button is checked. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + } break; } } }); - - // Hide the storage permissions TextView on API < 23 as permissions on older devices are automatically granted. - if (Build.VERSION.SDK_INT < 23) { - storagePermissionTextView.setVisibility(View.GONE); - } } public void onClickRadioButton(View view) { // Get handles for the views. Spinner encryptionSpinner = findViewById(R.id.encryption_spinner); LinearLayout fileNameLinearLayout = findViewById(R.id.file_name_linearlayout); + EditText passwordEncryptionEditText = findViewById(R.id.password_encryption_edittext); EditText fileNameEditText = findViewById(R.id.file_name_edittext); + TextView fileDoesNotExistTextView = findViewById(R.id.file_does_not_exist_textview); + TextView fileExistsWarningTextView = findViewById(R.id.file_exists_warning_textview); TextView openKeychainImportInstructionTextView = findViewById(R.id.openkeychain_import_instructions_textview); Button importExportButton = findViewById(R.id.import_export_button); + // Get the current file name. + String fileNameString = fileNameEditText.getText().toString(); + + // Convert the file name string to a file. + File file = new File(fileNameString); + // Check to see if import or export was selected. switch (view.getId()) { case R.id.import_radiobutton: @@ -366,9 +494,6 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Set the text on the import/export button to be `Decrypt`. importExportButton.setText(R.string.decrypt); - - // Enable the decrypt button if there is a file name. - importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty()); } else { // OpenPGP encryption not selected. // Hide the OpenKeychain import instructions. openKeychainImportInstructionTextView.setVisibility(View.GONE); @@ -377,9 +502,33 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp importExportButton.setText(R.string.import_button); } + // Hide the file exists warning text view. + fileExistsWarningTextView.setVisibility(View.GONE); + // Display the file name views. fileNameLinearLayout.setVisibility(View.VISIBLE); importExportButton.setVisibility(View.VISIBLE); + + // Check to see if the file exists. + if (file.exists()) { // The file exists. + // Hide the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Check to see if password encryption is selected. + if (encryptionSpinner.getSelectedItemPosition() == PASSWORD_ENCRYPTION) { // Password encryption is selected. + // Enable the import button if the encryption password is populated. + importExportButton.setEnabled(!passwordEncryptionEditText.getText().toString().isEmpty()); + } else { // Password encryption is not selected. + // Enable the import/decrypt button. + importExportButton.setEnabled(true); + } + } else { // The file does not exist. + // Show the notification that the file does not exist. + fileDoesNotExistTextView.setVisibility(View.VISIBLE); + + // Disable the import/decrypt button. + importExportButton.setEnabled(false); + } break; case R.id.export_radiobutton: @@ -396,19 +545,41 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp if (encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) { // OpenPGP encryption is selected. // Hide the file name views. fileNameLinearLayout.setVisibility(View.GONE); + fileDoesNotExistTextView.setVisibility(View.GONE); + fileExistsWarningTextView.setVisibility(View.GONE); // Enable the export button. importExportButton.setEnabled(true); } else { // OpenPGP encryption is not selected. - // Show the file name views. + // Show the file name view. fileNameLinearLayout.setVisibility(View.VISIBLE); + + // Hide the notification that the file name does not exist. + fileDoesNotExistTextView.setVisibility(View.GONE); + + // Display a warning if the file already exists. + if (file.exists()) { + fileExistsWarningTextView.setVisibility(View.VISIBLE); + } else { + fileExistsWarningTextView.setVisibility(View.GONE); + } + + // Check the encryption type. + if (encryptionSpinner.getSelectedItemPosition() == NO_ENCRYPTION) { // No encryption is selected. + // Enable the export button if the file name is populated. + importExportButton.setEnabled(!fileNameString.isEmpty()); + } else { // Password encryption is selected. + // Enable the export button if the file name and the password are populated. + importExportButton.setEnabled(!fileNameString.isEmpty() && !passwordEncryptionEditText.getText().toString().isEmpty()); + } } break; } } public void browse(View view) { - // Get a handle for the import radiobutton. + // Get a handle for the views. + Spinner encryptionSpinner = findViewById(R.id.encryption_spinner); RadioButton importRadioButton = findViewById(R.id.import_radiobutton); // Check to see if import or export is selected. @@ -416,15 +587,15 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Create the file picker intent. Intent importBrowseIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT); - // Set the intent MIME type to include all files. + // Set the intent MIME type to include all files so that everything is visible. importBrowseIntent.setType("*/*"); - // Set the initial directory if API >= 26. + // Set the initial directory if the minimum API >= 26. if (Build.VERSION.SDK_INT >= 26) { importBrowseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory()); } - // Specify that a file that can be opened is requested. + // Request a file that can be opened. importBrowseIntent.addCategory(Intent.CATEGORY_OPENABLE); // Launch the file picker. @@ -433,18 +604,22 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Create the file picker intent. Intent exportBrowseIntent = new Intent(Intent.ACTION_CREATE_DOCUMENT); - // Set the intent MIME type to include all files. + // Set the intent MIME type to include all files so that everything is visible. exportBrowseIntent.setType("*/*"); - // Set the initial export file name. - exportBrowseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.privacy_browser_settings)); + // Set the initial export file name according to the encryption type. + if (encryptionSpinner.getSelectedItemPosition() == NO_ENCRYPTION) { // No encryption is selected. + exportBrowseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_pbs)); + } else { // Password encryption is selected. + exportBrowseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_pbs) + ".aes"); + } - // Set the initial directory if API >= 26. + // Set the initial directory if the minimum API >= 26. if (Build.VERSION.SDK_INT >= 26) { exportBrowseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory()); } - // Specify that a file that can be opened is requested. + // Request a file that can be opened. exportBrowseIntent.addCategory(Intent.CATEGORY_OPENABLE); // Launch the file picker. @@ -479,9 +654,9 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp String fileNameString = fileNameEditText.getText().toString(); // Get the external private directory `File`. - File externalPrivateDirectoryFile = getApplicationContext().getExternalFilesDir(null); + File externalPrivateDirectoryFile = getExternalFilesDir(null); - // Remove the lint error below that the `File` might be null. + // Remove the incorrect lint error below that the file might be null. assert externalPrivateDirectoryFile != null; // Get the external private directory string. @@ -501,10 +676,10 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Check if the user has previously denied the storage permission. if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { // Show a dialog explaining the request first. // Instantiate the storage permission alert dialog. - DialogFragment importExportStoragePermissionDialogFragment = new ImportExportStoragePermissionDialog(); + DialogFragment storagePermissionDialogFragment = StoragePermissionDialog.displayDialog(0); // Show the storage permission alert dialog. The permission will be requested when the dialog is closed. - importExportStoragePermissionDialogFragment.show(getFragmentManager(), getString(R.string.storage_permission)); + storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission)); } else { // Show the permission request directly. // Request the storage permission. The export will be run when it finishes. ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); @@ -514,7 +689,7 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp } @Override - public void onCloseImportExportStoragePermissionDialog() { + public void onCloseStoragePermissionDialog(int type) { // Request the write external storage permission. The import/export will be run when it finishes. ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); } @@ -524,87 +699,58 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Get a handle for the import radiobutton. RadioButton importRadioButton = findViewById(R.id.import_radiobutton); - // Check to see if import or export is selected. - if (importRadioButton.isChecked()) { // Import is selected. - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) { // The storage permission was granted. + // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. + if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) { // The storage permission was granted. + // Run the import or export methods according to which radio button is selected. + if (importRadioButton.isChecked()) { // Import is selected. // Import the settings. importSettings(); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(importRadioButton, getString(R.string.cannot_import), Snackbar.LENGTH_LONG).show(); - } - } else { // Export is selected. - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) { // The storage permission was granted. + } else { // Export is selected. // Export the settings. exportSettings(); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(importRadioButton, getString(R.string.cannot_export), Snackbar.LENGTH_LONG).show(); } + } else { // The storage permission was not granted. + // Display an error snackbar. + Snackbar.make(importRadioButton, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); } } @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { + public void onActivityResult(int requestCode, int resultCode, Intent intent) { + // Run the default commands. + super.onActivityResult(requestCode, resultCode, intent); + switch (requestCode) { case (BROWSE_RESULT_CODE): // Don't do anything if the user pressed back from the file picker. if (resultCode == Activity.RESULT_OK) { - // Get a handle for the file name EditText. + // Get a handle for the views. EditText fileNameEditText = findViewById(R.id.file_name_edittext); + TextView fileExistsWarningTextView = findViewById(R.id.file_exists_warning_textview); - // Get the file name URI. - Uri fileNameUri = data.getData(); - - // Remove the lint warning that the file name URI might be null. - assert fileNameUri != null; - - // Get the raw file name path. - String rawFileNamePath = fileNameUri.getPath(); - - // Remove the warning that the file name path might be null. - assert rawFileNamePath != null; - - // Check to see if the file name Path includes a valid storage location. - if (rawFileNamePath.contains(":")) { // The path is valid. - // Split the path into the initial content uri and the final path information. - String fileNameContentPath = rawFileNamePath.substring(0, rawFileNamePath.indexOf(":")); - String fileNameFinalPath = rawFileNamePath.substring(rawFileNamePath.indexOf(":") + 1); + // Instantiate the file name helper. + FileNameHelper fileNameHelper = new FileNameHelper(); - // Create the file name path string. - String fileNamePath; + // Get the file path URI from the intent. + Uri filePathUri = intent.getData(); - // Construct the file name path. - switch (fileNameContentPath) { - // The documents home has a special content path. - case "/document/home": - fileNamePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/" + fileNameFinalPath; - break; + // Use the file path from the intent if it exists. + if (filePathUri != null) { + // Convert the file name URI to a file name path. + String fileNamePath = fileNameHelper.convertUriToFileNamePath(filePathUri); - // Everything else for the primary user should be in `/document/primary`. - case "/document/primary": - fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath; - break; - - // Just in case, catch everything else and place it in the external storage directory. - default: - fileNamePath = Environment.getExternalStorageDirectory() + "/" + fileNameFinalPath; - break; - } - - // Set the file name path as the text of the file name EditText. + // Set the file name path as the text of the file name edit text. fileNameEditText.setText(fileNamePath); - } else { // The path is invalid. - Snackbar.make(fileNameEditText, rawFileNamePath + " " + getString(R.string.invalid_location), Snackbar.LENGTH_INDEFINITE).show(); + + // Hide the file exists warning text view, because the file picker will have just created a file if export was selected. + fileExistsWarningTextView.setVisibility(View.GONE); } } break; case OPENPGP_EXPORT_RESULT_CODE: // Get the temporary unencrypted export file. - File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.privacy_browser_settings)); + File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings_pbs)); // Delete the temporary unencrypted export file if it exists. if (temporaryUnencryptedExportFile.exists()) { @@ -623,11 +769,14 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // Instantiate the import export database helper. ImportExportDatabaseHelper importExportDatabaseHelper = new ImportExportDatabaseHelper(); + // Get the export file string. + String exportFileString = fileNameEditText.getText().toString(); + // Get the export and temporary unencrypted export files. - File exportFile = new File(fileNameEditText.getText().toString()); - File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.privacy_browser_settings)); + File exportFile = new File(exportFileString); + File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings_pbs)); - // Initialize the export status string. + // Create an export status string. String exportStatus; // Export according to the encryption type. @@ -776,6 +925,9 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp startActivityForResult(openKeychainEncryptIntent, OPENPGP_EXPORT_RESULT_CODE); break; } + + // Add the file to the list of recent files. This doesn't currently work, but maybe it will someday. + MediaScannerConnection.scanFile(this, new String[] {exportFileString}, new String[] {"application/x-sqlite3"}, null); } private void importSettings() { @@ -801,7 +953,7 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp case PASSWORD_ENCRYPTION: // Use a private temporary import location. - File temporaryUnencryptedImportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.privacy_browser_settings)); + File temporaryUnencryptedImportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings_pbs)); try { // Create an encrypted import file input stream. @@ -936,8 +1088,21 @@ public class ImportExportActivity extends AppCompatActivity implements ImportExp // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack. It requires `Intent.FLAG_ACTIVITY_NEW_TASK`. restartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - // Make it so. - startActivity(restartIntent); + // Create a restart handler. + Handler restartHandler = new Handler(); + + // Create a restart runnable. + Runnable restartRunnable = () -> { + // Restart Privacy Browser. + startActivity(restartIntent); + + // Kill this instance of Privacy Browser. Otherwise, the app exhibits sporadic behavior after the restart. + System.exit(0); + }; + + // Restart Privacy Browser after 150 milliseconds to allow enough time for the preferences to be saved. + restartHandler.postDelayed(restartRunnable, 150); + } else if (!(encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION)){ // The import was not successful. // Display a snack bar with the import error. Snackbar.make(fileNameEditText, getString(R.string.import_failed) + " " + importStatus, Snackbar.LENGTH_INDEFINITE).show();