X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FStoragePermissionDialog.java;h=5b171548f2fdefa8b5d8abf33ae37bd8f98e76fe;hp=fbff4d295c1f569522c9de3d14aadd493747f07e;hb=adbf486b6abcc9387ff89f87c97503a8c58aedb2;hpb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/StoragePermissionDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/StoragePermissionDialog.java index fbff4d29..5b171548 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/StoragePermissionDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/StoragePermissionDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019 Soren Stoutner . + * Copyright © 2018-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -23,26 +23,33 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.view.WindowManager; import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; public class StoragePermissionDialog extends DialogFragment { + // Define the save type constants. + public static final int OPEN = 0; + public static final int SAVE = 1; + public static final int SAVE_AS_ARCHIVE = 2; + public static final int SAVE_AS_IMAGE = 3; + // The listener is used in `onAttach()` and `onCreateDialog()`. private StoragePermissionDialogListener storagePermissionDialogListener; // The public interface is used to send information back to the parent activity. public interface StoragePermissionDialogListener { - void onCloseStoragePermissionDialog(); + void onCloseStoragePermissionDialog(int requestType); } @Override - public void onAttach(Context context) { + public void onAttach(@NonNull Context context) { // Run the default commands. super.onAttach(context); @@ -50,14 +57,47 @@ public class StoragePermissionDialog extends DialogFragment { storagePermissionDialogListener = (StoragePermissionDialogListener) context; } + public static StoragePermissionDialog displayDialog(int requestType) { + // Create an arguments bundle. + Bundle argumentsBundle = new Bundle(); + + // Store the save type in the bundle. + argumentsBundle.putInt("request_type", requestType); + + // Create a new instance of the storage permission dialog. + StoragePermissionDialog storagePermissionDialog = new StoragePermissionDialog(); + + // Add the arguments bundle to the new dialog. + storagePermissionDialog.setArguments(argumentsBundle); + + // Return the new dialog. + return storagePermissionDialog; + } + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { + // Get a handle for the arguments. + Bundle arguments = getArguments(); + + // Remove the incorrect lint warning that the arguments might be null. + assert arguments != null; + + // Get the save type. + int requestType = arguments.getInt("request_type"); + + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + + // Get the screenshot and theme preferences. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Use a builder to create the alert dialog. AlertDialog.Builder dialogBuilder; // Set the style and the icon according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); dialogBuilder.setIcon(R.drawable.import_export_dark); } else { @@ -71,17 +111,17 @@ public class StoragePermissionDialog extends DialogFragment { // Set the text. dialogBuilder.setMessage(R.string.storage_permission_message); - // Set an `onClick` listener on the negative button. + // Set an listener on the OK button. dialogBuilder.setNegativeButton(R.string.ok, (DialogInterface dialog, int which) -> { // Inform the parent activity that the dialog was closed. - storagePermissionDialogListener.onCloseStoragePermissionDialog(); + storagePermissionDialogListener.onCloseStoragePermissionDialog(requestType); }); // Create an alert dialog from the builder. final AlertDialog alertDialog = dialogBuilder.create(); // Disable screenshots if not allowed. - if (!MainWebViewActivity.allowScreenshots) { + if (!allowScreenshots) { // Remove the warning below that `getWindow()` might be null. assert alertDialog.getWindow() != null; @@ -89,7 +129,7 @@ public class StoragePermissionDialog extends DialogFragment { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // `onCreateDialog()` requires the return of an `AlertDialog`. + // Return the alert dialog. return alertDialog; } -} +} \ No newline at end of file