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=0730717cabbec14a2933ec5e1fac55cf3570215b;hp=9b599b531ede15447a445ffcd0f61804efc3d6bd;hb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2;hpb=7de44ca8dbf4330ee6fa3d9146940c1016edd608 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 9b599b53..0730717c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.java @@ -22,14 +22,13 @@ 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.content.res.Configuration; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -44,6 +43,7 @@ import android.widget.EditText; 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; @@ -76,14 +76,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. @@ -109,63 +111,51 @@ 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. - 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); - - // Get the screenshot and theme preferences. - boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); - boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + Activity activity = requireActivity(); + Context context = requireContext(); // Use an alert dialog builder to create the alert dialog. - AlertDialog.Builder dialogBuilder; + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialog); - // Set the style and icon according to the theme. - if (darkTheme) { - // Set the style. - dialogBuilder = new AlertDialog.Builder(activity, R.style.PrivacyBrowserAlertDialogDark); + // 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_dark); + dialogBuilder.setIcon(R.drawable.copy_enabled_night); break; case StoragePermissionDialog.SAVE_AS_ARCHIVE: - dialogBuilder.setIcon(R.drawable.dom_storage_cleared_dark); + dialogBuilder.setIcon(R.drawable.dom_storage_cleared_night); break; case StoragePermissionDialog.SAVE_AS_IMAGE: - dialogBuilder.setIcon(R.drawable.images_enabled_dark); + dialogBuilder.setIcon(R.drawable.images_enabled_night); break; } - } else { - // Set the style. - dialogBuilder = new AlertDialog.Builder(activity, R.style.PrivacyBrowserAlertDialogLight); - + } else { // The day theme is enabled. // Set the icon according to the save type. switch (saveType) { case StoragePermissionDialog.SAVE_URL: - dialogBuilder.setIcon(R.drawable.copy_enabled_light); + dialogBuilder.setIcon(R.drawable.copy_enabled_day); break; case StoragePermissionDialog.SAVE_AS_ARCHIVE: - dialogBuilder.setIcon(R.drawable.dom_storage_cleared_light); + dialogBuilder.setIcon(R.drawable.dom_storage_cleared_day); break; case StoragePermissionDialog.SAVE_AS_IMAGE: - dialogBuilder.setIcon(R.drawable.images_enabled_light); + dialogBuilder.setIcon(R.drawable.images_enabled_day); break; } } @@ -203,6 +193,12 @@ public class SaveDialog 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("allow_screenshots", false); + // Disable screenshots if not allowed. if (!allowScreenshots) { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); @@ -220,9 +216,23 @@ public class SaveDialog extends DialogFragment { 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. + assert urlEditText != null; + 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. - // Update the status of the save button whe the URL changes. + // Populate the URL edit text. This must be done before the text change listener is created below so that the file size isn't requested again. + 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) { @@ -248,15 +258,12 @@ public class SaveDialog extends DialogFragment { fileSizeTextView.setText(""); // Get the file size for the current URL. - getUrlSize = new GetUrlSize(context, alertDialog, userAgent, cookiesEnabled).execute(urlToSave); + 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()); } }); - - // Populate the URL edit text. - urlEditText.setText(url); } else { // An archive or an image is being saved. // Hide the URL edit text and the file size text view. urlEditText.setVisibility(View.GONE); @@ -309,26 +316,17 @@ public class SaveDialog extends DialogFragment { // 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; + // 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; } @@ -342,11 +340,6 @@ public class SaveDialog extends DialogFragment { // Get the default file path. String defaultFilePath = downloadLocationHelper.getDownloadLocation(context) + "/" + defaultFileName; - // 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); - } - // Populate the file name edit text. fileNameEditText.setText(defaultFilePath); @@ -376,6 +369,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; }