From d4f39c36beb5e6c3568a1e075274ad66defd8e8e Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Thu, 25 Mar 2021 14:12:32 -0700 Subject: [PATCH] Redesign file access to work with the scoped storage. https://redmine.stoutner.com/issues/546 --- app/build.gradle | 7 +- app/src/main/AndroidManifest.xml | 29 +- .../activities/AboutActivity.java | 299 +---- .../activities/ImportExportActivity.java | 1136 +++++++---------- .../activities/LogcatActivity.java | 205 +-- .../activities/MainWebViewActivity.java | 353 +---- .../asynctasks/GetHostIpAddresses.java | 4 +- .../privacybrowser/asynctasks/GetLogcat.java | 4 +- .../privacybrowser/asynctasks/GetUrlSize.java | 10 +- .../asynctasks/PopulateBlocklists.java | 8 +- .../asynctasks/PrepareSaveDialog.java | 25 +- .../asynctasks/SaveAboutVersionImage.java | 89 +- .../privacybrowser/asynctasks/SaveUrl.java | 96 +- .../asynctasks/SaveWebpageImage.java | 81 +- .../privacybrowser/dialogs/OpenDialog.kt | 52 +- .../privacybrowser/dialogs/SaveDialog.kt | 49 +- .../dialogs/SaveWebpageDialog.java | 147 +-- .../dialogs/StoragePermissionDialog.java | 137 -- .../fragments/SettingsFragment.java | 89 +- .../helpers/CheckPinnedMismatchHelper.java | 16 +- .../helpers/DownloadLocationHelper.java | 85 -- .../helpers/FileNameHelper.java | 73 -- .../helpers/ImportExportDatabaseHelper.java | 560 ++++---- .../res/drawable/downloads_ghosted_day.xml | 13 - .../res/drawable/downloads_ghosted_night.xml | 13 - ...mport_export_day.xml => import_export.xml} | 0 .../main/res/drawable/import_export_night.xml | 18 - .../import_export_coordinatorlayout.xml | 38 +- app/src/main/res/layout/open_dialog.xml | 62 +- app/src/main/res/layout/save_dialog.xml | 62 +- ...url_dialog.xml => save_webpage_dialog.xml} | 22 +- .../main/res/menu/webview_navigation_menu.xml | 4 +- .../main/res/menu/webview_options_menu.xml | 9 +- app/src/main/res/values-de/strings.xml | 19 - app/src/main/res/values-es/strings.xml | 20 - app/src/main/res/values-fr/strings.xml | 20 - app/src/main/res/values-it/strings.xml | 20 - app/src/main/res/values-pt-rBR/strings.xml | 19 - app/src/main/res/values-ru/strings.xml | 18 - app/src/main/res/values-tr/strings.xml | 6 - app/src/main/res/values/strings.xml | 26 - app/src/main/res/xml/preferences.xml | 16 +- build.gradle | 2 +- 43 files changed, 1084 insertions(+), 2877 deletions(-) delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/dialogs/StoragePermissionDialog.java delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/DownloadLocationHelper.java delete mode 100644 app/src/main/java/com/stoutner/privacybrowser/helpers/FileNameHelper.java delete mode 100644 app/src/main/res/drawable/downloads_ghosted_day.xml delete mode 100644 app/src/main/res/drawable/downloads_ghosted_night.xml rename app/src/main/res/drawable/{import_export_day.xml => import_export.xml} (100%) delete mode 100644 app/src/main/res/drawable/import_export_night.xml rename app/src/main/res/layout/{save_url_dialog.xml => save_webpage_dialog.xml} (80%) diff --git a/app/build.gradle b/app/build.gradle index 4223e3a8..a40ad3d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 30 defaultConfig { minSdkVersion 19 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 53 versionName "3.6.1" @@ -95,5 +94,5 @@ dependencies { implementation 'com.google.android.material:material:1.3.0' // Only compile AdMob ads for the free flavor. - freeImplementation 'com.google.android.gms:play-services-ads:19.7.0' + freeImplementation 'com.google.android.gms:play-services-ads:19.8.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9feabcd7..df1a8480 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - - - - - - - + @@ -142,23 +134,6 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java index 7d0228fb..31e9c152 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.java @@ -19,31 +19,20 @@ package com.stoutner.privacybrowser.activities; -import android.Manifest; import android.app.Activity; import android.app.Dialog; -import android.content.ContentResolver; 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.preference.PreferenceManager; -import android.view.View; import android.view.WindowManager; import android.widget.EditText; import android.widget.LinearLayout; -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.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; -import androidx.core.content.FileProvider; import androidx.fragment.app.DialogFragment; import androidx.viewpager.widget.ViewPager; @@ -54,28 +43,21 @@ import com.stoutner.privacybrowser.adapters.AboutPagerAdapter; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.asynctasks.SaveAboutVersionImage; import com.stoutner.privacybrowser.dialogs.SaveDialog; -import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog; import com.stoutner.privacybrowser.fragments.AboutVersionFragment; -import com.stoutner.privacybrowser.helpers.FileNameHelper; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; -public class AboutActivity extends AppCompatActivity implements SaveDialog.SaveListener, StoragePermissionDialog.StoragePermissionDialogListener { +public class AboutActivity extends AppCompatActivity implements SaveDialog.SaveListener { // Declare the class variables. - private String filePathString; private AboutPagerAdapter aboutPagerAdapter; - // Declare the class views. - private LinearLayout aboutVersionLinearLayout; - @Override protected void onCreate(Bundle savedInstanceState) { // Get a handle for the shared preferences. @@ -137,138 +119,11 @@ public class AboutActivity extends AppCompatActivity implements SaveDialog.SaveL aboutTabLayout.setupWithViewPager(aboutViewPager); } - @Override - public void onSave(int saveType, DialogFragment dialogFragment) { - // Get a handle for the dialog. - Dialog dialog = dialogFragment.getDialog(); - - // Remove the lint warning below that the dialog might be null. - assert dialog != null; - - // Get a handle for the file name edit text. - EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); - - // Get the file path string. - filePathString = fileNameEditText.getText().toString(); - - // Get a handle for the about version linear layout. - aboutVersionLinearLayout = findViewById(R.id.about_version_linearlayout); - - // check to see if the storage permission is needed. - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - // Save the file according to the type. - switch (saveType) { - case SaveDialog.SAVE_ABOUT_VERSION_TEXT: - // Save the about version text. - saveAsText(filePathString); - break; - - case SaveDialog.SAVE_ABOUT_VERSION_IMAGE: - // Save the about version image. - new SaveAboutVersionImage(this, this, filePathString, aboutVersionLinearLayout).execute(); - break; - } - - // Reset the file path string. - filePathString = ""; - } else { // The storage permission has not been granted. - // Get the external private directory file. - File externalPrivateDirectoryFile = getExternalFilesDir(null); - - // Remove the incorrect lint error below that the file might be null. - assert externalPrivateDirectoryFile != null; - - // Get the external private directory string. - String externalPrivateDirectory = externalPrivateDirectoryFile.toString(); - - // Check to see if the file path is in the external private directory. - if (filePathString.startsWith(externalPrivateDirectory)) { // The file path is in the external private directory. - // Save the webpage according to the type. - switch (saveType) { - case SaveDialog.SAVE_ABOUT_VERSION_TEXT: - // Save the about version text. - saveAsText(filePathString); - break; - - case SaveDialog.SAVE_ABOUT_VERSION_IMAGE: - // Save the about version image. - new SaveAboutVersionImage(this, this, filePathString, aboutVersionLinearLayout).execute(); - break; - } - - // Reset the file path string. - filePathString = ""; - } else { // The file path is in a public directory. - // 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. - // Declare a storage permission dialog fragment. - DialogFragment storagePermissionDialogFragment; - - // Instantiate the storage permission alert dialog according to the type. - if (saveType == SaveDialog.SAVE_ABOUT_VERSION_TEXT) { - storagePermissionDialogFragment = StoragePermissionDialog.displayDialog(StoragePermissionDialog.SAVE_TEXT); - } else { - storagePermissionDialogFragment = StoragePermissionDialog.displayDialog(StoragePermissionDialog.SAVE_IMAGE); - } - - // Show the storage permission alert dialog. The permission will be requested when the dialog is closed. - storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission)); - } else { // Show the permission request directly. - switch (saveType) { - case SaveDialog.SAVE_ABOUT_VERSION_TEXT: - // Request the write external storage permission. The text will be saved when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, StoragePermissionDialog.SAVE_TEXT); - break; - - case SaveDialog.SAVE_ABOUT_VERSION_IMAGE: - // Request the write external storage permission. The image will be saved when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, StoragePermissionDialog.SAVE_IMAGE); - break; - } - - } - } - } - } - - @Override - public void onCloseStoragePermissionDialog(int requestType) { - // Request the write external storage permission according to the request type. About version will be saved when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestType); - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - //Only process the results if they exist (this method is triggered when a dialog is presented the first time for an app, but no grant results are included). - if (grantResults.length > 0) { - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { // The storage permission was granted. - switch (requestCode) { - case StoragePermissionDialog.SAVE_TEXT: - // Save the about version text. - saveAsText(filePathString); - break; - - case StoragePermissionDialog.SAVE_IMAGE: - // Save the about version image. - new SaveAboutVersionImage(this, this, filePathString, aboutVersionLinearLayout).execute(); - break; - } - } else{ // the storage permission was not granted. - // Display an error snackbar. - Snackbar.make(aboutVersionLinearLayout, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); - } - - // Reset the file path string. - filePathString = ""; - } - } - // The activity result is called after browsing for a file in the save alert dialog. @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { + public void onActivityResult(int requestCode, int resultCode, Intent returnedIntent) { // Run the default commands. - super.onActivityResult(requestCode, resultCode, data); + super.onActivityResult(requestCode, resultCode, returnedIntent); // Only do something if the user didn't press back from the file picker. if (resultCode == Activity.RESULT_OK) { @@ -285,116 +140,94 @@ public class AboutActivity extends AppCompatActivity implements SaveDialog.SaveL // Get a handle for the dialog view. EditText fileNameEditText = saveDialog.findViewById(R.id.file_name_edittext); - TextView fileExistsWarningTextView = saveDialog.findViewById(R.id.file_exists_warning_textview); // Get the file name URI from the intent. - Uri fileNameUri = data.getData(); + Uri fileNameUri = returnedIntent.getData(); - // Process the file name URI if it is not null. - if (fileNameUri != null) { - // Instantiate a file name helper. - FileNameHelper fileNameHelper = new FileNameHelper(); + // Get the file name string from the URI. + String fileNameString = fileNameUri.toString(); - // Convert the file name URI to a file name path. - String fileNamePath = fileNameHelper.convertUriToFileNamePath(fileNameUri); + // Set the file name text. + fileNameEditText.setText(fileNameString); - // Set the file name path as the text of the file nam edit text. - fileNameEditText.setText(fileNamePath); - - // Move the cursor to the end of the file name edit text. - fileNameEditText.setSelection(fileNamePath.length()); - - // Hid ethe file exists warning. - fileExistsWarningTextView.setVisibility(View.GONE); - } + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNameString.length()); } } } - private void saveAsText(String fileNameString) { - try { - // Get a handle for the about about version fragment. - AboutVersionFragment aboutVersionFragment = (AboutVersionFragment) aboutPagerAdapter.getTabFragment(0); - - // Get the about version text. - String aboutVersionString = aboutVersionFragment.getAboutVersionString(); - - // Create an input stream with the contents of about version. - InputStream aboutVersionInputStream = new ByteArrayInputStream(aboutVersionString.getBytes(StandardCharsets.UTF_8)); - - // Create an about version buffered reader. - BufferedReader aboutVersionBufferedReader = new BufferedReader(new InputStreamReader(aboutVersionInputStream)); - - // Create a file from the file name string. - File saveFile = new File(fileNameString); + @Override + public void onSave(int saveType, DialogFragment dialogFragment) { + // Get a handle for the dialog. + Dialog dialog = dialogFragment.getDialog(); - // Delete the file if it already exists. - if (saveFile.exists()) { - //noinspection ResultOfMethodCallIgnored - saveFile.delete(); - } + // Remove the lint warning below that the dialog might be null. + assert dialog != null; - // Create a file buffered writer. - BufferedWriter fileBufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(saveFile))); + // Get a handle for the file name edit text. + EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); - // Create a transfer string. - String transferString; + // Get the file name string. + String fileNameString = fileNameEditText.getText().toString(); - // Use the transfer string to copy the about version text from the buffered reader to the buffered writer. - while ((transferString = aboutVersionBufferedReader.readLine()) != null) { - // Append the line to the buffered writer. - fileBufferedWriter.append(transferString); + // Get a handle for the about version linear layout. + LinearLayout aboutVersionLinearLayout = findViewById(R.id.about_version_linearlayout); - // Append a line break. - fileBufferedWriter.append("\n"); - } + // Save the file according to the type. + switch (saveType) { + case SaveDialog.SAVE_ABOUT_VERSION_TEXT: + try { + // Get a handle for the about version fragment. + AboutVersionFragment aboutVersionFragment = (AboutVersionFragment) aboutPagerAdapter.getTabFragment(0); - // Close the buffered reader and writer. - aboutVersionBufferedReader.close(); - fileBufferedWriter.close(); + // Get the about version text. + String aboutVersionString = aboutVersionFragment.getAboutVersionString(); - // Add the file to the list of recent files. This doesn't currently work, but maybe it will someday. - MediaScannerConnection.scanFile(this, new String[] {fileNameString}, new String[] {"text/plain"}, null); + // Create an input stream with the contents of about version. + InputStream aboutVersionInputStream = new ByteArrayInputStream(aboutVersionString.getBytes(StandardCharsets.UTF_8)); - // Create an about version saved snackbar. - Snackbar aboutVersionSavedSnackbar = Snackbar.make(aboutVersionLinearLayout, getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT); + // Create an about version buffered reader. + BufferedReader aboutVersionBufferedReader = new BufferedReader(new InputStreamReader(aboutVersionInputStream)); - // Add an open option to the snackbar. - aboutVersionSavedSnackbar.setAction(R.string.open, (View view) -> { - // Get a file for the file name string. - File file = new File(fileNameString); + // Open an output stream. + OutputStream outputStream = getContentResolver().openOutputStream(Uri.parse(fileNameString)); - // Declare a file URI variable. - Uri fileUri; + // Create a file buffered writer. + BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(outputStream)); - // Get the URI for the file according to the Android version. - if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. - fileUri = FileProvider.getUriForFile(this, getString(R.string.file_provider), file); - } else { // Get the raw file path URI. - fileUri = Uri.fromFile(file); - } + // Create a transfer string. + String transferString; - // Get a handle for the content resolver. - ContentResolver contentResolver = getContentResolver(); + // Use the transfer string to copy the about version text from the buffered reader to the buffered writer. + while ((transferString = aboutVersionBufferedReader.readLine()) != null) { + // Append the line to the buffered writer. + bufferedWriter.append(transferString); - // Create an open intent with `ACTION_VIEW`. - Intent openIntent = new Intent(Intent.ACTION_VIEW); + // Append a line break. + bufferedWriter.append("\n"); + } - // Set the URI and the MIME type. - openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); + // Flush the buffered writer. + bufferedWriter.flush(); - // Allow the app to read the file URI. - openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + // Close the inputs and outputs. + aboutVersionBufferedReader.close(); + aboutVersionInputStream.close(); + bufferedWriter.close(); + outputStream.close(); - // Show the chooser. - startActivity(Intent.createChooser(openIntent, getString(R.string.open))); - }); + // Display a snackbar with the saved about version information. + Snackbar.make(aboutVersionLinearLayout, getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT).show(); + } catch (Exception exception) { + // Display a snackbar with the error message. + Snackbar.make(aboutVersionLinearLayout, getString(R.string.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show(); + } + break; - // Show the about version saved snackbar. - aboutVersionSavedSnackbar.show(); - } catch (Exception exception) { - // Display a snackbar with the error message. - Snackbar.make(aboutVersionLinearLayout, getString(R.string.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show(); + case SaveDialog.SAVE_ABOUT_VERSION_IMAGE: + // Save the about version image. + new SaveAboutVersionImage(this, fileNameString, aboutVersionLinearLayout).execute(); + break; } } } \ No newline at end of file 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 d740552a..de4ec477 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-2020 Soren Stoutner . + * Copyright © 2018-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,19 +19,15 @@ package com.stoutner.privacybrowser.activities; -import android.Manifest; import android.app.Activity; 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.text.Editable; import android.text.TextWatcher; import android.view.View; @@ -50,24 +46,21 @@ 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 androidx.multidex.BuildConfig; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.textfield.TextInputLayout; -import com.stoutner.privacybrowser.BuildConfig; 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; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.SecureRandom; @@ -79,7 +72,7 @@ import javax.crypto.CipherOutputStream; import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.SecretKeySpec; -public class ImportExportActivity extends AppCompatActivity implements StoragePermissionDialog.StoragePermissionDialogListener { +public class ImportExportActivity extends AppCompatActivity { // Define the encryption constants. private final int NO_ENCRYPTION = 0; private final int PASSWORD_ENCRYPTION = 1; @@ -87,35 +80,37 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Define the activity result constants. private final int BROWSE_RESULT_CODE = 0; - private final int OPENPGP_EXPORT_RESULT_CODE = 1; + private final int OPENPGP_IMPORT_RESULT_CODE = 1; + private final int OPENPGP_EXPORT_RESULT_CODE = 2; // Define the saved instance state constants. - private final String PASSWORD_ENCRYPTED_TEXTINPUTLAYOUT_VISIBILITY = "password_encrypted_textinputlayout_visibility"; + private final String ENCRYPTION_PASSWORD_TEXTINPUTLAYOUT_VISIBILITY = "encryption_password_textinputlayout_visibility"; private final String KITKAT_PASSWORD_ENCRYPTED_TEXTVIEW_VISIBILITY = "kitkat_password_encrypted_textview_visibility"; private final String OPEN_KEYCHAIN_REQUIRED_TEXTVIEW_VISIBILITY = "open_keychain_required_textview_visibility"; private final String FILE_LOCATION_CARD_VIEW = "file_location_card_view"; private final String FILE_NAME_LINEARLAYOUT_VISIBILITY = "file_name_linearlayout_visibility"; - private final String FILE_DOES_NOT_EXIST_TEXTVIEW_VISIBILITY = "file_does_not_exist_textview_visibility"; - private final String FILE_EXISTS_WARNING_TEXTVIEW_VISIBILITY = "file_exists_warning_textview_visibility"; private final String OPEN_KEYCHAIN_IMPORT_INSTRUCTIONS_TEXTVIEW_VISIBILITY = "open_keychain_import_instructions_textview_visibility"; private final String IMPORT_EXPORT_BUTTON_VISIBILITY = "import_export_button_visibility"; private final String FILE_NAME_TEXT = "file_name_text"; private final String IMPORT_EXPORT_BUTTON_TEXT = "import_export_button_text"; // Define the class views. - TextInputLayout passwordEncryptionTextInputLayout; + Spinner encryptionSpinner; + TextInputLayout encryptionPasswordTextInputLayout; + EditText encryptionPasswordEditText; TextView kitKatPasswordEncryptionTextView; TextView openKeychainRequiredTextView; CardView fileLocationCardView; + RadioButton importRadioButton; LinearLayout fileNameLinearLayout; EditText fileNameEditText; - TextView fileDoesNotExistTextView; - TextView fileExistsWarningTextView; TextView openKeychainImportInstructionsTextView; Button importExportButton; // Define the class variables. private boolean openKeychainInstalled; + private File temporaryPgpEncryptedImportFile; + private File temporaryPreEncryptedExportFile; @Override public void onCreate(Bundle savedInstanceState) { @@ -163,21 +158,18 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe } // Get handles for the views that need to be modified. - Spinner encryptionSpinner = findViewById(R.id.encryption_spinner); - passwordEncryptionTextInputLayout = findViewById(R.id.password_encryption_textinputlayout); - EditText encryptionPasswordEditText = findViewById(R.id.password_encryption_edittext); + encryptionSpinner = findViewById(R.id.encryption_spinner); + encryptionPasswordTextInputLayout = findViewById(R.id.encryption_password_textinputlayout); + encryptionPasswordEditText = findViewById(R.id.encryption_password_edittext); kitKatPasswordEncryptionTextView = findViewById(R.id.kitkat_password_encryption_textview); openKeychainRequiredTextView = findViewById(R.id.openkeychain_required_textview); fileLocationCardView = findViewById(R.id.file_location_cardview); - RadioButton importRadioButton = findViewById(R.id.import_radiobutton); + importRadioButton = findViewById(R.id.import_radiobutton); RadioButton exportRadioButton = findViewById(R.id.export_radiobutton); fileNameLinearLayout = findViewById(R.id.file_name_linearlayout); fileNameEditText = findViewById(R.id.file_name_edittext); - fileDoesNotExistTextView = findViewById(R.id.file_does_not_exist_textview); - fileExistsWarningTextView = findViewById(R.id.file_exists_warning_textview); openKeychainImportInstructionsTextView = findViewById(R.id.openkeychain_import_instructions_textview); importExportButton = findViewById(R.id.import_export_button); - TextView storagePermissionTextView = findViewById(R.id.import_export_storage_permission_textview); // Create an array adapter for the spinner. ArrayAdapter encryptionArrayAdapter = ArrayAdapter.createFromResource(this, R.array.encryption_type, R.layout.spinner_item); @@ -188,24 +180,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Set the array adapter for the spinner. encryptionSpinner.setAdapter(encryptionArrayAdapter); - // Instantiate the download location helper. - DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper(); - - // Get the default file path. - String defaultFilePath = downloadLocationHelper.getDownloadLocation(this) + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs"; - - // Set the other default file paths. - String defaultPasswordEncryptionFilePath = defaultFilePath + ".aes"; - String defaultPgpFilePath = defaultFilePath + ".pgp"; - - // Set the default file path. - fileNameEditText.setText(defaultFilePath); - - // 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 @@ -213,7 +187,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe switch (position) { case NO_ENCRYPTION: // Hide the unneeded layout items. - passwordEncryptionTextInputLayout.setVisibility(View.GONE); + encryptionPasswordTextInputLayout.setVisibility(View.GONE); kitKatPasswordEncryptionTextView.setVisibility(View.GONE); openKeychainRequiredTextView.setVisibility(View.GONE); openKeychainImportInstructionsTextView.setVisibility(View.GONE); @@ -231,8 +205,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe importExportButton.setText(R.string.import_button); } - // Reset the default file path. - fileNameEditText.setText(defaultFilePath); + // Enable the import/export button if the file name is populated. + importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty()); break; case PASSWORD_ENCRYPTION: @@ -249,7 +223,7 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe openKeychainImportInstructionsTextView.setVisibility(View.GONE); // Show the password encryption layout items. - passwordEncryptionTextInputLayout.setVisibility(View.VISIBLE); + encryptionPasswordTextInputLayout.setVisibility(View.VISIBLE); // Show the file location card. fileLocationCardView.setVisibility(View.VISIBLE); @@ -264,21 +238,18 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe importExportButton.setText(R.string.import_button); } - // Update the default file path. - fileNameEditText.setText(defaultPasswordEncryptionFilePath); + // Enable the import/button if both the password and the file name are populated. + importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); } break; case OPENPGP_ENCRYPTION: // Hide the password encryption layout items. - passwordEncryptionTextInputLayout.setVisibility(View.GONE); + encryptionPasswordTextInputLayout.setVisibility(View.GONE); kitKatPasswordEncryptionTextView.setVisibility(View.GONE); // Updated items based on the installation status of OpenKeychain. if (openKeychainInstalled) { // OpenKeychain is installed. - // Update the default file path. - fileNameEditText.setText(defaultPgpFilePath); - // Show the file location card. fileLocationCardView.setVisibility(View.VISIBLE); @@ -289,10 +260,16 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Set the text of the import button to be `Decrypt`. importExportButton.setText(R.string.decrypt); + + // Enable the import button if the file name is populated. + importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty()); } 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 export button. + importExportButton.setEnabled(true); } } else { // OpenKeychain is not installed. // Show the OpenPGP required layout item. @@ -325,20 +302,8 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe @Override public void afterTextChanged(Editable s) { - // 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()); - } + // Enable the import/export button if both the file string and the password are populated. + importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); } }); @@ -356,123 +321,13 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe @Override public void afterTextChanged(Editable s) { - // 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: - // 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: - // 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: - // 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; + if (encryptionSpinner.getSelectedItemPosition() == PASSWORD_ENCRYPTION) { + // Enable the import/export button if both the file name and the password are populated. + importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty() && !encryptionPasswordEditText.getText().toString().isEmpty()); + } else { + // Enable the export button if the file name is populated. + importExportButton.setEnabled(!fileNameEditText.getText().toString().isEmpty()); } } }); @@ -480,23 +335,19 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Check to see if the activity has been restarted. if (savedInstanceState == null) { // The app has not been restarted. // Initially hide the unneeded views. - passwordEncryptionTextInputLayout.setVisibility(View.GONE); + encryptionPasswordTextInputLayout.setVisibility(View.GONE); 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); } else { // The app has been restarted. // Restore the visibility of the views. - passwordEncryptionTextInputLayout.setVisibility(savedInstanceState.getInt(PASSWORD_ENCRYPTED_TEXTINPUTLAYOUT_VISIBILITY)); + encryptionPasswordTextInputLayout.setVisibility(savedInstanceState.getInt(ENCRYPTION_PASSWORD_TEXTINPUTLAYOUT_VISIBILITY)); kitKatPasswordEncryptionTextView.setVisibility(savedInstanceState.getInt(KITKAT_PASSWORD_ENCRYPTED_TEXTVIEW_VISIBILITY)); openKeychainRequiredTextView.setVisibility(savedInstanceState.getInt(OPEN_KEYCHAIN_REQUIRED_TEXTVIEW_VISIBILITY)); fileLocationCardView.setVisibility(savedInstanceState.getInt(FILE_LOCATION_CARD_VIEW)); fileNameLinearLayout.setVisibility(savedInstanceState.getInt(FILE_NAME_LINEARLAYOUT_VISIBILITY)); - fileDoesNotExistTextView.setVisibility(savedInstanceState.getInt(FILE_DOES_NOT_EXIST_TEXTVIEW_VISIBILITY)); - fileExistsWarningTextView.setVisibility(savedInstanceState.getInt(FILE_EXISTS_WARNING_TEXTVIEW_VISIBILITY)); openKeychainImportInstructionsTextView.setVisibility(savedInstanceState.getInt(OPEN_KEYCHAIN_IMPORT_INSTRUCTIONS_TEXTVIEW_VISIBILITY)); importExportButton.setVisibility(savedInstanceState.getInt(IMPORT_EXPORT_BUTTON_VISIBILITY)); @@ -512,13 +363,11 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe super.onSaveInstanceState(savedInstanceState); // Save the visibility of the views. - savedInstanceState.putInt(PASSWORD_ENCRYPTED_TEXTINPUTLAYOUT_VISIBILITY, passwordEncryptionTextInputLayout.getVisibility()); + savedInstanceState.putInt(ENCRYPTION_PASSWORD_TEXTINPUTLAYOUT_VISIBILITY, encryptionPasswordTextInputLayout.getVisibility()); savedInstanceState.putInt(KITKAT_PASSWORD_ENCRYPTED_TEXTVIEW_VISIBILITY, kitKatPasswordEncryptionTextView.getVisibility()); savedInstanceState.putInt(OPEN_KEYCHAIN_REQUIRED_TEXTVIEW_VISIBILITY, openKeychainRequiredTextView.getVisibility()); savedInstanceState.putInt(FILE_LOCATION_CARD_VIEW, fileLocationCardView.getVisibility()); savedInstanceState.putInt(FILE_NAME_LINEARLAYOUT_VISIBILITY, fileNameLinearLayout.getVisibility()); - savedInstanceState.putInt(FILE_DOES_NOT_EXIST_TEXTVIEW_VISIBILITY, fileDoesNotExistTextView.getVisibility()); - savedInstanceState.putInt(FILE_EXISTS_WARNING_TEXTVIEW_VISIBILITY, fileExistsWarningTextView.getVisibility()); savedInstanceState.putInt(OPEN_KEYCHAIN_IMPORT_INSTRUCTIONS_TEXTVIEW_VISIBILITY, openKeychainImportInstructionsTextView.getVisibility()); savedInstanceState.putInt(IMPORT_EXPORT_BUTTON_VISIBILITY, importExportButton.getVisibility()); @@ -528,16 +377,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe } 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(); @@ -545,103 +384,74 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe File file = new File(fileNameString); // Check to see if import or export was selected. - switch (view.getId()) { - case R.id.import_radiobutton: - // Check to see if OpenPGP encryption is selected. - if (encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) { // OpenPGP encryption selected. - // Show the OpenKeychain import instructions. - openKeychainImportInstructionTextView.setVisibility(View.VISIBLE); - - // Set the text on the import/export button to be `Decrypt`. - importExportButton.setText(R.string.decrypt); - } else { // OpenPGP encryption not selected. - // Hide the OpenKeychain import instructions. - openKeychainImportInstructionTextView.setVisibility(View.GONE); - - // Set the text on the import/export button to be `Import`. - importExportButton.setText(R.string.import_button); - } - - // Hide the file exists warning text view. - fileExistsWarningTextView.setVisibility(View.GONE); + if (view.getId() == R.id.import_radiobutton) { // The import radio button is selected. + // Check to see if OpenPGP encryption is selected. + if (encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) { // OpenPGP encryption selected. + // Show the OpenKeychain import instructions. + openKeychainImportInstructionsTextView.setVisibility(View.VISIBLE); + + // Set the text on the import/export button to be `Decrypt`. + importExportButton.setText(R.string.decrypt); + } else { // OpenPGP encryption not selected. + // Hide the OpenKeychain import instructions. + openKeychainImportInstructionsTextView.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); + // Set the text on the import/export button to be `Import`. + importExportButton.setText(R.string.import_button); + } - // Disable the import/decrypt button. - importExportButton.setEnabled(false); + // 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. + // 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(!encryptionPasswordEditText.getText().toString().isEmpty()); + } else { // Password encryption is not selected. + // Enable the import/decrypt button. + importExportButton.setEnabled(true); } - break; - - case R.id.export_radiobutton: - // Hide the OpenKeychain import instructions. - openKeychainImportInstructionTextView.setVisibility(View.GONE); + } else { // The file does not exist. + // Disable the import/decrypt button. + importExportButton.setEnabled(false); + } + } else { // The export radio button is selected. + // Hide the OpenKeychain import instructions. + openKeychainImportInstructionsTextView.setVisibility(View.GONE); - // Set the text on the import/export button to be `Export`. - importExportButton.setText(R.string.export); + // Set the text on the import/export button to be `Export`. + importExportButton.setText(R.string.export); - // Show the import/export button. - importExportButton.setVisibility(View.VISIBLE); + // Show the import/export button. + importExportButton.setVisibility(View.VISIBLE); - // Check to see if OpenPGP encryption is selected. - 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); + // Check to see if OpenPGP encryption is selected. + if (encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) { // OpenPGP encryption is selected. + // Hide the file name views. + fileNameLinearLayout.setVisibility(View.GONE); - // Enable the export button. - importExportButton.setEnabled(true); - } else { // OpenPGP encryption is not selected. - // 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); - } + // Enable the export button. + importExportButton.setEnabled(true); + } else { // OpenPGP encryption is not selected. + // Show the file name view. + fileNameLinearLayout.setVisibility(View.VISIBLE); - // 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()); - } + // 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() && !encryptionPasswordEditText.getText().toString().isEmpty()); } - break; + } } } public void browse(View view) { - // 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. if (importRadioButton.isChecked()) { // Import is selected. // Create the file picker intent. @@ -650,11 +460,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe // Set the intent MIME type to include all files so that everything is visible. importBrowseIntent.setType("*/*"); - // Set the initial directory if the minimum API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - importBrowseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory()); - } - // Request a file that can be opened. importBrowseIntent.addCategory(Intent.CATEGORY_OPENABLE); @@ -674,11 +479,6 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe exportBrowseIntent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs.aes"); } - // Set the initial directory if the minimum API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - exportBrowseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory()); - } - // Request a file that can be opened. exportBrowseIntent.addCategory(Intent.CATEGORY_OPENABLE); @@ -687,485 +487,465 @@ public class ImportExportActivity extends AppCompatActivity implements StoragePe } } - public void importExport(View view) { - // Get a handle for the views. - Spinner encryptionSpinner = findViewById(R.id.encryption_spinner); - RadioButton importRadioButton = findViewById(R.id.import_radiobutton); - RadioButton exportRadioButton = findViewById(R.id.export_radiobutton); - - // Check to see if the storage permission is needed. - if ((encryptionSpinner.getSelectedItemPosition() == OPENPGP_ENCRYPTION) && exportRadioButton.isChecked()) { // Permission not needed to export via OpenKeychain. - // Export the settings. - exportSettings(); - } else if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - // Check to see if import or export is selected. - if (importRadioButton.isChecked()) { // Import is selected. - // Import the settings. - importSettings(); - } else { // Export is selected. - // Export the settings. - exportSettings(); - } - } else { // The storage permission has not been granted. - // Get a handle for the file name EditText. - EditText fileNameEditText = findViewById(R.id.file_name_edittext); - - // Get the file name string. - String fileNameString = fileNameEditText.getText().toString(); - - // Get the external private directory `File`. - File externalPrivateDirectoryFile = getExternalFilesDir(null); - - // Remove the incorrect lint error below that the file might be null. - assert externalPrivateDirectoryFile != null; - - // Get the external private directory string. - String externalPrivateDirectory = externalPrivateDirectoryFile.toString(); - - // Check to see if the file path is in the external private directory. - if (fileNameString.startsWith(externalPrivateDirectory)) { // The file path is in the external private directory. - // Check to see if import or export is selected. - if (importRadioButton.isChecked()) { // Import is selected. - // Import the settings. - importSettings(); - } else { // Export is selected. - // Export the settings. - exportSettings(); - } - } else { // The file path is in a public directory. - // 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 = 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)); - } 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); - } - } - } - } - - @Override - 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); - } - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - // Get a handle for the import radiobutton. - RadioButton importRadioButton = findViewById(R.id.import_radiobutton); - - // 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 { // 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_use_location), Snackbar.LENGTH_LONG).show(); - } - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent intent) { + public void onActivityResult(int requestCode, int resultCode, Intent returnedIntent) { // Run the default commands. - super.onActivityResult(requestCode, resultCode, intent); + super.onActivityResult(requestCode, resultCode, returnedIntent); switch (requestCode) { case (BROWSE_RESULT_CODE): - // Don't do anything if the user pressed back from the file picker. + // Only do something if the user didn't press back from the file picker. if (resultCode == Activity.RESULT_OK) { - // Get a handle for the views. - EditText fileNameEditText = findViewById(R.id.file_name_edittext); - TextView fileExistsWarningTextView = findViewById(R.id.file_exists_warning_textview); - - // Instantiate the file name helper. - FileNameHelper fileNameHelper = new FileNameHelper(); - // Get the file path URI from the intent. - Uri filePathUri = intent.getData(); + Uri fileNameUri = returnedIntent.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); + // Get the file name string from the URI. + String fileNameString = fileNameUri.toString(); - // Set the file name path as the text of the file name edit text. - fileNameEditText.setText(fileNamePath); + // Set the file name name text. + fileNameEditText.setText(fileNameString); - // 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); - } + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNameString.length()); } break; - case OPENPGP_EXPORT_RESULT_CODE: - // Get the temporary unencrypted export file. - File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs"); + case OPENPGP_IMPORT_RESULT_CODE: + // Delete the temporary PGP encrypted import file. + if (temporaryPgpEncryptedImportFile.exists()) { + //noinspection ResultOfMethodCallIgnored + temporaryPgpEncryptedImportFile.delete(); + } + break; - // Delete the temporary unencrypted export file if it exists. - if (temporaryUnencryptedExportFile.exists()) { + case OPENPGP_EXPORT_RESULT_CODE: + // Delete the temporary pre-encrypted export file if it exists. + if (temporaryPreEncryptedExportFile.exists()) { //noinspection ResultOfMethodCallIgnored - temporaryUnencryptedExportFile.delete(); + temporaryPreEncryptedExportFile.delete(); } break; } } - private void exportSettings() { - // Get a handle for the views. - Spinner encryptionSpinner = findViewById(R.id.encryption_spinner); - EditText fileNameEditText = findViewById(R.id.file_name_edittext); - + public void importExport(View view) { // Instantiate the import export database helper. ImportExportDatabaseHelper importExportDatabaseHelper = new ImportExportDatabaseHelper(); - // Get the export file string. - String exportFileString = fileNameEditText.getText().toString(); + // Check to see if import or export is selected. + if (importRadioButton.isChecked()) { // Import is selected. + // Initialize the import status string + String importStatus = ""; - // Get the export and temporary unencrypted export files. - File exportFile = new File(exportFileString); - File temporaryUnencryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs"); + // Get the file name string. + String fileNameString = fileNameEditText.getText().toString(); - // Create an export status string. - String exportStatus; + // Import according to the encryption type. + switch (encryptionSpinner.getSelectedItemPosition()) { + case NO_ENCRYPTION: + try { + // Get an input stream for the file name. + InputStream inputStream = getContentResolver().openInputStream(Uri.parse(fileNameString)); + + // Import the unencrypted file. + importStatus = importExportDatabaseHelper.importUnencrypted(inputStream, this); + } catch (FileNotFoundException exception) { + // Update the import status. + importStatus = exception.toString(); + } - // Export according to the encryption type. - switch (encryptionSpinner.getSelectedItemPosition()) { - case NO_ENCRYPTION: - // Export the unencrypted file. - exportStatus = importExportDatabaseHelper.exportUnencrypted(exportFile, this); + // Restart Privacy Browser if successful. + if (importStatus.equals(ImportExportDatabaseHelper.IMPORT_SUCCESSFUL)) { + restartPrivacyBrowser(); + } + break; - // Show a disposition snackbar. - if (exportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) { - Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show(); - } else { - Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + exportStatus, Snackbar.LENGTH_INDEFINITE).show(); - } - break; + case PASSWORD_ENCRYPTION: + try { + // Get the encryption password. + String encryptionPasswordString = encryptionPasswordEditText.getText().toString(); - case PASSWORD_ENCRYPTION: - // Create an unencrypted export in a private directory. - exportStatus = importExportDatabaseHelper.exportUnencrypted(temporaryUnencryptedExportFile, this); + // Get an input stream for the file name. + InputStream inputStream = getContentResolver().openInputStream(Uri.parse(fileNameString)); - try { - // Create an unencrypted export file input stream. - FileInputStream unencryptedExportFileInputStream = new FileInputStream(temporaryUnencryptedExportFile); + // Get the salt from the beginning of the import file. + byte[] saltByteArray = new byte[32]; + //noinspection ResultOfMethodCallIgnored + inputStream.read(saltByteArray); - // Delete the encrypted export file if it exists. - if (exportFile.exists()) { + // Get the initialization vector from the import file. + byte[] initializationVector = new byte[12]; //noinspection ResultOfMethodCallIgnored - exportFile.delete(); - } + inputStream.read(initializationVector); - // Create an encrypted export file output stream. - FileOutputStream encryptedExportFileOutputStream = new FileOutputStream(exportFile); + // Convert the encryption password to a byte array. + byte[] encryptionPasswordByteArray = encryptionPasswordString.getBytes(StandardCharsets.UTF_8); - // Get a handle for the encryption password EditText. - EditText encryptionPasswordEditText = findViewById(R.id.password_encryption_edittext); + // Append the salt to the encryption password byte array. This protects against rainbow table attacks. + byte[] encryptionPasswordWithSaltByteArray = new byte[encryptionPasswordByteArray.length + saltByteArray.length]; + System.arraycopy(encryptionPasswordByteArray, 0, encryptionPasswordWithSaltByteArray, 0, encryptionPasswordByteArray.length); + System.arraycopy(saltByteArray, 0, encryptionPasswordWithSaltByteArray, encryptionPasswordByteArray.length, saltByteArray.length); - // Get the encryption password. - String encryptionPasswordString = encryptionPasswordEditText.getText().toString(); + // Get a SHA-512 message digest. + MessageDigest messageDigest = MessageDigest.getInstance("SHA-512"); - // Initialize a secure random number generator. - SecureRandom secureRandom = new SecureRandom(); + // Hash the salted encryption password. Otherwise, any characters after the 32nd character in the password are ignored. + byte[] hashedEncryptionPasswordWithSaltByteArray = messageDigest.digest(encryptionPasswordWithSaltByteArray); - // Get a 256 bit (32 byte) random salt. - byte[] saltByteArray = new byte[32]; - secureRandom.nextBytes(saltByteArray); + // Truncate the encryption password byte array to 256 bits (32 bytes). + byte[] truncatedHashedEncryptionPasswordWithSaltByteArray = Arrays.copyOf(hashedEncryptionPasswordWithSaltByteArray, 32); - // Convert the encryption password to a byte array. - byte[] encryptionPasswordByteArray = encryptionPasswordString.getBytes(StandardCharsets.UTF_8); + // Create an AES secret key from the encryption password byte array. + SecretKeySpec secretKey = new SecretKeySpec(truncatedHashedEncryptionPasswordWithSaltByteArray, "AES"); - // Append the salt to the encryption password byte array. This protects against rainbow table attacks. - byte[] encryptionPasswordWithSaltByteArray = new byte[encryptionPasswordByteArray.length + saltByteArray.length]; - System.arraycopy(encryptionPasswordByteArray, 0, encryptionPasswordWithSaltByteArray, 0, encryptionPasswordByteArray.length); - System.arraycopy(saltByteArray, 0, encryptionPasswordWithSaltByteArray, encryptionPasswordByteArray.length, saltByteArray.length); + // Get a Advanced Encryption Standard, Galois/Counter Mode, No Padding cipher instance. Galois/Counter mode protects against modification of the ciphertext. It doesn't use padding. + Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); - // Get a SHA-512 message digest. - MessageDigest messageDigest = MessageDigest.getInstance("SHA-512"); + // Set the GCM tag length to be 128 bits (the maximum) and apply the initialization vector. + GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, initializationVector); - // Hash the salted encryption password. Otherwise, any characters after the 32nd character in the password are ignored. - byte[] hashedEncryptionPasswordWithSaltByteArray = messageDigest.digest(encryptionPasswordWithSaltByteArray); + // Initialize the cipher. + cipher.init(Cipher.DECRYPT_MODE, secretKey, gcmParameterSpec); - // Truncate the encryption password byte array to 256 bits (32 bytes). - byte[] truncatedHashedEncryptionPasswordWithSaltByteArray = Arrays.copyOf(hashedEncryptionPasswordWithSaltByteArray, 32); + // Create a cipher input stream. + CipherInputStream cipherInputStream = new CipherInputStream(inputStream, cipher); - // Create an AES secret key from the encryption password byte array. - SecretKeySpec secretKey = new SecretKeySpec(truncatedHashedEncryptionPasswordWithSaltByteArray, "AES"); + // Initialize variables to store data as it is moved from the cipher input stream to the unencrypted import file output stream. Move 128 bits (16 bytes) at a time. + int numberOfBytesRead; + byte[] decryptedBytes = new byte[16]; - // Generate a random 12 byte initialization vector. According to NIST, a 12 byte initialization vector is more secure than a 16 byte one. - byte[] initializationVector = new byte[12]; - secureRandom.nextBytes(initializationVector); - // Get a Advanced Encryption Standard, Galois/Counter Mode, No Padding cipher instance. Galois/Counter mode protects against modification of the ciphertext. It doesn't use padding. - Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); + // Create a private temporary unencrypted import file. + File temporaryUnencryptedImportFile = File.createTempFile("temporary_unencrypted_import_file", null, getApplicationContext().getCacheDir()); - // Set the GCM tag length to be 128 bits (the maximum) and apply the initialization vector. - GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, initializationVector); + // Create an temporary unencrypted import file output stream. + FileOutputStream temporaryUnencryptedImportFileOutputStream = new FileOutputStream(temporaryUnencryptedImportFile); - // Initialize the cipher. - cipher.init(Cipher.ENCRYPT_MODE, secretKey, gcmParameterSpec); - // Add the salt and the initialization vector to the export file. - encryptedExportFileOutputStream.write(saltByteArray); - encryptedExportFileOutputStream.write(initializationVector); + // Read up to 128 bits (16 bytes) of data from the cipher input stream. `-1` will be returned when the end fo the file is reached. + while ((numberOfBytesRead = cipherInputStream.read(decryptedBytes)) != -1) { + // Write the data to the temporary unencrypted import file output stream. + temporaryUnencryptedImportFileOutputStream.write(decryptedBytes, 0, numberOfBytesRead); + } - // Create a cipher output stream. - CipherOutputStream cipherOutputStream = new CipherOutputStream(encryptedExportFileOutputStream, cipher); - // Initialize variables to store data as it is moved from the unencrypted export file input stream to the cipher output stream. Move 128 bits (16 bytes) at a time. - int numberOfBytesRead; - byte[] encryptedBytes = new byte[16]; + // Flush the temporary unencrypted import file output stream. + temporaryUnencryptedImportFileOutputStream.flush(); - // Read up to 128 bits (16 bytes) of data from the unencrypted export file stream. `-1` will be returned when the end of the file is reached. - while ((numberOfBytesRead = unencryptedExportFileInputStream.read(encryptedBytes)) != -1) { - // Write the data to the cipher output stream. - cipherOutputStream.write(encryptedBytes, 0, numberOfBytesRead); - } + // Close the streams. + temporaryUnencryptedImportFileOutputStream.close(); + cipherInputStream.close(); + inputStream.close(); - // Close the streams. - cipherOutputStream.flush(); - cipherOutputStream.close(); - encryptedExportFileOutputStream.close(); - unencryptedExportFileInputStream.close(); - - // Wipe the encryption data from memory. - //noinspection UnusedAssignment - encryptionPasswordString = ""; - Arrays.fill(saltByteArray, (byte) 0); - Arrays.fill(encryptionPasswordByteArray, (byte) 0); - Arrays.fill(encryptionPasswordWithSaltByteArray, (byte) 0); - Arrays.fill(hashedEncryptionPasswordWithSaltByteArray, (byte) 0); - Arrays.fill(truncatedHashedEncryptionPasswordWithSaltByteArray, (byte) 0); - Arrays.fill(initializationVector, (byte) 0); - Arrays.fill(encryptedBytes, (byte) 0); - - // Delete the temporary unencrypted export file. - //noinspection ResultOfMethodCallIgnored - temporaryUnencryptedExportFile.delete(); - } catch (Exception exception) { - exportStatus = exception.toString(); - } + // Wipe the encryption data from memory. + //noinspection UnusedAssignment + encryptionPasswordString = ""; + Arrays.fill(saltByteArray, (byte) 0); + Arrays.fill(initializationVector, (byte) 0); + Arrays.fill(encryptionPasswordByteArray, (byte) 0); + Arrays.fill(encryptionPasswordWithSaltByteArray, (byte) 0); + Arrays.fill(hashedEncryptionPasswordWithSaltByteArray, (byte) 0); + Arrays.fill(truncatedHashedEncryptionPasswordWithSaltByteArray, (byte) 0); + Arrays.fill(decryptedBytes, (byte) 0); - // Show a disposition snackbar. - if (exportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) { - Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show(); - } else { - Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + exportStatus, Snackbar.LENGTH_INDEFINITE).show(); - } - break; + // Create a temporary unencrypted import file input stream. + FileInputStream temporaryUnencryptedImportFileInputStream = new FileInputStream(temporaryUnencryptedImportFile); - case OPENPGP_ENCRYPTION: - // Create an unencrypted export in the private location. - importExportDatabaseHelper.exportUnencrypted(temporaryUnencryptedExportFile, this); + // Import the temporary unencrypted import file. + importStatus = importExportDatabaseHelper.importUnencrypted(temporaryUnencryptedImportFileInputStream, this); - // Create an encryption intent for OpenKeychain. - Intent openKeychainEncryptIntent = new Intent("org.sufficientlysecure.keychain.action.ENCRYPT_DATA"); + // Close the temporary unencrypted import file input stream. + temporaryUnencryptedImportFileInputStream.close(); - // Include the temporary unencrypted export file URI. - openKeychainEncryptIntent.setData(FileProvider.getUriForFile(this, getString(R.string.file_provider), temporaryUnencryptedExportFile)); + // Delete the temporary unencrypted import file. + //noinspection ResultOfMethodCallIgnored + temporaryUnencryptedImportFile.delete(); - // Allow OpenKeychain to read the file URI. - openKeychainEncryptIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + // Restart Privacy Browser if successful. + if (importStatus.equals(ImportExportDatabaseHelper.IMPORT_SUCCESSFUL)) { + restartPrivacyBrowser(); + } + } catch (Exception exception) { + // Update the import status. + importStatus = exception.toString(); + } + break; - // Send the intent to the OpenKeychain package. - openKeychainEncryptIntent.setPackage("org.sufficientlysecure.keychain"); + case OPENPGP_ENCRYPTION: + try { + // Set the temporary PGP encrypted import file. + temporaryPgpEncryptedImportFile = File.createTempFile("temporary_pgp_encrypted_import_file", null, getApplicationContext().getCacheDir()); - // Make it so. - startActivityForResult(openKeychainEncryptIntent, OPENPGP_EXPORT_RESULT_CODE); - break; - } + // Create a temporary PGP encrypted import file output stream. + FileOutputStream temporaryPgpEncryptedImportFileOutputStream = new FileOutputStream(temporaryPgpEncryptedImportFile); - // 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); - } + // Get an input stream for the file name. + InputStream inputStream = getContentResolver().openInputStream(Uri.parse(fileNameString)); - private void importSettings() { - // Get a handle for the views. - Spinner encryptionSpinner = findViewById(R.id.encryption_spinner); - EditText fileNameEditText = findViewById(R.id.file_name_edittext); + // Create a transfer byte array. + byte[] transferByteArray = new byte[1024]; - // Instantiate the import export database helper. - ImportExportDatabaseHelper importExportDatabaseHelper = new ImportExportDatabaseHelper(); + // Create an integer to track the number of bytes read. + int bytesRead; - // Get the import file. - File importFile = new File(fileNameEditText.getText().toString()); + // Copy the input stream to the temporary PGP encrypted import file. + while ((bytesRead = inputStream.read(transferByteArray)) > 0) { + temporaryPgpEncryptedImportFileOutputStream.write(transferByteArray, 0, bytesRead); + } - // Initialize the import status string - String importStatus = ""; + // Flush the temporary PGP encrypted import file output stream. + temporaryPgpEncryptedImportFileOutputStream.flush(); - // Import according to the encryption type. - switch (encryptionSpinner.getSelectedItemPosition()) { - case NO_ENCRYPTION: - // Import the unencrypted file. - importStatus = importExportDatabaseHelper.importUnencrypted(importFile, this); - break; + // Close the streams. + inputStream.close(); + temporaryPgpEncryptedImportFileOutputStream.flush(); - case PASSWORD_ENCRYPTION: - // Use a private temporary import location. - File temporaryUnencryptedImportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs"); - try { - // Create an encrypted import file input stream. - FileInputStream encryptedImportFileInputStream = new FileInputStream(importFile); + // Create an decryption intent for OpenKeychain. + Intent openKeychainDecryptIntent = new Intent("org.sufficientlysecure.keychain.action.DECRYPT_DATA"); - // Delete the temporary import file if it exists. - if (temporaryUnencryptedImportFile.exists()) { - //noinspection ResultOfMethodCallIgnored - temporaryUnencryptedImportFile.delete(); + // Include the URI to be decrypted. + openKeychainDecryptIntent.setData(FileProvider.getUriForFile(this, getString(R.string.file_provider), temporaryPgpEncryptedImportFile)); + + // Allow OpenKeychain to read the file URI. + openKeychainDecryptIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + + // Send the intent to the OpenKeychain package. + openKeychainDecryptIntent.setPackage("org.sufficientlysecure.keychain"); + + // Make it so. + startActivityForResult(openKeychainDecryptIntent, OPENPGP_IMPORT_RESULT_CODE); + + // Update the import status. + importStatus = ImportExportDatabaseHelper.IMPORT_SUCCESSFUL; + } catch (Exception exception) { + // Update the import status. + importStatus = exception.toString(); } + break; + } - // Create an unencrypted import file output stream. - FileOutputStream unencryptedImportFileOutputStream = new FileOutputStream(temporaryUnencryptedImportFile); + // Respond to the import status. + if (!importStatus.equals(ImportExportDatabaseHelper.IMPORT_SUCCESSFUL)) { + // Display a snack bar with the import error. + Snackbar.make(fileNameEditText, getString(R.string.import_failed) + " " + importStatus, Snackbar.LENGTH_INDEFINITE).show(); + } + } else { // Export is selected. + // Export according to the encryption type. + switch (encryptionSpinner.getSelectedItemPosition()) { + case NO_ENCRYPTION: + // Get the file name string. + String noEncryptionFileNameString = fileNameEditText.getText().toString(); + + try { + // Get the export file output stream. + OutputStream exportFileOutputStream = getContentResolver().openOutputStream(Uri.parse(noEncryptionFileNameString)); + + // Export the unencrypted file. + String noEncryptionExportStatus = importExportDatabaseHelper.exportUnencrypted(exportFileOutputStream, this); + + // Display an export disposition snackbar. + if (noEncryptionExportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) { + Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + noEncryptionExportStatus, Snackbar.LENGTH_INDEFINITE).show(); + } + } catch (FileNotFoundException fileNotFoundException) { + // Display a snackbar with the exception. + Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + fileNotFoundException, Snackbar.LENGTH_INDEFINITE).show(); + } + break; - // Get a handle for the encryption password EditText. - EditText encryptionPasswordEditText = findViewById(R.id.password_encryption_edittext); + case PASSWORD_ENCRYPTION: + try { + // Create a temporary unencrypted export file. + File temporaryUnencryptedExportFile = File.createTempFile("temporary_unencrypted_export_file", null, getApplicationContext().getCacheDir()); - // Get the encryption password. - String encryptionPasswordString = encryptionPasswordEditText.getText().toString(); + // Create a temporary unencrypted export output stream. + FileOutputStream temporaryUnencryptedExportOutputStream = new FileOutputStream(temporaryUnencryptedExportFile); - // Get the salt from the beginning of the import file. - byte[] saltByteArray = new byte[32]; - //noinspection ResultOfMethodCallIgnored - encryptedImportFileInputStream.read(saltByteArray); + // Populate the temporary unencrypted export. + String passwordEncryptionExportStatus = importExportDatabaseHelper.exportUnencrypted(temporaryUnencryptedExportOutputStream, this); - // Get the initialization vector from the import file. - byte[] initializationVector = new byte[12]; - //noinspection ResultOfMethodCallIgnored - encryptedImportFileInputStream.read(initializationVector); + // Close the temporary unencrypted export output stream. + temporaryUnencryptedExportOutputStream.close(); - // Convert the encryption password to a byte array. - byte[] encryptionPasswordByteArray = encryptionPasswordString.getBytes(StandardCharsets.UTF_8); + // Create an unencrypted export file input stream. + FileInputStream unencryptedExportFileInputStream = new FileInputStream(temporaryUnencryptedExportFile); - // Append the salt to the encryption password byte array. This protects against rainbow table attacks. - byte[] encryptionPasswordWithSaltByteArray = new byte[encryptionPasswordByteArray.length + saltByteArray.length]; - System.arraycopy(encryptionPasswordByteArray, 0, encryptionPasswordWithSaltByteArray, 0, encryptionPasswordByteArray.length); - System.arraycopy(saltByteArray, 0, encryptionPasswordWithSaltByteArray, encryptionPasswordByteArray.length, saltByteArray.length); + // Get the encryption password. + String encryptionPasswordString = encryptionPasswordEditText.getText().toString(); - // Get a SHA-512 message digest. - MessageDigest messageDigest = MessageDigest.getInstance("SHA-512"); + // Initialize a secure random number generator. + SecureRandom secureRandom = new SecureRandom(); - // Hash the salted encryption password. Otherwise, any characters after the 32nd character in the password are ignored. - byte[] hashedEncryptionPasswordWithSaltByteArray = messageDigest.digest(encryptionPasswordWithSaltByteArray); + // Get a 256 bit (32 byte) random salt. + byte[] saltByteArray = new byte[32]; + secureRandom.nextBytes(saltByteArray); - // Truncate the encryption password byte array to 256 bits (32 bytes). - byte[] truncatedHashedEncryptionPasswordWithSaltByteArray = Arrays.copyOf(hashedEncryptionPasswordWithSaltByteArray, 32); + // Convert the encryption password to a byte array. + byte[] encryptionPasswordByteArray = encryptionPasswordString.getBytes(StandardCharsets.UTF_8); - // Create an AES secret key from the encryption password byte array. - SecretKeySpec secretKey = new SecretKeySpec(truncatedHashedEncryptionPasswordWithSaltByteArray, "AES"); + // Append the salt to the encryption password byte array. This protects against rainbow table attacks. + byte[] encryptionPasswordWithSaltByteArray = new byte[encryptionPasswordByteArray.length + saltByteArray.length]; + System.arraycopy(encryptionPasswordByteArray, 0, encryptionPasswordWithSaltByteArray, 0, encryptionPasswordByteArray.length); + System.arraycopy(saltByteArray, 0, encryptionPasswordWithSaltByteArray, encryptionPasswordByteArray.length, saltByteArray.length); - // Get a Advanced Encryption Standard, Galois/Counter Mode, No Padding cipher instance. Galois/Counter mode protects against modification of the ciphertext. It doesn't use padding. - Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); + // Get a SHA-512 message digest. + MessageDigest messageDigest = MessageDigest.getInstance("SHA-512"); - // Set the GCM tag length to be 128 bits (the maximum) and apply the initialization vector. - GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, initializationVector); + // Hash the salted encryption password. Otherwise, any characters after the 32nd character in the password are ignored. + byte[] hashedEncryptionPasswordWithSaltByteArray = messageDigest.digest(encryptionPasswordWithSaltByteArray); - // Initialize the cipher. - cipher.init(Cipher.DECRYPT_MODE, secretKey, gcmParameterSpec); + // Truncate the encryption password byte array to 256 bits (32 bytes). + byte[] truncatedHashedEncryptionPasswordWithSaltByteArray = Arrays.copyOf(hashedEncryptionPasswordWithSaltByteArray, 32); - // Create a cipher input stream. - CipherInputStream cipherInputStream = new CipherInputStream(encryptedImportFileInputStream, cipher); + // Create an AES secret key from the encryption password byte array. + SecretKeySpec secretKey = new SecretKeySpec(truncatedHashedEncryptionPasswordWithSaltByteArray, "AES"); - // Initialize variables to store data as it is moved from the cipher input stream to the unencrypted import file output stream. Move 128 bits (16 bytes) at a time. - int numberOfBytesRead; - byte[] decryptedBytes = new byte[16]; + // Generate a random 12 byte initialization vector. According to NIST, a 12 byte initialization vector is more secure than a 16 byte one. + byte[] initializationVector = new byte[12]; + secureRandom.nextBytes(initializationVector); - // Read up to 128 bits (16 bytes) of data from the cipher input stream. `-1` will be returned when the end fo the file is reached. - while ((numberOfBytesRead = cipherInputStream.read(decryptedBytes)) != -1) { - // Write the data to the unencrypted import file output stream. - unencryptedImportFileOutputStream.write(decryptedBytes, 0, numberOfBytesRead); - } + // Get a Advanced Encryption Standard, Galois/Counter Mode, No Padding cipher instance. Galois/Counter mode protects against modification of the ciphertext. It doesn't use padding. + Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); - // Close the streams. - unencryptedImportFileOutputStream.flush(); - unencryptedImportFileOutputStream.close(); - cipherInputStream.close(); - encryptedImportFileInputStream.close(); - - // Wipe the encryption data from memory. - //noinspection UnusedAssignment - encryptionPasswordString = ""; - Arrays.fill(saltByteArray, (byte) 0); - Arrays.fill(initializationVector, (byte) 0); - Arrays.fill(encryptionPasswordByteArray, (byte) 0); - Arrays.fill(encryptionPasswordWithSaltByteArray, (byte) 0); - Arrays.fill(hashedEncryptionPasswordWithSaltByteArray, (byte) 0); - Arrays.fill(truncatedHashedEncryptionPasswordWithSaltByteArray, (byte) 0); - Arrays.fill(decryptedBytes, (byte) 0); - - // Import the unencrypted database from the private location. - importStatus = importExportDatabaseHelper.importUnencrypted(temporaryUnencryptedImportFile, this); - - // Delete the temporary unencrypted import file. - //noinspection ResultOfMethodCallIgnored - temporaryUnencryptedImportFile.delete(); - } catch (Exception exception) { - importStatus = exception.toString(); - } - break; + // Set the GCM tag length to be 128 bits (the maximum) and apply the initialization vector. + GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, initializationVector); - case OPENPGP_ENCRYPTION: - try { - // Create an decryption intent for OpenKeychain. - Intent openKeychainDecryptIntent = new Intent("org.sufficientlysecure.keychain.action.DECRYPT_DATA"); + // Initialize the cipher. + cipher.init(Cipher.ENCRYPT_MODE, secretKey, gcmParameterSpec); - // Include the URI to be decrypted. - openKeychainDecryptIntent.setData(FileProvider.getUriForFile(this, getString(R.string.file_provider), importFile)); + // Get the file name string. + String passwordEncryptionFileNameString = fileNameEditText.getText().toString(); - // Allow OpenKeychain to read the file URI. - openKeychainDecryptIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + // Get the export file output stream. + OutputStream exportFileOutputStream = getContentResolver().openOutputStream(Uri.parse(passwordEncryptionFileNameString)); - // Send the intent to the OpenKeychain package. - openKeychainDecryptIntent.setPackage("org.sufficientlysecure.keychain"); + // Add the salt and the initialization vector to the export file output stream. + exportFileOutputStream.write(saltByteArray); + exportFileOutputStream.write(initializationVector); - // Make it so. - startActivity(openKeychainDecryptIntent); - } catch (IllegalArgumentException exception) { // The file import location is not valid. - // Display a snack bar with the import error. - Snackbar.make(fileNameEditText, getString(R.string.import_failed) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show(); - } - break; - } + // Create a cipher output stream. + CipherOutputStream cipherOutputStream = new CipherOutputStream(exportFileOutputStream, cipher); + + // Initialize variables to store data as it is moved from the unencrypted export file input stream to the cipher output stream. Move 128 bits (16 bytes) at a time. + int numberOfBytesRead; + byte[] encryptedBytes = new byte[16]; + + // Read up to 128 bits (16 bytes) of data from the unencrypted export file stream. `-1` will be returned when the end of the file is reached. + while ((numberOfBytesRead = unencryptedExportFileInputStream.read(encryptedBytes)) != -1) { + // Write the data to the cipher output stream. + cipherOutputStream.write(encryptedBytes, 0, numberOfBytesRead); + } + + // Close the streams. + cipherOutputStream.flush(); + cipherOutputStream.close(); + exportFileOutputStream.close(); + unencryptedExportFileInputStream.close(); + + // Wipe the encryption data from memory. + //noinspection UnusedAssignment + encryptionPasswordString = ""; + Arrays.fill(saltByteArray, (byte) 0); + Arrays.fill(encryptionPasswordByteArray, (byte) 0); + Arrays.fill(encryptionPasswordWithSaltByteArray, (byte) 0); + Arrays.fill(hashedEncryptionPasswordWithSaltByteArray, (byte) 0); + Arrays.fill(truncatedHashedEncryptionPasswordWithSaltByteArray, (byte) 0); + Arrays.fill(initializationVector, (byte) 0); + Arrays.fill(encryptedBytes, (byte) 0); + + // Delete the temporary unencrypted export file. + //noinspection ResultOfMethodCallIgnored + temporaryUnencryptedExportFile.delete(); + + // Display an export disposition snackbar. + if (passwordEncryptionExportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) { + Snackbar.make(fileNameEditText, getString(R.string.export_successful), Snackbar.LENGTH_SHORT).show(); + } else { + Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + passwordEncryptionExportStatus, Snackbar.LENGTH_INDEFINITE).show(); + } + } catch (Exception exception) { + // Display a snackbar with the exception. + Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + exception, Snackbar.LENGTH_INDEFINITE).show(); + } + break; - // Respond to the import disposition. - if (importStatus.equals(ImportExportDatabaseHelper.IMPORT_SUCCESSFUL)) { // The import was successful. - // Create an intent to restart Privacy Browser. - Intent restartIntent = getParentActivityIntent(); + case OPENPGP_ENCRYPTION: + try { + // Set the temporary pre-encrypted export file. + temporaryPreEncryptedExportFile = new File(getApplicationContext().getCacheDir() + "/" + getString(R.string.settings) + " " + BuildConfig.VERSION_NAME + ".pbs"); - // Assert that the intent is not null to remove the lint error below. - assert restartIntent != null; + // Delete the temporary pre-encrypted export file if it already exists. + if (temporaryPreEncryptedExportFile.exists()) { + //noinspection ResultOfMethodCallIgnored + temporaryPreEncryptedExportFile.delete(); + } - // `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); + // Create a temporary pre-encrypted export output stream. + FileOutputStream temporaryPreEncryptedExportOutputStream = new FileOutputStream(temporaryPreEncryptedExportFile); + + // Populate the temporary pre-encrypted export file. + String openpgpEncryptionExportStatus = importExportDatabaseHelper.exportUnencrypted(temporaryPreEncryptedExportOutputStream, this); + + // Flush the temporary pre-encryption export output stream. + temporaryPreEncryptedExportOutputStream.flush(); + + // Close the temporary pre-encryption export output stream. + temporaryPreEncryptedExportOutputStream.close(); + + // Display an export error snackbar if the temporary pre-encrypted export failed. + if (!openpgpEncryptionExportStatus.equals(ImportExportDatabaseHelper.EXPORT_SUCCESSFUL)) { + Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + openpgpEncryptionExportStatus, Snackbar.LENGTH_INDEFINITE).show(); + } - // Create a restart handler. - Handler restartHandler = new Handler(); + // Create an encryption intent for OpenKeychain. + Intent openKeychainEncryptIntent = new Intent("org.sufficientlysecure.keychain.action.ENCRYPT_DATA"); - // Create a restart runnable. - Runnable restartRunnable = () -> { - // Restart Privacy Browser. - startActivity(restartIntent); + // Include the temporary unencrypted export file URI. + openKeychainEncryptIntent.setData(FileProvider.getUriForFile(this, getString(R.string.file_provider), temporaryPreEncryptedExportFile)); - // Kill this instance of Privacy Browser. Otherwise, the app exhibits sporadic behavior after the restart. - System.exit(0); - }; + // Allow OpenKeychain to read the file URI. + openKeychainEncryptIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - // Restart Privacy Browser after 150 milliseconds to allow enough time for the preferences to be saved. - restartHandler.postDelayed(restartRunnable, 150); + // Send the intent to the OpenKeychain package. + openKeychainEncryptIntent.setPackage("org.sufficientlysecure.keychain"); - } 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(); + // Make it so. + startActivityForResult(openKeychainEncryptIntent, OPENPGP_EXPORT_RESULT_CODE); + } catch (Exception exception) { + // Display a snackbar with the exception. + Snackbar.make(fileNameEditText, getString(R.string.export_failed) + " " + exception, Snackbar.LENGTH_INDEFINITE).show(); + } + break; + } } } + + private void restartPrivacyBrowser() { + // Create an intent to restart Privacy Browser. + Intent restartIntent = getParentActivityIntent(); + + // Assert that the intent is not null to remove the lint error below. + assert restartIntent != null; + + // `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); + + // 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); + } } \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java index 3200c2be..8e54bb43 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2020 Soren Stoutner . + * Copyright © 2019-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,25 +19,19 @@ package com.stoutner.privacybrowser.activities; -import android.Manifest; import android.app.Activity; import android.app.Dialog; import android.content.ClipData; import android.content.ClipboardManager; -import android.content.ContentResolver; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.media.MediaScannerConnection; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.view.WindowManager; import android.widget.EditText; import android.widget.ScrollView; @@ -47,9 +41,6 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; -import androidx.core.content.FileProvider; import androidx.fragment.app.DialogFragment; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -57,28 +48,22 @@ import com.google.android.material.snackbar.Snackbar; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.asynctasks.GetLogcat; -import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog; import com.stoutner.privacybrowser.dialogs.SaveDialog; -import com.stoutner.privacybrowser.helpers.FileNameHelper; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; -public class LogcatActivity extends AppCompatActivity implements SaveDialog.SaveListener, StoragePermissionDialog.StoragePermissionDialogListener { +public class LogcatActivity extends AppCompatActivity implements SaveDialog.SaveListener { // Declare the class constants. private final String SCROLLVIEW_POSITION = "scrollview_position"; - // Declare the class variables. - private String filePathString; - // Define the class views. private TextView logcatTextView; @@ -104,8 +89,11 @@ public class LogcatActivity extends AppCompatActivity implements SaveDialog.Save // Set the content view. setContentView(R.layout.logcat_coordinatorlayout); - // Set the toolbar as the action bar. + // Get handles for the views. Toolbar toolbar = findViewById(R.id.logcat_toolbar); + SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.logcat_swiperefreshlayout); + + // Set the toolbar as the action bar. setSupportActionBar(toolbar); // Get a handle for the action bar. @@ -121,7 +109,6 @@ public class LogcatActivity extends AppCompatActivity implements SaveDialog.Save logcatTextView = findViewById(R.id.logcat_textview); // Implement swipe to refresh. - SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.logcat_swiperefreshlayout); swipeRefreshLayout.setOnRefreshListener(() -> { // Get the current logcat. new GetLogcat(this, 0).execute(); @@ -241,78 +228,11 @@ public class LogcatActivity extends AppCompatActivity implements SaveDialog.Save savedInstanceState.putInt(SCROLLVIEW_POSITION, scrollViewYPositionInt); } - @Override - public void onSave(int saveType, DialogFragment dialogFragment) { - // Get a handle for the dialog. - Dialog dialog = dialogFragment.getDialog(); - - // Remove the lint warning below that the dialog might be null. - assert dialog != null; - - // Get a handle for the file name edit text. - EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); - - // Get the file path string. - filePathString = fileNameEditText.getText().toString(); - - // Check to see if the storage permission is needed. - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - // Save the logcat. - saveLogcat(filePathString); - } else { // The storage permission has not been granted. - // Get the external private directory file. - File externalPrivateDirectoryFile = getExternalFilesDir(null); - - // Remove the incorrect lint error below that the file might be null. - assert externalPrivateDirectoryFile != null; - - // Get the external private directory string. - String externalPrivateDirectory = externalPrivateDirectoryFile.toString(); - - // Check to see if the file path is in the external private directory. - if (filePathString.startsWith(externalPrivateDirectory)) { // The file path is in the external private directory. - // Save the logcat. - saveLogcat(filePathString); - } else { // The file path is in a public directory. - // 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. The type is specified as `0` because it currently isn't used for this activity. - 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)); - } else { // Show the permission request directly. - // Request the write external storage permission. The logcat will be saved when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); - - } - } - } - } - - @Override - public void onCloseStoragePermissionDialog(int requestType) { - // Request the write external storage permission. The logcat will be saved when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - // Check to see if the storage permission was granted. If the dialog was canceled the grant result will be empty. - if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) { // The storage permission was granted. - // Save the logcat. - saveLogcat(filePathString); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(logcatTextView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); - } - } - // The activity result is called after browsing for a file in the save alert dialog. @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { + public void onActivityResult(int requestCode, int resultCode, Intent returnedIntent) { // Run the default commands. - super.onActivityResult(requestCode, resultCode, data); + super.onActivityResult(requestCode, resultCode, returnedIntent); // Only do something if the user didn't press back from the file picker. if (resultCode == Activity.RESULT_OK) { @@ -327,35 +247,38 @@ public class LogcatActivity extends AppCompatActivity implements SaveDialog.Save // Remove the lint warning below that the save dialog might be null. assert saveDialog != null; - // Get a handle for the dialog views. + // Get a handle for the file name edit text. EditText fileNameEditText = saveDialog.findViewById(R.id.file_name_edittext); - TextView fileExistsWarningTextView = saveDialog.findViewById(R.id.file_exists_warning_textview); // Get the file name URI from the intent. - Uri fileNameUri = data.getData(); + Uri fileNameUri = returnedIntent.getData(); - // Process the file name URI if it is not null. - if (fileNameUri != null) { - // Instantiate a file name helper. - FileNameHelper fileNameHelper = new FileNameHelper(); + // Get the file name string from the URI. + String fileNameString = fileNameUri.toString(); - // Convert the file name URI to a file name path. - String fileNamePath = fileNameHelper.convertUriToFileNamePath(fileNameUri); + // Set the file name text. + fileNameEditText.setText(fileNameString); - // Set the file name path as the text of the file name edit text. - fileNameEditText.setText(fileNamePath); - - // Move the cursor to the end of the file name edit text. - fileNameEditText.setSelection(fileNamePath.length()); - - // Hide the file exists warning. - fileExistsWarningTextView.setVisibility(View.GONE); - } + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNameString.length()); } } } - private void saveLogcat(String fileNameString) { + @Override + public void onSave(int saveType, DialogFragment dialogFragment) { + // Get a handle for the dialog. + Dialog dialog = dialogFragment.getDialog(); + + // Remove the lint warning below that the dialog might be null. + assert dialog != null; + + // Get a handle for the file name edit text. + EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); + + // Get the file path string. + String fileNameString = fileNameEditText.getText().toString(); + try { // Get the logcat as a string. String logcatString = logcatTextView.getText().toString(); @@ -366,17 +289,11 @@ public class LogcatActivity extends AppCompatActivity implements SaveDialog.Save // Create a logcat buffered reader. BufferedReader logcatBufferedReader = new BufferedReader(new InputStreamReader(logcatInputStream)); - // Create a file from the file name string. - File saveFile = new File(fileNameString); - - // Delete the file if it already exists. - if (saveFile.exists()) { - //noinspection ResultOfMethodCallIgnored - saveFile.delete(); - } + // Open an output stream. + OutputStream outputStream = getContentResolver().openOutputStream(Uri.parse(fileNameString)); // Create a file buffered writer. - BufferedWriter fileBufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(saveFile))); + BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(outputStream)); // Create a transfer string. String transferString; @@ -384,55 +301,23 @@ public class LogcatActivity extends AppCompatActivity implements SaveDialog.Save // Use the transfer string to copy the logcat from the buffered reader to the buffered writer. while ((transferString = logcatBufferedReader.readLine()) != null) { // Append the line to the buffered writer. - fileBufferedWriter.append(transferString); + bufferedWriter.append(transferString); // Append a line break. - fileBufferedWriter.append("\n"); + bufferedWriter.append("\n"); } - // Close the buffered reader and writer. - logcatBufferedReader.close(); - fileBufferedWriter.close(); - - // Add the file to the list of recent files. This doesn't currently work, but maybe it will someday. - MediaScannerConnection.scanFile(this, new String[] {fileNameString}, new String[] {"text/plain"}, null); - - // Create a logcat saved snackbar. - Snackbar logcatSavedSnackbar = Snackbar.make(logcatTextView, getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT); - - // Add an open action to the snackbar. - logcatSavedSnackbar.setAction(R.string.open, (View view) -> { - // Get a file for the file name string. - File file = new File(fileNameString); + // Flush the buffered writer. + bufferedWriter.flush(); - // Declare a file URI variable. - Uri fileUri; - - // Get the URI for the file according to the Android version. - if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. - fileUri = FileProvider.getUriForFile(this, getString(R.string.file_provider), file); - } else { // Get the raw file path URI. - fileUri = Uri.fromFile(file); - } - - // Get a handle for the content resolver. - ContentResolver contentResolver = getContentResolver(); - - // Create an open intent with `ACTION_VIEW`. - Intent openIntent = new Intent(Intent.ACTION_VIEW); - - // Set the URI and the MIME type. - openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); - - // Allow the app to read the file URI. - openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - - // Show the chooser. - startActivity(Intent.createChooser(openIntent, getString(R.string.open))); - }); + // Close the inputs and outputs. + logcatBufferedReader.close(); + logcatInputStream.close(); + bufferedWriter.close(); + outputStream.close(); - // Show the logcat saved snackbar. - logcatSavedSnackbar.show(); + // Display a snackbar with the saved logcat information. + Snackbar.make(logcatTextView, getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT).show(); } catch (Exception exception) { // Display a snackbar with the error message. Snackbar.make(logcatTextView, getString(R.string.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show(); diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index bef36d6a..88d41867 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -21,7 +21,6 @@ package com.stoutner.privacybrowser.activities; -import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; @@ -31,7 +30,6 @@ import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ClipData; import android.content.ClipboardManager; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -102,9 +100,6 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; -import androidx.core.content.FileProvider; import androidx.core.content.res.ResourcesCompat; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; @@ -140,7 +135,6 @@ import com.stoutner.privacybrowser.dialogs.ProxyNotInstalledDialog; import com.stoutner.privacybrowser.dialogs.PinnedMismatchDialog; import com.stoutner.privacybrowser.dialogs.SaveWebpageDialog; import com.stoutner.privacybrowser.dialogs.SslCertificateErrorDialog; -import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog; import com.stoutner.privacybrowser.dialogs.UrlHistoryDialog; import com.stoutner.privacybrowser.dialogs.ViewSslCertificateDialog; import com.stoutner.privacybrowser.dialogs.WaitingForProxyDialog; @@ -149,7 +143,6 @@ import com.stoutner.privacybrowser.helpers.AdHelper; import com.stoutner.privacybrowser.helpers.BlocklistHelper; import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper; import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; -import com.stoutner.privacybrowser.helpers.FileNameHelper; import com.stoutner.privacybrowser.helpers.ProxyHelper; import com.stoutner.privacybrowser.views.NestedScrollWebView; @@ -176,8 +169,8 @@ import java.util.concurrent.Executors; public class MainWebViewActivity extends AppCompatActivity implements CreateBookmarkDialog.CreateBookmarkListener, CreateBookmarkFolderDialog.CreateBookmarkFolderListener, EditBookmarkFolderDialog.EditBookmarkFolderListener, FontSizeDialog.UpdateFontSizeListener, NavigationView.OnNavigationItemSelectedListener, OpenDialog.OpenListener, - PinnedMismatchDialog.PinnedMismatchListener, PopulateBlocklists.PopulateBlocklistsListener, SaveWebpageDialog.SaveWebpageListener, StoragePermissionDialog.StoragePermissionDialogListener, - UrlHistoryDialog.NavigateHistoryListener, WebViewTabFragment.NewTabListener { + PinnedMismatchDialog.PinnedMismatchListener, PopulateBlocklists.PopulateBlocklistsListener, SaveWebpageDialog.SaveWebpageListener, UrlHistoryDialog.NavigateHistoryListener, + WebViewTabFragment.NewTabListener { // The executor service handles background tasks. It is accessed from `ViewSourceActivity`. public static ExecutorService executorService = Executors.newFixedThreadPool(4); @@ -203,10 +196,10 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook public final static int DOMAINS_WEBVIEW_DEFAULT_USER_AGENT = 2; public final static int DOMAINS_CUSTOM_USER_AGENT = 13; - // Start activity for result request codes. The public static entries are accessed from `OpenDialog()` and `SaveWebpageDialog()`. - public final static int BROWSE_OPEN_REQUEST_CODE = 0; - public final static int BROWSE_SAVE_WEBPAGE_REQUEST_CODE = 1; - private final int BROWSE_FILE_UPLOAD_REQUEST_CODE = 2; + // Define the start activity for result request codes. The public static entries are accessed from `OpenDialog()` and `SaveWebpageDialog()`. + private final int BROWSE_FILE_UPLOAD_REQUEST_CODE = 0; + public final static int BROWSE_OPEN_REQUEST_CODE = 1; + public final static int BROWSE_SAVE_WEBPAGE_REQUEST_CODE = 2; // The proxy mode is public static so it can be accessed from `ProxyHelper()`. // It is also used in `onRestart()`, `onPrepareOptionsMenu()`, `onOptionsItemSelected()`, `applyAppSettings()`, and `applyProxy()`. @@ -315,11 +308,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook private boolean sanitizeFacebookClickIds; private boolean sanitizeTwitterAmpRedirects; - // The file path strings are used in `onSaveWebpage()` and `onRequestPermissionResult()` - private String openFilePath; - private String saveWebpageUrl; - private String saveWebpageFilePath; - // Declare the class views. private FrameLayout rootFrameLayout; private DrawerLayout drawerLayout; @@ -1762,24 +1750,14 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook return true; } else if (menuItemId == R.id.save_url) { // Save URL. // Prepare the save dialog. The dialog will be displayed once the file size and the content disposition have been acquired. - new PrepareSaveDialog(this, this, getSupportFragmentManager(), StoragePermissionDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), + new PrepareSaveDialog(this, this, getSupportFragmentManager(), SaveWebpageDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(currentWebView.getCurrentUrl()); - // Consume the event. - return true; - } else if (menuItemId == R.id.save_archive) { // Save archive. - // Instantiate the save dialog. - DialogFragment saveArchiveFragment = SaveWebpageDialog.saveWebpage(StoragePermissionDialog.SAVE_ARCHIVE, null, null, getString(R.string.webpage_mht), null, - false); - - // Show the save dialog. It must be named `save_dialog` so that the file picker can update the file name. - saveArchiveFragment.show(getSupportFragmentManager(), getString(R.string.save_dialog)); - // Consume the event. return true; } else if (menuItemId == R.id.save_image) { // Save image. // Instantiate the save dialog. - DialogFragment saveImageFragment = SaveWebpageDialog.saveWebpage(StoragePermissionDialog.SAVE_IMAGE, null, null, getString(R.string.webpage_png), null, + DialogFragment saveImageFragment = SaveWebpageDialog.saveWebpage(SaveWebpageDialog.SAVE_IMAGE, null, null, getString(R.string.webpage_png), null, false); // Show the save dialog. It must be named `save_dialog` so that the file picker can update the file name. @@ -2240,7 +2218,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Add a Save URL entry. menu.add(R.string.save_url).setOnMenuItemClickListener((MenuItem item) -> { // Prepare the save dialog. The dialog will be displayed once the file size and the content disposition have been acquired. - new PrepareSaveDialog(this, this, getSupportFragmentManager(), StoragePermissionDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), + new PrepareSaveDialog(this, this, getSupportFragmentManager(), SaveWebpageDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(linkUrl); // Consume the event. @@ -2307,7 +2285,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Add a Save Image entry. menu.add(R.string.save_image).setOnMenuItemClickListener((MenuItem item) -> { // Prepare the save dialog. The dialog will be displayed once the file size and the content disposition have been acquired. - new PrepareSaveDialog(this, this, getSupportFragmentManager(), StoragePermissionDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), + new PrepareSaveDialog(this, this, getSupportFragmentManager(), SaveWebpageDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(imageUrl); // Consume the event. @@ -2407,7 +2385,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Add a Save Image entry. menu.add(R.string.save_image).setOnMenuItemClickListener((MenuItem item) -> { // Prepare the save dialog. The dialog will be displayed once the file size and the content disposition have been acquired. - new PrepareSaveDialog(this, this, getSupportFragmentManager(), StoragePermissionDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), + new PrepareSaveDialog(this, this, getSupportFragmentManager(), SaveWebpageDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(imageUrl); // Consume the event. @@ -2429,7 +2407,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook // Add a Save URL entry. menu.add(R.string.save_url).setOnMenuItemClickListener((MenuItem item) -> { // Prepare the save dialog. The dialog will be displayed once the file size and the content disposition have been acquired. - new PrepareSaveDialog(this, this, getSupportFragmentManager(), StoragePermissionDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), + new PrepareSaveDialog(this, this, getSupportFragmentManager(), SaveWebpageDialog.SAVE_URL, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(linkUrl); // Consume the event. @@ -2799,76 +2777,66 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } break; - case BROWSE_SAVE_WEBPAGE_REQUEST_CODE: + case BROWSE_OPEN_REQUEST_CODE: // Don't do anything if the user pressed back from the file picker. if (resultCode == Activity.RESULT_OK) { - // Get a handle for the save dialog fragment. - DialogFragment saveWebpageDialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(getString(R.string.save_dialog)); + // Get a handle for the open dialog fragment. + DialogFragment openDialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(getString(R.string.open)); // Only update the file name if the dialog still exists. - if (saveWebpageDialogFragment != null) { - // Get a handle for the save webpage dialog. - Dialog saveWebpageDialog = saveWebpageDialogFragment.getDialog(); + if (openDialogFragment != null) { + // Get a handle for the open dialog. + Dialog openDialog = openDialogFragment.getDialog(); // Remove the incorrect lint warning below that the dialog might be null. - assert saveWebpageDialog != null; + assert openDialog != null; // Get a handle for the file name edit text. - EditText fileNameEditText = saveWebpageDialog.findViewById(R.id.file_name_edittext); - TextView fileExistsWarningTextView = saveWebpageDialog.findViewById(R.id.file_exists_warning_textview); - - // Instantiate the file name helper. - FileNameHelper fileNameHelper = new FileNameHelper(); + EditText fileNameEditText = openDialog.findViewById(R.id.file_name_edittext); - // Get the file path if it isn't null. - if (returnedIntent.getData() != null) { - // Convert the file name URI to a file name path. - String fileNamePath = fileNameHelper.convertUriToFileNamePath(returnedIntent.getData()); + // Get the file name URI from the intent. + Uri fileNameUri = returnedIntent.getData(); - // Set the file name path as the text of the file name edit text. - fileNameEditText.setText(fileNamePath); + // Get the file name string from the URI. + String fileNameString = fileNameUri.toString(); - // Move the cursor to the end of the file name edit text. - fileNameEditText.setSelection(fileNamePath.length()); + // Set the file name text. + fileNameEditText.setText(fileNameString); - // Hide the file exists warning. - fileExistsWarningTextView.setVisibility(View.GONE); - } + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNameString.length()); } } break; - case BROWSE_OPEN_REQUEST_CODE: + case BROWSE_SAVE_WEBPAGE_REQUEST_CODE: // Don't do anything if the user pressed back from the file picker. if (resultCode == Activity.RESULT_OK) { - // Get a handle for the open dialog fragment. - DialogFragment openDialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(getString(R.string.open)); + // Get a handle for the save dialog fragment. + DialogFragment saveWebpageDialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(getString(R.string.save_dialog)); // Only update the file name if the dialog still exists. - if (openDialogFragment != null) { - // Get a handle for the open dialog. - Dialog openDialog = openDialogFragment.getDialog(); + if (saveWebpageDialogFragment != null) { + // Get a handle for the save webpage dialog. + Dialog saveWebpageDialog = saveWebpageDialogFragment.getDialog(); // Remove the incorrect lint warning below that the dialog might be null. - assert openDialog != null; + assert saveWebpageDialog != null; // Get a handle for the file name edit text. - EditText fileNameEditText = openDialog.findViewById(R.id.file_name_edittext); + EditText fileNameEditText = saveWebpageDialog.findViewById(R.id.file_name_edittext); - // Instantiate the file name helper. - FileNameHelper fileNameHelper = new FileNameHelper(); + // Get the file name URI from the intent. + Uri fileNameUri = returnedIntent.getData(); - // Get the file path if it isn't null. - if (returnedIntent.getData() != null) { - // Convert the file name URI to a file name path. - String fileNamePath = fileNameHelper.convertUriToFileNamePath(returnedIntent.getData()); + // Get the file name string from the URI. + String fileNameString = fileNameUri.toString(); - // Set the file name path as the text of the file name edit text. - fileNameEditText.setText(fileNamePath); + // Set the file name text. + fileNameEditText.setText(fileNameString); - // Move the cursor to the end of the file name edit text. - fileNameEditText.setSelection(fileNamePath.length()); - } + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNameString.length()); } } break; @@ -3030,43 +2998,13 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); // Get the file path string. - openFilePath = fileNameEditText.getText().toString(); + String openFilePath = fileNameEditText.getText().toString(); // Apply the domain settings. This resets the favorite icon and removes any domain settings. - applyDomainSettings(currentWebView, "file://" + openFilePath, true, false, false); - - // Check to see if the storage permission is needed. - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - // Open the file. - currentWebView.loadUrl("file://" + openFilePath); - } else { // The storage permission has not been granted. - // Get the external private directory file. - File externalPrivateDirectoryFile = getExternalFilesDir(null); - - // Remove the incorrect lint error below that the file might be null. - assert externalPrivateDirectoryFile != null; - - // Get the external private directory string. - String externalPrivateDirectory = externalPrivateDirectoryFile.toString(); - - // Check to see if the file path is in the external private directory. - if (openFilePath.startsWith(externalPrivateDirectory)) { // the file path is in the external private directory. - // Open the file. - currentWebView.loadUrl("file://" + openFilePath); - } else { // The file path is in a public directory. - // 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 = StoragePermissionDialog.displayDialog(StoragePermissionDialog.OPEN); - - // Show the storage permission alert dialog. The permission will be requested the the dialog is closed. - storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission)); - } else { // Show the permission request directly. - // Request the write external storage permission. The file will be opened when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, StoragePermissionDialog.OPEN); - } - } - } + applyDomainSettings(currentWebView, openFilePath, true, false, false); + + // Open the file. + currentWebView.loadUrl(openFilePath); } @Override @@ -3081,6 +3019,9 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook EditText dialogUrlEditText = dialog.findViewById(R.id.url_edittext); EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); + // Define the save webpage URL. + String saveWebpageUrl; + // Store the URL. if ((originalUrlString != null) && originalUrlString.startsWith("data:")) { // Save the original URL. @@ -3091,141 +3032,19 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } // Get the file path from the edit text. - saveWebpageFilePath = fileNameEditText.getText().toString(); - - // Check to see if the storage permission is needed. - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - //Save the webpage according to the save type. - switch (saveType) { - case StoragePermissionDialog.SAVE_URL: - // Save the URL. - new SaveUrl(this, this, saveWebpageFilePath, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(saveWebpageUrl); - break; - - case StoragePermissionDialog.SAVE_ARCHIVE: - // Save the webpage archive. - saveWebpageArchive(saveWebpageFilePath); - break; - - case StoragePermissionDialog.SAVE_IMAGE: - // Save the webpage image. - new SaveWebpageImage(this, this, saveWebpageFilePath, currentWebView).execute(); - break; - } - - // Reset the strings. - saveWebpageUrl = ""; - saveWebpageFilePath = ""; - } else { // The storage permission has not been granted. - // Get the external private directory file. - File externalPrivateDirectoryFile = getExternalFilesDir(null); - - // Remove the incorrect lint error below that the file might be null. - assert externalPrivateDirectoryFile != null; - - // Get the external private directory string. - String externalPrivateDirectory = externalPrivateDirectoryFile.toString(); - - // Check to see if the file path is in the external private directory. - if (saveWebpageFilePath.startsWith(externalPrivateDirectory)) { // The file path is in the external private directory. - // Save the webpage according to the save type. - switch (saveType) { - case StoragePermissionDialog.SAVE_URL: - // Save the URL. - new SaveUrl(this, this, saveWebpageFilePath, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(saveWebpageUrl); - break; - - case StoragePermissionDialog.SAVE_ARCHIVE: - // Save the webpage archive. - saveWebpageArchive(saveWebpageFilePath); - break; - - case StoragePermissionDialog.SAVE_IMAGE: - // Save the webpage image. - new SaveWebpageImage(this, this, saveWebpageFilePath, currentWebView).execute(); - break; - } + String saveWebpageFilePath = fileNameEditText.getText().toString(); - // Reset the strings. - saveWebpageUrl = ""; - saveWebpageFilePath = ""; - } else { // The file path is in a public directory. - // 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 = StoragePermissionDialog.displayDialog(saveType); - - // Show the storage permission alert dialog. The permission will be requested when the dialog is closed. - storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission)); - } else { // Show the permission request directly. - // Request the write external storage permission according to the save type. The URL will be saved when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, saveType); - } - } - } - } - - @Override - public void onCloseStoragePermissionDialog(int requestType) { - // Request the write external storage permission according to the request type. The file will be opened when it finishes. - ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestType); - - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - //Only process the results if they exist (this method is triggered when a dialog is presented the first time for an app, but no grant results are included). - if (grantResults.length > 0) { - switch (requestCode) { - case StoragePermissionDialog.OPEN: - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { // The storage permission was granted. - // Load the file. - currentWebView.loadUrl("file://" + openFilePath); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(currentWebView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); - } - break; - - case StoragePermissionDialog.SAVE_URL: - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { // The storage permission was granted. - // Save the raw URL. - new SaveUrl(this, this, saveWebpageFilePath, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(saveWebpageUrl); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(currentWebView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); - } - break; - - case StoragePermissionDialog.SAVE_ARCHIVE: - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { // The storage permission was granted. - // Save the webpage archive. - saveWebpageArchive(saveWebpageFilePath); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(currentWebView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); - } - break; - - case StoragePermissionDialog.SAVE_IMAGE: - // Check to see if the storage permission was granted. If the dialog was canceled the grant results will be empty. - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { // The storage permission was granted. - // Save the webpage image. - new SaveWebpageImage(this, this, saveWebpageFilePath, currentWebView).execute(); - } else { // The storage permission was not granted. - // Display an error snackbar. - Snackbar.make(currentWebView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); - } - break; - } + //Save the webpage according to the save type. + switch (saveType) { + case SaveWebpageDialog.SAVE_URL: + // Save the URL. + new SaveUrl(this, this, saveWebpageFilePath, currentWebView.getSettings().getUserAgentString(), currentWebView.getAcceptFirstPartyCookies()).execute(saveWebpageUrl); + break; - // Reset the strings. - openFilePath = ""; - saveWebpageUrl = ""; - saveWebpageFilePath = ""; + case SaveWebpageDialog.SAVE_IMAGE: + // Save the webpage image. + new SaveWebpageImage(this, saveWebpageFilePath, currentWebView).execute(); + break; } } @@ -4417,7 +4236,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook PackageManager packageManager = getPackageManager(); // Check to see if I2P is in the list. This will throw an error and drop to the catch section if it isn't installed. - packageManager.getPackageInfo("org.torproject.android", 0); + packageManager.getPackageInfo("net.i2p.android.router", 0); } catch (PackageManager.NameNotFoundException exception) { // I2P is not installed. // Sow the I2P not installed dialog if it is not already displayed. if (getSupportFragmentManager().findFragmentByTag(getString(R.string.proxy_not_installed_dialog)) == null) { @@ -4872,48 +4691,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } } - private void saveWebpageArchive(String filePath) { - // Save the webpage archive. - currentWebView.saveWebArchive(filePath); - - // Display a snackbar. - Snackbar saveWebpageArchiveSnackbar = Snackbar.make(currentWebView, getString(R.string.file_saved) + " " + filePath, Snackbar.LENGTH_SHORT); - - // Add an open option to the snackbar. - saveWebpageArchiveSnackbar.setAction(R.string.open, (View view) -> { - // Get a file for the file name string. - File file = new File(filePath); - - // Declare a file URI variable. - Uri fileUri; - - // Get the URI for the file according to the Android version. - if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. - fileUri = FileProvider.getUriForFile(this, getString(R.string.file_provider), file); - } else { // Get the raw file path URI. - fileUri = Uri.fromFile(file); - } - - // Get a handle for the content resolver. - ContentResolver contentResolver = getContentResolver(); - - // Create an open intent with `ACTION_VIEW`. - Intent openIntent = new Intent(Intent.ACTION_VIEW); - - // Set the URI and the MIME type. - openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); - - // Allow the app to read the file URI. - openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - - // Show the chooser. - startActivity(Intent.createChooser(openIntent, getString(R.string.open))); - }); - - // Show the snackbar. - saveWebpageArchiveSnackbar.show(); - } - private void clearAndExit() { // Get a handle for the shared preferences. SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); @@ -5440,7 +5217,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } // Instantiate the save dialog. - DialogFragment saveDialogFragment = SaveWebpageDialog.saveWebpage(StoragePermissionDialog.SAVE_URL, downloadUrl, formattedFileSizeString, fileNameString, userAgent, + DialogFragment saveDialogFragment = SaveWebpageDialog.saveWebpage(SaveWebpageDialog.SAVE_URL, downloadUrl, formattedFileSizeString, fileNameString, userAgent, nestedScrollWebView.getAcceptFirstPartyCookies()); // Show the save dialog. It must be named `save_dialog` so that the file picker can update the file name. diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java index 811eb7d3..96a223f0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetHostIpAddresses.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Soren Stoutner . + * Copyright © 2019,2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -102,7 +102,7 @@ public class GetHostIpAddresses extends AsyncTask { // Checked for pinned mismatches if there is pinned information and it is not ignored. if ((nestedScrollWebView.hasPinnedSslCertificate() || nestedScrollWebView.hasPinnedIpAddresses()) && !nestedScrollWebView.ignorePinnedDomainInformation()) { - CheckPinnedMismatchHelper.checkPinnedMismatch(fragmentManager, nestedScrollWebView); + CheckPinnedMismatchHelper.checkPinnedMismatch(activity, fragmentManager, nestedScrollWebView); } } } \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java index 4722dbfc..8abd75ac 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Soren Stoutner . + * Copyright © 2020-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -37,7 +37,7 @@ import java.lang.ref.WeakReference; public class GetLogcat extends AsyncTask { // Define the class variables. private final WeakReference activityWeakReference; - private int scrollViewYPositionInt; + private final int scrollViewYPositionInt; // The public constructor. public GetLogcat(Activity activity, int scrollViewYPositionInt) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetUrlSize.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetUrlSize.java index 46c3a039..f85952e2 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetUrlSize.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetUrlSize.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Soren Stoutner . + * Copyright © 2020-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -37,12 +37,12 @@ import java.text.NumberFormat; public class GetUrlSize extends AsyncTask { // Define weak references for the calling context and alert dialog. - private WeakReference contextWeakReference; - private WeakReference alertDialogWeakReference; + private final WeakReference contextWeakReference; + private final WeakReference alertDialogWeakReference; // Define the class variables. - private String userAgent; - private boolean cookiesEnabled; + private final String userAgent; + private final boolean cookiesEnabled; // The public constructor. public GetUrlSize(Context context, AlertDialog alertDialog, String userAgent, boolean cookiesEnabled) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PopulateBlocklists.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PopulateBlocklists.java index 4474285f..e9e151f5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PopulateBlocklists.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PopulateBlocklists.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Soren Stoutner . + * Copyright © 2019,2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -44,11 +44,11 @@ public class PopulateBlocklists extends AsyncTask contextWeakReference; - private WeakReference activityWeakReference; + private final WeakReference contextWeakReference; + private final WeakReference activityWeakReference; // The public constructor. public PopulateBlocklists(Context context, Activity activity) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java index 9e8b1fd8..d858f1cb 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/PrepareSaveDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Soren Stoutner . + * Copyright © 2020-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -41,14 +41,14 @@ import java.text.NumberFormat; public class PrepareSaveDialog extends AsyncTask { // Define weak references. - private WeakReference activityWeakReference; - private WeakReference contextWeakReference; - private WeakReference fragmentManagerWeakReference; + private final WeakReference activityWeakReference; + private final WeakReference contextWeakReference; + private final WeakReference fragmentManagerWeakReference; // Define the class variables. - private int saveType; - private String userAgent; - private boolean cookiesEnabled; + private final int saveType; + private final String userAgent; + private final boolean cookiesEnabled; private String urlString; // The public constructor. @@ -198,6 +198,17 @@ public class PrepareSaveDialog extends AsyncTask { return; } + // Prevent the dialog from displaying if the app window is not visible. + // The asynctask continues to function even when the app is paused. Attempting to display a dialog in that state leads to a crash. + while (!activity.getWindow().isActive()) { + try { + // The window is not active. Wait 1 second. + wait(1000); + } catch (InterruptedException e) { + // Do nothing. + } + } + // Instantiate the save dialog. DialogFragment saveDialogFragment = SaveWebpageDialog.saveWebpage(saveType, urlString, fileStringArray[0], fileStringArray[1], userAgent, cookiesEnabled); diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java index eda5726c..ed762a14 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveAboutVersionImage.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Soren Stoutner . + * Copyright © 2020-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,33 +20,24 @@ package com.stoutner.privacybrowser.asynctasks; import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Canvas; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; -import android.view.View; import android.widget.LinearLayout; -import androidx.core.content.FileProvider; - import com.google.android.material.snackbar.Snackbar; import com.stoutner.privacybrowser.R; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; +import java.io.OutputStream; import java.lang.ref.WeakReference; public class SaveAboutVersionImage extends AsyncTask { // Declare the weak references. - private WeakReference contextWeakReference; - private WeakReference activityWeakReference; - private WeakReference aboutVersionLinearLayoutWeakReference; + private final WeakReference activityWeakReference; + private final WeakReference aboutVersionLinearLayoutWeakReference; // Declare the class constants. private final String SUCCESS = "Success"; @@ -54,17 +45,16 @@ public class SaveAboutVersionImage extends AsyncTask { // Declare the class variables. private Snackbar savingImageSnackbar; private Bitmap aboutVersionBitmap; - private String filePathString; + private final String fileNameString; // The public constructor. - public SaveAboutVersionImage(Context context, Activity activity, String filePathString, LinearLayout aboutVersionLinearLayout) { + public SaveAboutVersionImage(Activity activity, String fileNameString, LinearLayout aboutVersionLinearLayout) { // Populate the weak references. - contextWeakReference = new WeakReference<>(context); activityWeakReference = new WeakReference<>(activity); aboutVersionLinearLayoutWeakReference = new WeakReference<>(aboutVersionLinearLayout); // Store the class variables. - this.filePathString = filePathString; + this.fileNameString = fileNameString; } // `onPreExecute()` operates on the UI thread. @@ -80,7 +70,7 @@ public class SaveAboutVersionImage extends AsyncTask { } // Create a saving image snackbar. - savingImageSnackbar = Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.processing_image) + " " + filePathString, Snackbar.LENGTH_INDEFINITE); + savingImageSnackbar = Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.processing_image) + " " + fileNameString, Snackbar.LENGTH_INDEFINITE); // Display the saving image snackbar. savingImageSnackbar.show(); @@ -112,33 +102,21 @@ public class SaveAboutVersionImage extends AsyncTask { // Convert the bitmap to a PNG. `0` is for lossless compression (the only option for a PNG). This compression takes a long time. Once the minimum API >= 30 this could be replaced with WEBP_LOSSLESS. aboutVersionBitmap.compress(Bitmap.CompressFormat.PNG, 0, aboutVersionByteArrayOutputStream); - // Get a file for the image. - File imageFile = new File(filePathString); - - // Delete the current file if it exists. - if (imageFile.exists()) { - //noinspection ResultOfMethodCallIgnored - imageFile.delete(); - } - // Create a file creation disposition string. String fileCreationDisposition = SUCCESS; try { - // Create an image file output stream. - FileOutputStream imageFileOutputStream = new FileOutputStream(imageFile); + // Open an output stream. + OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(fileNameString)); // Write the webpage image to the image file. - aboutVersionByteArrayOutputStream.writeTo(imageFileOutputStream); + aboutVersionByteArrayOutputStream.writeTo(outputStream); - // Create a media scanner intent, which adds items like pictures to Android's recent file list. - Intent mediaScannerIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); + // Flush the output stream. + outputStream.flush(); - // Add the URI to the media scanner intent. - mediaScannerIntent.setData(Uri.fromFile(imageFile)); - - // Make it so. - activity.sendBroadcast(mediaScannerIntent); + // Close the output stream. + outputStream.close(); } catch (Exception exception) { // Store the error in the file creation disposition string. fileCreationDisposition = exception.toString(); @@ -152,7 +130,6 @@ public class SaveAboutVersionImage extends AsyncTask { @Override protected void onPostExecute(String fileCreationDisposition) { // Get handles for the weak references. - Context context = contextWeakReference.get(); Activity activity = activityWeakReference.get(); LinearLayout aboutVersionLinearLayout = aboutVersionLinearLayoutWeakReference.get(); @@ -167,41 +144,7 @@ public class SaveAboutVersionImage extends AsyncTask { // Display a file creation disposition snackbar. if (fileCreationDisposition.equals(SUCCESS)) { // Create a file saved snackbar. - Snackbar imageSavedSnackbar = Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_SHORT); - - // Add an open action. - imageSavedSnackbar.setAction(R.string.open, (View view) -> { - // Get a file for the file path string. - File file = new File(filePathString); - - // Declare a file URI variable. - Uri fileUri; - - // Get the URI for the file according to the Android version. - if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. - fileUri = FileProvider.getUriForFile(context, activity.getString(R.string.file_provider), file); - } else { // Get the raw file path URI. - fileUri = Uri.fromFile(file); - } - - // Get a handle for the content resolver. - ContentResolver contentResolver = context.getContentResolver(); - - // Create an open intent with `ACTION_VIEW`. - Intent openIntent = new Intent(Intent.ACTION_VIEW); - - // Autodetect the MIME type. - openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); - - // Allow the app to read the file URI. - openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - - // Show the chooser. - activity.startActivity(Intent.createChooser(openIntent, context.getString(R.string.open))); - }); - - // Show the image saved snackbar. - imageSavedSnackbar.show(); + Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT).show(); } else { Snackbar.make(aboutVersionLinearLayout, activity.getString(R.string.error_saving_file) + " " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show(); } diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java index 2096e139..8956296d 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveUrl.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Soren Stoutner . + * Copyright © 2020-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,18 +20,11 @@ package com.stoutner.privacybrowser.asynctasks; import android.app.Activity; -import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.util.Base64; -import android.view.View; import android.webkit.CookieManager; -import android.webkit.MimeTypeMap; - -import androidx.core.content.FileProvider; import com.google.android.material.snackbar.Snackbar; import com.stoutner.privacybrowser.R; @@ -39,8 +32,6 @@ import com.stoutner.privacybrowser.helpers.ProxyHelper; import com.stoutner.privacybrowser.views.NoSwipeViewPager; import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; import java.lang.ref.WeakReference; @@ -111,21 +102,8 @@ public class SaveUrl extends AsyncTask { String saveDisposition = SUCCESS; try { - // Get the file. - File file = new File(filePathString); - - // Delete the file if it exists. - if (file.exists()) { - //noinspection ResultOfMethodCallIgnored - file.delete(); - } - - // Create a new file. - //noinspection ResultOfMethodCallIgnored - file.createNewFile(); - - // Create an output file stream. - OutputStream fileOutputStream = new FileOutputStream(file); + // Open an output stream. + OutputStream outputStream = activity.getContentResolver().openOutputStream(Uri.parse(filePathString)); // Save the URL. if (urlToSave[0].startsWith("data:")) { // The URL contains the entire data of an image. @@ -135,11 +113,8 @@ public class SaveUrl extends AsyncTask { // Decode the Base64 string to a byte array. byte[] base64DecodedDataByteArray = Base64.decode(base64DataString, Base64.DEFAULT); - // Write the Base64 byte array to the file output stream. - fileOutputStream.write(base64DecodedDataByteArray); - - // Close the file output stream. - fileOutputStream.close(); + // Write the Base64 byte array to the output stream. + outputStream.write(base64DecodedDataByteArray); } else { // The URL points to the data location on the internet. // Get the URL from the calling activity. URL url = new URL(urlToSave[0]); @@ -200,7 +175,7 @@ public class SaveUrl extends AsyncTask { // Attempt to read data from the input stream and store it in the output stream. Also store the amount of data read in the buffer length variable. while ((bufferLength = inputStream.read(conversionBufferByteArray)) > 0) { // Proceed while the amount of data stored in the buffer in > 0. // Write the contents of the conversion buffer to the file output stream. - fileOutputStream.write(conversionBufferByteArray, 0, bufferLength); + outputStream.write(conversionBufferByteArray, 0, bufferLength); // Update the file download progress snackbar. if (fileSize == -1) { // The file size is unknown. @@ -222,23 +197,17 @@ public class SaveUrl extends AsyncTask { // Close the input stream. inputStream.close(); - - // Close the file output stream. - fileOutputStream.close(); } finally { // Disconnect the HTTP URL connection. httpUrlConnection.disconnect(); } } - // Create a media scanner intent, which adds items like pictures to Android's recent file list. - Intent mediaScannerIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); + // Flush the output stream. + outputStream.flush(); - // Add the URI to the media scanner intent. - mediaScannerIntent.setData(Uri.fromFile(file)); - - // Make it so. - activity.sendBroadcast(mediaScannerIntent); + // Close the output stream. + outputStream.close(); } catch (Exception exception) { // Store the error in the save disposition string. saveDisposition = exception.toString(); @@ -279,7 +248,6 @@ public class SaveUrl extends AsyncTask { @Override protected void onPostExecute(String saveDisposition) { // Get handles for the context and activity. - Context context = contextWeakReference.get(); Activity activity = activityWeakReference.get(); // Abort if the activity is gone. @@ -295,48 +263,8 @@ public class SaveUrl extends AsyncTask { // Display a save disposition snackbar. if (saveDisposition.equals(SUCCESS)) { - // Create a file saved snackbar. - Snackbar fileSavedSnackbar = Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_LONG); - - // Add an open action if the file is not an APK on API >= 26 (that scenario requires the REQUEST_INSTALL_PACKAGES permission). - if (!(Build.VERSION.SDK_INT >= 26 && filePathString.endsWith(".apk"))) { - fileSavedSnackbar.setAction(R.string.open, (View view) -> { - // Get a file for the file path string. - File file = new File(filePathString); - - // Declare a file URI variable. - Uri fileUri; - - // Get the URI for the file according to the Android version. - if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. - fileUri = FileProvider.getUriForFile(context, activity.getString(R.string.file_provider), file); - } else { // Get the raw file path URI. - fileUri = Uri.fromFile(file); - } - - // Get a handle for the content resolver. - ContentResolver contentResolver = context.getContentResolver(); - - // Create an open intent with `ACTION_VIEW`. - Intent openIntent = new Intent(Intent.ACTION_VIEW); - - // Set the URI and the MIME type. - if (filePathString.endsWith("apk") || filePathString.endsWith("APK")) { // Force detection of APKs. - openIntent.setDataAndType(fileUri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk")); - } else { // Autodetect the MIME type. - openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); - } - - // Allow the app to read the file URI. - openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - - // Show the chooser. - activity.startActivity(Intent.createChooser(openIntent, context.getString(R.string.open))); - }); - } - - // Show the file saved snackbar. - fileSavedSnackbar.show(); + // Display the file saved snackbar. + Snackbar.make(noSwipeViewPager, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_LONG).show(); } else { // Display the file saving error. Snackbar.make(noSwipeViewPager, activity.getString(R.string.error_saving_file) + " " + saveDisposition, Snackbar.LENGTH_INDEFINITE).show(); diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java index 65463f35..27acbc5c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java +++ b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/SaveWebpageImage.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2020 Soren Stoutner . + * Copyright © 2019-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,17 +20,10 @@ package com.stoutner.privacybrowser.asynctasks; import android.app.Activity; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Canvas; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; -import android.view.View; - -import androidx.core.content.FileProvider; import com.google.android.material.snackbar.Snackbar; @@ -38,15 +31,13 @@ import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.views.NestedScrollWebView; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; +import java.io.OutputStream; import java.lang.ref.WeakReference; public class SaveWebpageImage extends AsyncTask { // Declare the weak references. - private WeakReference contextWeakReference; - private WeakReference activityWeakReference; - private WeakReference nestedScrollWebViewWeakReference; + private final WeakReference activityWeakReference; + private final WeakReference nestedScrollWebViewWeakReference; // Declare the class constants. private final String SUCCESS = "Success"; @@ -54,12 +45,11 @@ public class SaveWebpageImage extends AsyncTask { // Declare the class variables. private Snackbar savingImageSnackbar; private Bitmap webpageBitmap; - private String filePathString; + private final String filePathString; // The public constructor. - public SaveWebpageImage(Context context, Activity activity, String filePathString, NestedScrollWebView nestedScrollWebView) { + public SaveWebpageImage(Activity activity, String filePathString, NestedScrollWebView nestedScrollWebView) { // Populate the weak references. - contextWeakReference = new WeakReference<>(context); activityWeakReference = new WeakReference<>(activity); nestedScrollWebViewWeakReference = new WeakReference<>(nestedScrollWebView); @@ -111,33 +101,15 @@ public class SaveWebpageImage extends AsyncTask { // Convert the bitmap to a PNG. `0` is for lossless compression (the only option for a PNG). This compression takes a long time. Once the minimum API >= 30 this could be replaced with WEBP_LOSSLESS. webpageBitmap.compress(Bitmap.CompressFormat.PNG, 0, webpageByteArrayOutputStream); - // Get a file for the image. - File imageFile = new File(filePathString); - - // Delete the current file if it exists. - if (imageFile.exists()) { - //noinspection ResultOfMethodCallIgnored - imageFile.delete(); - } - // Create a file creation disposition string. String fileCreationDisposition = SUCCESS; try { // Create an image file output stream. - FileOutputStream imageFileOutputStream = new FileOutputStream(imageFile); + OutputStream imageFileOutputStream = activity.getContentResolver().openOutputStream(Uri.parse(filePathString)); // Write the webpage image to the image file. webpageByteArrayOutputStream.writeTo(imageFileOutputStream); - - // Create a media scanner intent, which adds items like pictures to Android's recent file list. - Intent mediaScannerIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); - - // Add the URI to the media scanner intent. - mediaScannerIntent.setData(Uri.fromFile(imageFile)); - - // Make it so. - activity.sendBroadcast(mediaScannerIntent); } catch (Exception exception) { // Store the error in the file creation disposition string. fileCreationDisposition = exception.toString(); @@ -151,7 +123,6 @@ public class SaveWebpageImage extends AsyncTask { @Override protected void onPostExecute(String fileCreationDisposition) { // Get handles for the weak references. - Context context = contextWeakReference.get(); Activity activity = activityWeakReference.get(); NestedScrollWebView nestedScrollWebView = nestedScrollWebViewWeakReference.get(); @@ -165,42 +136,8 @@ public class SaveWebpageImage extends AsyncTask { // Display a file creation disposition snackbar. if (fileCreationDisposition.equals(SUCCESS)) { - // Create a file saved snackbar. - Snackbar imageSavedSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_SHORT); - - // Add an open action. - imageSavedSnackbar.setAction(R.string.open, (View view) -> { - // Get a file for the file path string. - File file = new File(filePathString); - - // Declare a file URI variable. - Uri fileUri; - - // Get the URI for the file according to the Android version. - if (Build.VERSION.SDK_INT >= 24) { // Use a file provider. - fileUri = FileProvider.getUriForFile(context, activity.getString(R.string.file_provider), file); - } else { // Get the raw file path URI. - fileUri = Uri.fromFile(file); - } - - // Get a handle for the content resolver. - ContentResolver contentResolver = context.getContentResolver(); - - // Create an open intent with `ACTION_VIEW`. - Intent openIntent = new Intent(Intent.ACTION_VIEW); - - // Autodetect the MIME type. - openIntent.setDataAndType(fileUri, contentResolver.getType(fileUri)); - - // Allow the app to read the file URI. - openIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - - // Show the chooser. - activity.startActivity(Intent.createChooser(openIntent, context.getString(R.string.open))); - }); - - // Show the image saved snackbar. - imageSavedSnackbar.show(); + // Display the file saved snackbar. + Snackbar.make(nestedScrollWebView, activity.getString(R.string.file_saved) + " " + filePathString, Snackbar.LENGTH_SHORT).show(); } else { // Display the file saving error. Snackbar.make(nestedScrollWebView, activity.getString(R.string.error_saving_file) + " " + fileCreationDisposition, Snackbar.LENGTH_INDEFINITE).show(); diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt index 123c6d30..5bdf65ac 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt @@ -19,33 +19,25 @@ package com.stoutner.privacybrowser.dialogs -import android.Manifest import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.content.DialogInterface import android.content.Intent -import android.content.pm.PackageManager import android.content.res.Configuration import android.os.Bundle import android.text.Editable import android.text.TextWatcher -import android.view.View import android.view.WindowManager import android.widget.Button import android.widget.EditText -import android.widget.TextView import androidx.appcompat.app.AlertDialog -import androidx.core.content.ContextCompat import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity -import com.stoutner.privacybrowser.helpers.DownloadLocationHelper - -import java.io.File class OpenDialog : DialogFragment() { // Define the open listener. @@ -115,10 +107,11 @@ class OpenDialog : DialogFragment() { // Get handles for the layout items. val fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext)!! val browseButton = alertDialog.findViewById