X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveWebpageDialog.java;h=40fdbda6be5ecf81dd13777b33292bd69ebda03f;hp=57d9baa219777afa489a6991dc5df0a29bf26930;hb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e;hpb=f825cc15f0383acce10bb16443e027edb869a11e diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java index 57d9baa2..40fdbda6 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2020 Soren Stoutner . + * Copyright © 2019-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,7 +19,6 @@ package com.stoutner.privacybrowser.dialogs; -import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; @@ -27,13 +26,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.content.res.Configuration; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; -import android.os.Environment; -import android.provider.DocumentsContract; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; @@ -45,7 +40,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; import androidx.preference.PreferenceManager; @@ -53,11 +47,11 @@ import com.google.android.material.textfield.TextInputLayout; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.asynctasks.GetUrlSize; -import com.stoutner.privacybrowser.helpers.DownloadLocationHelper; - -import java.io.File; public class SaveWebpageDialog extends DialogFragment { + public static final int SAVE_URL = 0; + public static final int SAVE_IMAGE = 1; + // Define the save webpage listener. private SaveWebpageListener saveWebpageListener; @@ -67,6 +61,7 @@ public class SaveWebpageDialog extends DialogFragment { } // Define the get URL size AsyncTask. This allows previous instances of the task to be cancelled if a new one is run. + @SuppressWarnings("rawtypes") private AsyncTask getUrlSize; @Override @@ -113,15 +108,15 @@ public class SaveWebpageDialog extends DialogFragment { // Get the arguments from the bundle. int saveType = arguments.getInt("save_type"); - String urlString = arguments.getString("url_string"); + String originalUrlString = arguments.getString("url_string"); String fileSizeString = arguments.getString("file_size_string"); String contentDispositionFileNameString = arguments.getString("content_disposition_file_name_string"); String userAgentString = arguments.getString("user_agent_string"); boolean cookiesEnabled = arguments.getBoolean("cookies_enabled"); - // Get a handle for the activity and the context. - Activity activity = requireActivity(); + // Get handles for the context and the activity. Context context = requireContext(); + Activity activity = requireActivity(); // Use an alert dialog builder to create the alert dialog. AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialog); @@ -129,56 +124,36 @@ public class SaveWebpageDialog extends DialogFragment { // Get the current theme status. int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { // The night theme is enabled. - // Set the icon according to the save type. - switch (saveType) { - case StoragePermissionDialog.SAVE_URL: - dialogBuilder.setIcon(R.drawable.copy_enabled_night); - break; - - case StoragePermissionDialog.SAVE_ARCHIVE: - dialogBuilder.setIcon(R.drawable.dom_storage_cleared_night); - break; + // Set the title and icon according to the save type. + switch (saveType) { + case SAVE_URL: + // Set the title. + dialogBuilder.setTitle(R.string.save_url); - case StoragePermissionDialog.SAVE_IMAGE: - dialogBuilder.setIcon(R.drawable.images_enabled_night); - break; - } - } else { // The day theme is enabled. - // Set the icon according to the save type. - switch (saveType) { - case StoragePermissionDialog.SAVE_URL: + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { dialogBuilder.setIcon(R.drawable.copy_enabled_day); - break; + } else { + dialogBuilder.setIcon(R.drawable.copy_enabled_night); + } + break; - case StoragePermissionDialog.SAVE_ARCHIVE: - dialogBuilder.setIcon(R.drawable.dom_storage_cleared_day); - break; + case SAVE_IMAGE: + // Set the title. + dialogBuilder.setTitle(R.string.save_image); - case StoragePermissionDialog.SAVE_IMAGE: + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { dialogBuilder.setIcon(R.drawable.images_enabled_day); - break; - } - } - - // Set the title according to the type. - switch (saveType) { - case StoragePermissionDialog.SAVE_URL: - dialogBuilder.setTitle(R.string.save); - break; - - case StoragePermissionDialog.SAVE_ARCHIVE: - dialogBuilder.setTitle(R.string.save_archive); - break; + } else { - case StoragePermissionDialog.SAVE_IMAGE: - dialogBuilder.setTitle(R.string.save_image); + dialogBuilder.setIcon(R.drawable.images_enabled_night); + } break; } // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(activity.getLayoutInflater().inflate(R.layout.save_url_dialog, null)); + dialogBuilder.setView(activity.getLayoutInflater().inflate(R.layout.save_webpage_dialog, null)); // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null); @@ -186,7 +161,7 @@ public class SaveWebpageDialog extends DialogFragment { // Set the save button listener. dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> { // Return the dialog fragment to the parent activity. - saveWebpageListener.onSaveWebpage(saveType, urlString, this); + saveWebpageListener.onSaveWebpage(saveType, originalUrlString, this); }); // Create an alert dialog from the builder. @@ -199,7 +174,7 @@ public class SaveWebpageDialog extends DialogFragment { SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); // Get the screenshot preference. - boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false); // Disable screenshots if not allowed. if (!allowScreenshots) { @@ -215,8 +190,6 @@ public class SaveWebpageDialog extends DialogFragment { EditText fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext); Button browseButton = alertDialog.findViewById(R.id.browse_button); TextView fileSizeTextView = alertDialog.findViewById(R.id.file_size_textview); - TextView fileExistsWarningTextView = alertDialog.findViewById(R.id.file_exists_warning_textview); - TextView storagePermissionTextView = alertDialog.findViewById(R.id.storage_permission_textview); Button saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); // Remove the incorrect warnings that the views might be null. @@ -225,21 +198,19 @@ public class SaveWebpageDialog extends DialogFragment { assert fileNameEditText != null; assert browseButton != null; assert fileSizeTextView != null; - assert fileExistsWarningTextView != null; - assert storagePermissionTextView != null; // Set the file size text view. fileSizeTextView.setText(fileSizeString); // Modify the layout based on the save type. - if (saveType == StoragePermissionDialog.SAVE_URL) { // A URL is being saved. + if (saveType == SAVE_URL) { // A URL is being saved. // Remove the incorrect lint error below that the URL string might be null. - assert urlString != null; + assert originalUrlString != null; // Populate the URL edit text according to the type. This must be done before the text change listener is created below so that the file size isn't requested again. - if (urlString.startsWith("data:")) { // The URL contains the entire data of an image. + if (originalUrlString.startsWith("data:")) { // The URL contains the entire data of an image. // Get a substring of the data URL with the first 100 characters. Otherwise, the user interface will freeze while trying to layout the edit text. - String urlSubstring = urlString.substring(0, 100) + "…"; + String urlSubstring = originalUrlString.substring(0, 100) + "…"; // Populate the URL edit text with the truncated URL. urlEditText.setText(urlSubstring); @@ -248,7 +219,7 @@ public class SaveWebpageDialog extends DialogFragment { urlEditText.setInputType(InputType.TYPE_NULL); } else { // The URL contains a reference to the location of the data. // Populate the URL edit text with the full URL. - urlEditText.setText(urlString); + urlEditText.setText(originalUrlString); } // Update the file size and the status of the save button when the URL changes. @@ -289,6 +260,9 @@ public class SaveWebpageDialog extends DialogFragment { fileSizeTextView.setVisibility(View.GONE); } + // Initially disable the save button. + saveButton.setEnabled(false); + // Update the status of the save button when the file name changes. fileNameEditText.addTextChangedListener(new TextWatcher() { @Override @@ -306,20 +280,8 @@ public class SaveWebpageDialog extends DialogFragment { // Get the current file name. String fileNameString = fileNameEditText.getText().toString(); - // Convert the file name string to a file. - File file = new File(fileNameString); - - // Check to see if the file exists. - if (file.exists()) { - // Show the file exists warning. - fileExistsWarningTextView.setVisibility(View.VISIBLE); - } else { - // Hide the file exists warning. - fileExistsWarningTextView.setVisibility(View.GONE); - } - // Enable the save button based on the save type. - if (saveType == StoragePermissionDialog.SAVE_URL) { // A URL is being saved. + if (saveType == SAVE_URL) { // A URL is being saved. // Enable the save button if the file name and the URL is populated. saveButton.setEnabled(!fileNameString.isEmpty() && !urlEditText.getText().toString().isEmpty()); } else { // An archive or an image is being saved. @@ -334,17 +296,12 @@ public class SaveWebpageDialog extends DialogFragment { // Set the file name according to the type. switch (saveType) { - case StoragePermissionDialog.SAVE_URL: + case SAVE_URL: // Use the file name from the content disposition. fileName = contentDispositionFileNameString; break; - case StoragePermissionDialog.SAVE_ARCHIVE: - // Use an archive name ending in `.mht`. - fileName = getString(R.string.webpage_mht); - break; - - case StoragePermissionDialog.SAVE_IMAGE: + case SAVE_IMAGE: // Use a file name ending in `.png`. fileName = getString(R.string.webpage_png); break; @@ -353,18 +310,6 @@ public class SaveWebpageDialog extends DialogFragment { // Save the file name as the default file name. This must be final to be used in the lambda below. final String defaultFileName = fileName; - // Instantiate the download location helper. - DownloadLocationHelper downloadLocationHelper = new DownloadLocationHelper(); - - // Get the default file path. - String defaultFilePath = downloadLocationHelper.getDownloadLocation(context) + "/" + defaultFileName; - - // Populate the file name edit text. - fileNameEditText.setText(defaultFilePath); - - // Move the cursor to the end of the default file path. - fileNameEditText.setSelection(defaultFilePath.length()); - // Handle clicks on the browse button. browseButton.setOnClickListener((View view) -> { // Create the file picker intent. @@ -376,11 +321,6 @@ public class SaveWebpageDialog extends DialogFragment { // Set the initial file name according to the type. browseIntent.putExtra(Intent.EXTRA_TITLE, defaultFileName); - // Set the initial directory if the minimum API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - browseIntent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, Environment.getExternalStorageDirectory()); - } - // Request a file that can be opened. browseIntent.addCategory(Intent.CATEGORY_OPENABLE); @@ -388,11 +328,6 @@ public class SaveWebpageDialog extends DialogFragment { activity.startActivityForResult(browseIntent, MainWebViewActivity.BROWSE_SAVE_WEBPAGE_REQUEST_CODE); }); - // Hide the storage permission text view if the permission has already been granted. - if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { - storagePermissionTextView.setVisibility(View.GONE); - } - // Return the alert dialog. return alertDialog; }