X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.java;h=b198a888fd40daafea989926b2b67c738aaa5e92;hb=a3643224d8e2876e136604a138834375e37c1e53;hp=2e9532aa5ff34ce923c81b15d6dadb7c7b52d620;hpb=55169899d6454cd57e40d32a792735df51caee85;p=PrivacyBrowserAndroid.git

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 2e9532aa..b198a888 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java
@@ -24,9 +24,12 @@ 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;
@@ -40,13 +43,14 @@ 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;
+
 public class CreateBookmarkFolderDialog extends DialogFragment {
     // The public interface is used to send information back to the parent activity.
     public interface CreateBookmarkFolderListener {
-        void onCreateBookmarkFolder(DialogFragment dialogFragment);
+        void onCreateBookmarkFolder(DialogFragment dialogFragment, Bitmap favoriteIconBitmap);
     }
 
     // `createBookmarkFolderListener` is used in `onAttach()` and `onCreateDialog`.
@@ -59,16 +63,64 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
         createBookmarkFolderListener = (CreateBookmarkFolderListener) context;
     }
 
+    public static CreateBookmarkFolderDialog createBookmarkFolder(Bitmap favoriteIconBitmap) {
+        // Create a favorite icon byte array output stream.
+        ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
+
+        // Convert the favorite icon to a PNG and place it in the byte array output stream.  `0` is for lossless compression (the only option for a PNG).
+        favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
+
+        // Convert the byte array output stream to a byte array.
+        byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
+
+        // Create an arguments bundle.
+        Bundle argumentsBundle = new Bundle();
+
+        // Store the favorite icon in the bundle.
+        argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray);
+
+        // Create a new instance of the dialog.
+        CreateBookmarkFolderDialog createBookmarkFolderDialog = new CreateBookmarkFolderDialog();
+
+        // Add the bundle to the dialog.
+        createBookmarkFolderDialog.setArguments(argumentsBundle);
+
+        // Return the new dialog.
+        return createBookmarkFolderDialog;
+    }
+
     // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
     @SuppressLint("InflateParams")
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Get the arguments.
+        Bundle arguments = getArguments();
+
+        // Remove the incorrect lint warning below that the arguments might be null.
+        assert arguments != null;
+
+        // Get the favorite icon byte array.
+        byte[] favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array");
+
+        // Remove the incorrect lint warning below that the favorite icon byte array might be null.
+        assert favoriteIconByteArray != null;
+
+        // Convert the favorite icon byte array to a bitmap.
+        Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
+
         // 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);
@@ -91,7 +143,7 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
         // Set an `onClick()` listener fo the positive button.
         dialogBuilder.setPositiveButton(R.string.create, (DialogInterface dialog, int which) -> {
             // Return the `DialogFragment` to the parent activity on create.
-            createBookmarkFolderListener.onCreateBookmarkFolder(CreateBookmarkFolderDialog.this);
+            createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap);
         });
 
 
@@ -102,7 +154,7 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
         assert alertDialog.getWindow() != null;
 
         // Disable screenshots if not allowed.
-        if (!MainWebViewActivity.allowScreenshots) {
+        if (!allowScreenshots) {
             alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
@@ -150,7 +202,7 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
             // 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.
-                createBookmarkFolderListener.onCreateBookmarkFolder(CreateBookmarkFolderDialog.this);
+                createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap);
                 // Manually dismiss the `AlertDialog`.
                 alertDialog.dismiss();
                 // Consume the event.
@@ -160,14 +212,6 @@ public class CreateBookmarkFolderDialog extends DialogFragment {
             }
         });
 
-        // Get a copy of the favorite icon bitmap.
-        Bitmap favoriteIconBitmap = MainWebViewActivity.favoriteIconBitmap;
-
-        // Scale the favorite icon bitmap down if it is larger than 256 x 256.  Filtering uses bilinear interpolation.
-        if ((favoriteIconBitmap.getHeight() > 256) || (favoriteIconBitmap.getWidth() > 256)) {
-            favoriteIconBitmap = Bitmap.createScaledBitmap(favoriteIconBitmap, 256, 256, true);
-        }
-
         // Display the current favorite icon.
         webPageIconImageView.setImageBitmap(favoriteIconBitmap);