X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveDialog.java;h=19ff43ce8f372fe0a0f1a1ca56f5de40bca05845;hp=d271b876ea374dda7aff28f63989da202ebaf54c;hb=f52255e6eeb1a6be9f190e733563cc37b5d1f2b5;hpb=8f7e9b7db429568e26f00bc2eef88402d722bec7 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.java index d271b876..19ff43ce 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.java @@ -29,7 +29,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -51,6 +50,7 @@ import androidx.preference.PreferenceManager; 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; @@ -75,14 +75,16 @@ public class SaveDialog extends DialogFragment { saveWebpageListener = (SaveWebpageListener) context; } - public static SaveDialog saveUrl(int saveType, String url, String userAgent, boolean cookiesEnabled) { + public static SaveDialog saveUrl(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("user_agent", userAgent); + 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. @@ -108,8 +110,10 @@ public class SaveDialog extends DialogFragment { // Get the arguments from the bundle. int saveType = arguments.getInt("save_type"); - String url = arguments.getString("url"); - String userAgent = arguments.getString("user_agent"); + String urlString = 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. @@ -219,38 +223,87 @@ public class SaveDialog extends DialogFragment { TextView storagePermissionTextView = alertDialog.findViewById(R.id.storage_permission_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. - } + // Set the file size text view. + fileSizeTextView.setText(fileSizeString); - @Override - public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - // Do nothing. - } + // Create a file name string. + String fileName = ""; - @Override - public void afterTextChanged(Editable editable) { - // Cancel the get URL size AsyncTask if it is running. - if ((getUrlSize != null)) { - getUrlSize.cancel(true); + // Set the file name according to the type. + switch (saveType) { + case StoragePermissionDialog.SAVE_URL: + // Use the file name from the content disposition. + fileName = contentDispositionFileNameString; + break; + + case StoragePermissionDialog.SAVE_AS_ARCHIVE: + // Use an archive name ending in `.mht`. + fileName = getString(R.string.webpage_mht); + break; + + case StoragePermissionDialog.SAVE_AS_IMAGE: + // Use a file name ending in `.png`. + fileName = getString(R.string.webpage_png); + break; + } + + // 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. This must be done before the text change listener is created below so that the file size isn't requested again. + fileNameEditText.setText(defaultFilePath); + + // Move the cursor to the end of the default file path. + fileNameEditText.setSelection(defaultFilePath.length()); + + // Modify the layout based on the save type. + if (saveType == StoragePermissionDialog.SAVE_URL) { // A URL is being saved. + // Populate the URL edit text. + urlEditText.setText(urlString); + + // 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 onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + // Do nothing. } - // Get the current URL to save. - String urlToSave = urlEditText.getText().toString(); + @Override + public void afterTextChanged(Editable editable) { + // Cancel the get URL size AsyncTask if it is running. + if ((getUrlSize != null)) { + getUrlSize.cancel(true); + } - // Wipe the file size text view. - fileSizeTextView.setText(""); + // Get the current URL to save. + String urlToSave = urlEditText.getText().toString(); - // Get the file size for the current URL. - getUrlSize = new GetUrlSize(context, alertDialog, userAgent, cookiesEnabled).execute(urlToSave); + // Wipe the file size text view. + fileSizeTextView.setText(""); - // Enable the save button if the URL and file name are populated. - saveButton.setEnabled(!urlToSave.isEmpty() && !fileNameEditText.getText().toString().isEmpty()); - } - }); + // 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. + urlEditText.setVisibility(View.GONE); + fileSizeTextView.setVisibility(View.GONE); + } // Update the status of the save button when the file name changes. fileNameEditText.addTextChangedListener(new TextWatcher() { @@ -281,66 +334,17 @@ public class SaveDialog extends DialogFragment { fileExistsWarningTextView.setVisibility(View.GONE); } - // Enable the save button if the file name is populated. - saveButton.setEnabled(!fileNameString.isEmpty() && !urlEditText.getText().toString().isEmpty()); + // Enable the save button based on the save type. + if (saveType == StoragePermissionDialog.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()); + } } }); - // Create a file name string. - String fileName = ""; - - // Set the file name according to the type. - switch (saveType) { - case StoragePermissionDialog.SAVE_URL: - // 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; - break; - - case StoragePermissionDialog.SAVE_AS_ARCHIVE: - fileName = getString(R.string.webpage_mht); - break; - - case StoragePermissionDialog.SAVE_AS_IMAGE: - fileName = getString(R.string.webpage_png); - break; - } - - // 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. @@ -364,6 +368,11 @@ public class SaveDialog 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; }