X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.java;h=c04bf8fff7db41a68c05763388c2de66c8cd74b3;hb=f0393ca22075be3e5fe9199c7db87381256236fa;hp=6110ed541b8dadf73b3226f8cef7a7935b79a388;hpb=0a5d2eabceeafb49a957598538aa74d4f11dfce0;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java
index 6110ed54..c04bf8ff 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -24,10 +24,9 @@ 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.support.annotation.NonNull;
-// `AppCompatDialogFragment` is used instead of `DialogFragment` to avoid an error on API <=22.
-import android.support.v7.app.AppCompatDialogFragment;
+import android.preference.PreferenceManager;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
@@ -38,14 +37,28 @@ import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
+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;
 
-public class HttpAuthenticationDialog extends AppCompatDialogFragment{
+public class HttpAuthenticationDialog extends DialogFragment{
+    // `httpAuthenticationListener` is used in `onAttach()` and `onCreateDialog()`
+    private HttpAuthenticationListener httpAuthenticationListener;
+
+    // The public interface is used to send information back to the parent activity.
+    public interface HttpAuthenticationListener {
+        void onHttpAuthenticationCancel();
+
+        void onHttpAuthenticationProceed(DialogFragment dialogFragment);
+    }
+
+    public void onAttach(Context context) {
+        super.onAttach(context);
 
-    // The private variables are used in `onCreate()` and `onCreateDialog()`.
-    private String httpAuthHost;
-    private String httpAuthRealm;
+        // Get a handle for `httpAuthenticationListener` from `context`.
+        httpAuthenticationListener = (HttpAuthenticationListener) context;
+    }
 
     public static HttpAuthenticationDialog displayDialog(String host, String realm) {
         // Store the strings in a `Bundle`.
@@ -59,44 +72,18 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{
         return thisHttpAuthenticationDialog;
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Remove the incorrect lint warnings that `getString()` might be null.
-        assert getArguments() != null;
-
-        // Save the host and realm in class variables.
-        httpAuthHost = getArguments().getString("Host");
-        httpAuthRealm = getArguments().getString("Realm");
-    }
-
-    // The public interface is used to send information back to the parent activity.
-    public interface HttpAuthenticationListener {
-        void onHttpAuthenticationCancel();
-
-        void onHttpAuthenticationProceed(AppCompatDialogFragment dialogFragment);
-    }
-
-    // `httpAuthenticationListener` is used in `onAttach()` and `onCreateDialog()`
-    private HttpAuthenticationListener httpAuthenticationListener;
-
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        // Get a handle for `httpAuthenticationListener` from `context`.
-        try {
-            httpAuthenticationListener = (HttpAuthenticationListener) context;
-        } catch(ClassCastException exception) {
-            throw new ClassCastException(context.toString() + " must implement `HttpAuthenticationListener`.");
-        }
-    }
-
     // `@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) {
+        // Remove the incorrect lint warnings that `getString()` might be null.
+        assert getArguments() != null;
+
+        // Get the host and realm variables from the bundle.
+        String httpAuthHost = getArguments().getString("Host");
+        String httpAuthRealm = getArguments().getString("Realm");
+
         // Remove the incorrect lint warning that `getActivity()` might be null.
         assert getActivity() != null;
 
@@ -106,8 +93,15 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{
         // 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 darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+        boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+
         // Set the style according to the theme.
-        if (MainWebViewActivity.darkTheme) {
+        if (darkTheme) {
             // Set the dialog theme.
             dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark);
 
@@ -146,7 +140,7 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{
         assert alertDialog.getWindow() != null;
 
         // Disable screenshots if not allowed.
-        if (!MainWebViewActivity.allowScreenshots) {
+        if (!allowScreenshots) {
             alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
 
@@ -166,7 +160,7 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{
         realmTextView.setText(httpAuthRealm);
 
         // Set the realm text color according to the theme.  The deprecated `.getColor()` must be used until API >= 23.
-        if (MainWebViewActivity.darkTheme) {
+        if (darkTheme) {
             //noinspection deprecation
             realmTextView.setTextColor(getResources().getColor(R.color.gray_300));
         } else {
@@ -182,7 +176,7 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{
         ForegroundColorSpan blueColorSpan;
 
         // Set `blueColorSpan` according to the theme.  The deprecated `getColor()` must be used until API >= 23.
-        if (MainWebViewActivity.darkTheme) {
+        if (darkTheme) {
             //noinspection deprecation
             blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
         } else {
@@ -233,4 +227,4 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{
         // `onCreateDialog()` requires the return of an `AlertDialog`.
         return alertDialog;
     }
-}
+}
\ No newline at end of file