X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateHomeScreenShortcutDialog.java;h=b82f4bbf690ee8b46f5653ec202a4db970a41e55;hb=9d5e4c56326502b6b74e8f3e463275f5c1e176cc;hp=e3221a212c2450c795b5932181e24023a58d9707;hpb=55f06b482c1a7426f9338e68e89a30659d0d2f8b;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java index e3221a21..b82f4bbf 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.java @@ -25,12 +25,14 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; +import android.preference.PreferenceManager; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -49,7 +51,6 @@ import androidx.core.graphics.drawable.IconCompat; import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22. import com.stoutner.privacybrowser.BuildConfig; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.R; import java.io.ByteArrayOutputStream; @@ -74,19 +75,19 @@ public class CreateHomeScreenShortcutDialog extends DialogFragment { // Convert the byte array output stream to a byte array. byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray(); - // Create a bundle. - Bundle bundle = new Bundle(); + // Create an arguments bundle. + Bundle argumentsBundle = new Bundle(); // Store the variables in the bundle. - bundle.putString("shortcut_name", shortcutName); - bundle.putString("url_string", urlString); - bundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray); + argumentsBundle.putString("shortcut_name", shortcutName); + argumentsBundle.putString("url_string", urlString); + argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray); // Create a new instance of the dialog. CreateHomeScreenShortcutDialog createHomeScreenShortcutDialog = new CreateHomeScreenShortcutDialog(); // Add the bundle to the dialog. - createHomeScreenShortcutDialog.setArguments(bundle); + createHomeScreenShortcutDialog.setArguments(argumentsBundle); // Return the new dialog. return createHomeScreenShortcutDialog; @@ -100,7 +101,7 @@ public class CreateHomeScreenShortcutDialog extends DialogFragment { // Get the arguments. Bundle arguments = getArguments(); - // Remove the incorrect lint warning that the arguments might be null. + // Remove the incorrect lint warning below that the arguments might be null. assert arguments != null; // Store the strings in class variables. @@ -122,7 +123,14 @@ public class CreateHomeScreenShortcutDialog extends DialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // Remove the incorrect lint warning below that `getLayoutInflater()` might be null. + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + + // Get the theme and screenshot preferences. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + + // Remove the incorrect lint warning below that the layout inflater might be null. assert getActivity() != null; // Get the activity's layout inflater. @@ -135,7 +143,7 @@ public class CreateHomeScreenShortcutDialog extends DialogFragment { AlertDialog.Builder dialogBuilder; // 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); @@ -164,7 +172,7 @@ public class CreateHomeScreenShortcutDialog extends DialogFragment { assert alertDialog.getWindow() != null; // Disable screenshots if not allowed. - if (!MainWebViewActivity.allowScreenshots) { + if (allowScreenshots) { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); }