X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveWebpageDialog.java;h=40fdbda6be5ecf81dd13777b33292bd69ebda03f;hb=f3b9172adedd74f705ddc0beac80798ae84f2920;hp=c9e691f63200740d87a52726adf5a77d5557e349;hpb=adbf486b6abcc9387ff89f87c97503a8c58aedb2;p=PrivacyBrowserAndroid.git 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 c9e691f6..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,22 +19,18 @@ package com.stoutner.privacybrowser.dialogs; -import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageManager; -import android.net.Uri; -import android.os.Build; +import android.content.res.Configuration; +import android.os.AsyncTask; import android.os.Bundle; -import android.os.Environment; -import android.provider.DocumentsContract; import android.text.Editable; +import android.text.InputType; import android.text.TextWatcher; import android.view.View; import android.view.WindowManager; @@ -43,24 +39,31 @@ import android.widget.EditText; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.preference.PreferenceManager; +import com.google.android.material.textfield.TextInputLayout; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; - -import java.io.File; +import com.stoutner.privacybrowser.asynctasks.GetUrlSize; 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; // The public interface is used to send information back to the parent activity. public interface SaveWebpageListener { - void onSaveWebpage(int saveType, DialogFragment dialogFragment); + void onSaveWebpage(int saveType, String originalUrlString, DialogFragment 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 public void onAttach(@NonNull Context context) { // Run the default commands. @@ -70,13 +73,17 @@ public class SaveWebpageDialog extends DialogFragment { saveWebpageListener = (SaveWebpageListener) context; } - public static SaveWebpageDialog saveUrl(int saveType, String url) { + public static SaveWebpageDialog saveWebpage(int saveType, String urlString, String fileSizeString, String contentDispositionFileNameString, String userAgentString, boolean cookiesEnabled) { // Create an arguments bundle. Bundle argumentsBundle = new Bundle(); // Store the arguments in the bundle. argumentsBundle.putInt("save_type", saveType); - argumentsBundle.putString("url", url); + argumentsBundle.putString("url_string", urlString); + argumentsBundle.putString("file_size_string", fileSizeString); + argumentsBundle.putString("content_disposition_file_name_string", contentDispositionFileNameString); + argumentsBundle.putString("user_agent_string", userAgentString); + argumentsBundle.putBoolean("cookies_enabled", cookiesEnabled); // Create a new instance of the save webpage dialog. SaveWebpageDialog saveWebpageDialog = new SaveWebpageDialog(); @@ -101,77 +108,47 @@ public class SaveWebpageDialog extends DialogFragment { // Get the arguments from the bundle. int saveType = arguments.getInt("save_type"); - String url = arguments.getString("url"); - - // Get a handle for the activity and the context. - Activity activity = getActivity(); - Context context = getContext(); - - // Remove the incorrect lint warnings below that the activity and context might be null. - assert activity != null; - assert context != null; - - // Get a handle for the shared preferences. - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); + 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 the screenshot and theme preferences. - boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); - boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // 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; - - // Set the style and icon according to the theme. - if (darkTheme) { - // Set the style. - dialogBuilder = new AlertDialog.Builder(activity, R.style.PrivacyBrowserAlertDialogDark); - - // Set the icon according to the save type. - switch (saveType) { - case StoragePermissionDialog.SAVE: - dialogBuilder.setIcon(R.drawable.copy_enabled_dark); - break; - - case StoragePermissionDialog.SAVE_AS_ARCHIVE: - dialogBuilder.setIcon(R.drawable.dom_storage_cleared_dark); - break; - - case StoragePermissionDialog.SAVE_AS_IMAGE: - dialogBuilder.setIcon(R.drawable.images_enabled_dark); - break; - } - } else { - // Set the style. - dialogBuilder = new AlertDialog.Builder(activity, R.style.PrivacyBrowserAlertDialogLight); - - // Set the icon according to the save type. - switch (saveType) { - case StoragePermissionDialog.SAVE: - dialogBuilder.setIcon(R.drawable.copy_enabled_light); - break; - - case StoragePermissionDialog.SAVE_AS_ARCHIVE: - dialogBuilder.setIcon(R.drawable.dom_storage_cleared_light); - break; - - case StoragePermissionDialog.SAVE_AS_IMAGE: - dialogBuilder.setIcon(R.drawable.images_enabled_light); - break; - } - } + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialog); + + // Get the current theme status. + int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - // Set the title according to the type. + // Set the title and icon according to the save type. switch (saveType) { - case StoragePermissionDialog.SAVE: - dialogBuilder.setTitle(R.string.save); - break; + case SAVE_URL: + // Set the title. + dialogBuilder.setTitle(R.string.save_url); - case StoragePermissionDialog.SAVE_AS_ARCHIVE: - dialogBuilder.setTitle(R.string.save_archive); + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + dialogBuilder.setIcon(R.drawable.copy_enabled_day); + } else { + dialogBuilder.setIcon(R.drawable.copy_enabled_night); + } break; - case StoragePermissionDialog.SAVE_AS_IMAGE: + case SAVE_IMAGE: + // Set the title. dialogBuilder.setTitle(R.string.save_image); + + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { + dialogBuilder.setIcon(R.drawable.images_enabled_day); + } else { + + dialogBuilder.setIcon(R.drawable.images_enabled_night); + } break; } @@ -184,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, this); + saveWebpageListener.onSaveWebpage(saveType, originalUrlString, this); }); // Create an alert dialog from the builder. @@ -193,6 +170,12 @@ public class SaveWebpageDialog extends DialogFragment { // Remove the incorrect lint warning below that the window might be null. assert alertDialog.getWindow() != null; + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); + + // Get the screenshot preference. + boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false); + // Disable screenshots if not allowed. if (!allowScreenshots) { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); @@ -202,31 +185,83 @@ public class SaveWebpageDialog extends DialogFragment { alertDialog.show(); // Get handles for the layout items. + TextInputLayout urlTextInputLayout = alertDialog.findViewById(R.id.url_textinputlayout); EditText urlEditText = alertDialog.findViewById(R.id.url_edittext); EditText fileNameEditText = alertDialog.findViewById(R.id.file_name_edittext); Button browseButton = alertDialog.findViewById(R.id.browse_button); - TextView fileExistsWarningTextView = alertDialog.findViewById(R.id.file_exists_warning_textview); - TextView storagePermissionTextView = alertDialog.findViewById(R.id.storage_permission_textview); + TextView fileSizeTextView = alertDialog.findViewById(R.id.file_size_textview); Button saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - // Update the status of the save button whe the URL changes. - urlEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { - // Do nothing. + // Remove the incorrect warnings that the views might be null. + assert urlTextInputLayout != null; + assert urlEditText != null; + assert fileNameEditText != null; + assert browseButton != null; + assert fileSizeTextView != null; + + // Set the file size text view. + fileSizeTextView.setText(fileSizeString); + + // Modify the layout based on the save type. + if (saveType == SAVE_URL) { // A URL is being saved. + // Remove the incorrect lint error below that the URL string might be 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 (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 = originalUrlString.substring(0, 100) + "…"; + + // Populate the URL edit text with the truncated URL. + urlEditText.setText(urlSubstring); + + // Disable the editing of the URL edit text. + 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(originalUrlString); } - @Override - public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - // Do nothing. - } + // Update the file size and the status of the save button when the URL changes. + urlEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + // Do nothing. + } - @Override - public void afterTextChanged(Editable editable) { - // Enable the save button if the URL and file name are populated. - saveButton.setEnabled(!urlEditText.getText().toString().isEmpty() && !fileNameEditText.getText().toString().isEmpty()); - } - }); + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + // Do nothing. + } + + @Override + public void afterTextChanged(Editable editable) { + // Cancel the get URL size AsyncTask if it is running. + if ((getUrlSize != null)) { + getUrlSize.cancel(true); + } + + // Get the current URL to save. + String urlToSave = urlEditText.getText().toString(); + + // Wipe the file size text view. + fileSizeTextView.setText(""); + + // Get the file size for the current URL. + getUrlSize = new GetUrlSize(context, alertDialog, userAgentString, cookiesEnabled).execute(urlToSave); + + // Enable the save button if the URL and file name are populated. + saveButton.setEnabled(!urlToSave.isEmpty() && !fileNameEditText.getText().toString().isEmpty()); + } + }); + } else { // An archive or an image is being saved. + // Hide the URL edit text and the file size text view. + urlTextInputLayout.setVisibility(View.GONE); + 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() { @@ -245,20 +280,14 @@ 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 == 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. + // Enable the save button if the file name is populated. + saveButton.setEnabled(!fileNameString.isEmpty()); } - - // Enable the save button if the file name is populated. - saveButton.setEnabled(!fileNameString.isEmpty() && !urlEditText.getText().toString().isEmpty()); } }); @@ -267,27 +296,13 @@ public class SaveWebpageDialog extends DialogFragment { // Set the file name according to the type. switch (saveType) { - case StoragePermissionDialog.SAVE: - // Convert the URL to a URI. - Uri uri = Uri.parse(url); - - // Get the last path segment. - String lastPathSegment = uri.getLastPathSegment(); - - // Use a default file name if the last path segment is null. - if (lastPathSegment == null) { - lastPathSegment = getString(R.string.file); - } - - // Use the last path segment as the file name. - fileName = lastPathSegment; + case SAVE_URL: + // Use the file name from the content disposition. + fileName = contentDispositionFileNameString; break; - case StoragePermissionDialog.SAVE_AS_ARCHIVE: - fileName = getString(R.string.webpage_mht); - break; - - case StoragePermissionDialog.SAVE_AS_IMAGE: + case SAVE_IMAGE: + // Use a file name ending in `.png`. fileName = getString(R.string.webpage_png); break; } @@ -295,28 +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; - // Create a string for the default file path. - String defaultFilePath; - - // Set the default file path according to the storage permission state. - if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted. - // Set the default file path to use the external public directory. - defaultFilePath = Environment.getExternalStorageDirectory() + "/" + defaultFileName; - - // Hide the storage permission text view. - storagePermissionTextView.setVisibility(View.GONE); - } else { // The storage permission has not been granted. - // Set the default file path to use the external private directory. - defaultFilePath = context.getExternalFilesDir(null) + "/" + defaultFileName; - } - - // Populate the edit texts. - urlEditText.setText(url); - 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. @@ -328,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);