X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FStoragePermissionDialog.java;h=e1d0c409eb795bcc54bed84f4239d296ab357fd8;hb=4ce562261f47e06c454504262a24f61f46bb393d;hp=1ee03b8f9db5abd4f64b4673abde160385434e6d;hpb=5d3cafb4a4fbb2bf851d36f973cc1e8b23ecebab;p=PrivacyBrowserAndroid.git

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 1ee03b8f..e1d0c409 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 <soren@stoutner.com>.
+ * Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -19,27 +19,35 @@
 
 package com.stoutner.privacybrowser.dialogs;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.stoutner.privacybrowser.R;
 
 public class StoragePermissionDialog extends DialogFragment {
+    // Define the save type constants.
+    public static final int OPEN = 0;
+    public static final int SAVE_URL = 1;
+    public static final int SAVE_ARCHIVE = 2;
+    public static final int SAVE_TEXT = 3;
+    public static final int SAVE_IMAGE = 4;
+
     // 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(int saveType);
+        void onCloseStoragePermissionDialog(int requestType);
     }
 
     @Override
@@ -51,12 +59,12 @@ public class StoragePermissionDialog extends DialogFragment {
         storagePermissionDialogListener = (StoragePermissionDialogListener) context;
     }
 
-    public static StoragePermissionDialog displayDialog(int saveType) {
+    public static StoragePermissionDialog displayDialog(int requestType) {
         // Create an arguments bundle.
         Bundle argumentsBundle = new Bundle();
 
         // Store the save type in the bundle.
-        argumentsBundle.putInt("save_type", saveType);
+        argumentsBundle.putInt("request_type", requestType);
 
         // Create a new instance of the storage permission dialog.
         StoragePermissionDialog storagePermissionDialog = new StoragePermissionDialog();
@@ -78,25 +86,19 @@ public class StoragePermissionDialog extends DialogFragment {
         assert arguments != null;
 
         // Get the save type.
-        int saveType = arguments.getInt("save_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);
+        int requestType = arguments.getInt("request_type");
 
         // Use a builder to create the alert dialog.
-        AlertDialog.Builder dialogBuilder;
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog);
 
-        // Set the style and the icon according to the theme.
-        if (darkTheme) {
-            dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark);
-            dialogBuilder.setIcon(R.drawable.import_export_dark);
+        // 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) {
+            dialogBuilder.setIcon(R.drawable.import_export_night);
         } else {
-            dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight);
-            dialogBuilder.setIcon(R.drawable.import_export_light);
+            dialogBuilder.setIcon(R.drawable.import_export_day);
         }
 
         // Set the title.
@@ -108,12 +110,18 @@ public class StoragePermissionDialog extends DialogFragment {
         // 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(saveType);
+            storagePermissionDialogListener.onCloseStoragePermissionDialog(requestType);
         });
 
         // Create an alert dialog from the builder.
         final AlertDialog alertDialog = dialogBuilder.create();
 
+        // Get a handle for the shared preferences.
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+        // Get the screenshot preference.
+        boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {
             // Remove the warning below that `getWindow()` might be null.