X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.java;h=9d7c0f3822d6b5ab199711bad7b3609318c69c1b;hp=7ee7dd0136261da6e4b6be383cfc6be59220caeb;hb=a9b4d8c78a305c2602ced2058702254ea4e3b79b;hpb=fa3b8b382eb5ed86c598e3b126d1ef5dd117c5be 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 7ee7dd01..9d7c0f38 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-2019 Soren Stoutner . + * Copyright © 2017-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -20,10 +20,10 @@ package com.stoutner.privacybrowser.dialogs; import android.annotation.SuppressLint; -import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.SpannableStringBuilder; @@ -32,13 +32,15 @@ import android.text.style.ForegroundColorSpan; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; +import android.view.Window; import android.view.WindowManager; import android.webkit.HttpAuthHandler; 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 androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; @@ -110,28 +112,16 @@ public class HttpAuthenticationDialog extends DialogFragment{ LayoutInflater layoutInflater = getActivity().getLayoutInflater(); // Use an alert dialog builder to create the alert dialog. - AlertDialog.Builder dialogBuilder; + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialog); - // 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); + // Get the current theme status. + int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - // Set the style according to the theme. - if (darkTheme) { - // Set the dialog theme. - dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); - - // Set the icon. - dialogBuilder.setIcon(R.drawable.lock_dark); + // Set the icon according to the theme. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + dialogBuilder.setIcon(R.drawable.lock_night); } else { - // Set the dialog theme. - dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight); - - // Set the icon. - dialogBuilder.setIcon(R.drawable.lock_light); + dialogBuilder.setIcon(R.drawable.lock_day); } // Set the title. @@ -161,16 +151,25 @@ public class HttpAuthenticationDialog extends DialogFragment{ // Create an alert dialog from the alert dialog 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; + + // 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) { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // Show the keyboard when the alert dialog is displayed on the screen. - alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + // Display the keyboard. + dialogWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); // The alert dialog needs to be shown before the contents can be modified. alertDialog.show(); @@ -181,11 +180,15 @@ public class HttpAuthenticationDialog extends DialogFragment{ usernameEditText = alertDialog.findViewById(R.id.http_authentication_username); passwordEditText = alertDialog.findViewById(R.id.http_authentication_password); + // Remove the incorrect lint warnings below that the views might be null. + assert realmTextView != null; + assert hostTextView != null; + // Set the realm text. realmTextView.setText(httpAuthRealm); - // Set the realm text color according to the theme. The deprecated `.getColor()` must be used until API >= 23. - if (darkTheme) { + // Set the realm text color according to the theme. The deprecated `getResources()` must be used until API >= 23. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { realmTextView.setTextColor(getResources().getColor(R.color.gray_300)); } else { realmTextView.setTextColor(getResources().getColor(R.color.black)); @@ -198,9 +201,9 @@ public class HttpAuthenticationDialog extends DialogFragment{ // Create a blue `ForegroundColorSpan`. ForegroundColorSpan blueColorSpan; - // Set `blueColorSpan` according to the theme. The deprecated `getColor()` must be used until API >= 23. - if (darkTheme) { - blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400)); + // Set the blue color span according to the theme. The deprecated `getResources()` must be used until API >= 23. + if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { + blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500)); } else { blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700)); }