X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.java;h=2b012683da722179600aa7833002c1c404d5eb3a;hp=9c8411b1e5edb94dc010c85c06d3b2b49ef4a528;hb=f52255e6eeb1a6be9f190e733563cc37b5d1f2b5;hpb=ff636c77836983a078f33e60616204518dab61d1

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
index 9c8411b1..2b012683 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
@@ -24,14 +24,17 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
@@ -41,7 +44,6 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;  // The AndroidX dialog fragment must be used or an error is produced on API <=22.
 
 import com.stoutner.privacybrowser.R;
-import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper;
 
 import java.io.ByteArrayOutputStream;
@@ -55,7 +57,7 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
     // `createBookmarkFolderListener` is used in `onAttach()` and `onCreateDialog`.
     private CreateBookmarkFolderListener createBookmarkFolderListener;
 
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         // Get a handle for `createBookmarkFolderListener` from the launching context.
@@ -111,8 +113,15 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
         // Use an alert dialog builder to create the alert dialog.
         AlertDialog.Builder dialogBuilder;
 
+        // Get a handle for the shared preferences.
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+        // Get the screenshot and theme preferences.
+        boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+        boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+
         // Set the style according to the theme.
-        if (MainWebViewActivity.darkTheme) {
+        if (darkTheme) {
             dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark);
         } else {
             dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight);
@@ -142,14 +151,20 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
         // Create an alert dialog from the `AlertDialog.Builder`.
         final AlertDialog alertDialog = dialogBuilder.create();
 
-        // Remove the warning below that `getWindow()` might be null.
-        assert alertDialog.getWindow() != null;
+        // Get the alert dialog window.
+        Window dialogWindow = alertDialog.getWindow();
+
+        // Remove the incorrect lint warning below that the dialog window might be null.
+        assert dialogWindow != null;
 
         // Disable screenshots if not allowed.
-        if (!MainWebViewActivity.allowScreenshots) {
+        if (!allowScreenshots) {
             alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
+        // Display the keyboard.
+        dialogWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
         // The alert dialog must be shown before items in the alert dialog can be modified.
         alertDialog.show();
 
@@ -189,14 +204,16 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
             }
         });
 
-        // Allow the enter key on the keyboard to create the folder from `create_folder_name_edittext`.
-        folderNameEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> {
-            // If the event is a key-down on the `enter` key, select the `PositiveButton` `Create`.
-            if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && createButton.isEnabled()) {  // The enter key was pressed and the create button is enabled.
-                // Trigger `createBookmarkFolderListener` and return the `DialogFragment` to the parent activity.
+        // Set the enter key on the keyboard to create the folder from the edit text.
+        folderNameEditText.setOnKeyListener((View view, int keyCode, KeyEvent keyEvent) -> {
+            // If the key event is a key-down on the `enter` key create the bookmark folder.
+            if ((keyEvent.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && createButton.isEnabled()) {  // The enter key was pressed and the create button is enabled.
+                // Trigger the create bookmark folder listener and return the dialog fragment to the parent activity.
                 createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap);
-                // Manually dismiss the `AlertDialog`.
+
+                // Manually dismiss the alert dialog.
                 alertDialog.dismiss();
+
                 // Consume the event.
                 return true;
             } else {  // If any other key was pressed, or if the create button is currently disabled, do not consume the event.