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;
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;
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.
// 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;
}
}
// 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);
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) {
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);
// 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;
}
// 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);
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;
}
projects / PrivacyBrowserAndroid.git / blobdiff