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=cc9363f9ad155b74be6cd341bad82094052db3c4;hp=9b34bf3bd07031a3c0f98e4ddbe89afe1e9f9d04;hb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2;hpb=dc05d774e7b6bc7a1903ecdbacc5b2863e180f4c 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 9b34bf3b..cc9363f9 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 . * @@ -60,6 +60,8 @@ import com.google.android.material.textfield.TextInputLayout; import com.stoutner.privacybrowser.R; 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; @@ -94,8 +96,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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); + // Get the screenshot preference. boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); // Disable screenshots if not allowed. @@ -103,12 +104,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // Set the activity theme. - if (darkTheme) { - setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); - } else { - setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); - } + // Set the theme. + setTheme(R.style.PrivacyBrowser); // Run the default commands. super.onCreate(savedInstanceState); @@ -116,7 +113,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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. + // Set the support action bar. Toolbar toolbar = findViewById(R.id.import_export_toolbar); setSupportActionBar(toolbar); @@ -129,7 +126,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Display the home arrow on the support action bar. 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. @@ -150,6 +147,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe 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); @@ -168,28 +167,30 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe 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.settings_pbs); - 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.settings_pbs); - 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) { @@ -216,9 +217,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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: @@ -252,9 +250,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Update the default file path. fileNameEditText.setText(defaultPasswordEncryptionFilePath); - - // Enable the import/export button if a password exists. - importExportButton.setEnabled(!encryptionPasswordEditText.getText().toString().isEmpty()); } break; @@ -265,8 +260,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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); @@ -278,16 +273,10 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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. @@ -320,12 +309,24 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe @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) { @@ -339,40 +340,145 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe @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 text view 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: @@ -383,9 +489,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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); @@ -394,9 +497,33 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe 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: @@ -413,19 +540,41 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe 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. @@ -453,8 +602,12 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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.settings_pbs)); + // 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 the minimum API >= 26. if (Build.VERSION.SDK_INT >= 26) { @@ -518,7 +671,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // 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 storagePermissionDialogFragment = new StoragePermissionDialog(); + DialogFragment storagePermissionDialogFragment = StoragePermissionDialog.displayDialog(0); // Show the storage permission alert dialog. The permission will be requested when the dialog is closed. storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission)); @@ -531,7 +684,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe } @Override - public void onCloseStoragePermissionDialog() { + 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); } @@ -558,63 +711,34 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe } @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 edit text. + // 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 incorrect lint 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); - - // Create the file name path string. - String fileNamePath; - - // Check to see if the current file name final patch is a complete, valid path - if (fileNameFinalPath.startsWith("/storage/emulated/")) { // The existing file name final path is a complete, valid path. - // Use the provided file name path as is. - fileNamePath = fileNameFinalPath; - } else { // The existing file name final path is not a complete, valid path. - // 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; - - // 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; - } - } + // Instantiate the file name helper. + FileNameHelper fileNameHelper = new FileNameHelper(); + + // Get the file path URI from the intent. + Uri filePathUri = intent.getData(); + + // 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); // 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; @@ -971,8 +1095,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe System.exit(0); }; - // Restart Privacy Browser after 100 milliseconds to allow enough time for the preferences to be saved. - restartHandler.postDelayed(restartRunnable, 100); + // 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.