X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveDialog.java;h=0730717cabbec14a2933ec5e1fac55cf3570215b;hb=27e33047e14466c84212bca02a14a7fc4ff15af8;hp=19ff43ce8f372fe0a0f1a1ca56f5de40bca05845;hpb=f52255e6eeb1a6be9f190e733563cc37b5d1f2b5;p=PrivacyBrowserAndroid.git 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 19ff43ce..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,13 +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.content.res.Configuration; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -43,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; @@ -117,58 +118,44 @@ public class SaveDialog extends DialogFragment { 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; } } @@ -206,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); @@ -223,48 +216,20 @@ 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); - // Create a file name string. - String fileName = ""; - - // 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. + // 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. @@ -345,6 +310,42 @@ public class SaveDialog extends DialogFragment { } }); + // Create a file name string. + String fileName = ""; + + // 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. + 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.