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=6099d2b3e47e4130292dd412ad9e89bb650584c3;hp=993c8c3d59d7369ab9a45e4c1b308b89a8ad5dcf;hb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e;hpb=e75f230075b4059be6a9b6d27d8b6b202c74a6ff 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 993c8c3d..6099d2b3 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 Soren Stoutner . + * Copyright © 2017-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -25,9 +25,6 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; 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.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; @@ -41,52 +38,37 @@ import android.widget.TextView; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; -public class HttpAuthenticationDialog extends AppCompatDialogFragment{ +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22. - // The private variables are used in `onCreate()` and `onCreateDialog()`. - private String httpAuthHost; - private String httpAuthRealm; - - public static HttpAuthenticationDialog displayDialog(String host, String realm) { - // Store the strings in a `Bundle`. - Bundle argumentsBundle = new Bundle(); - argumentsBundle.putString("Host", host); - argumentsBundle.putString("Realm", realm); - - // Add `argumentsBundle` to this instance of `HttpAuthenticationDialog`. - HttpAuthenticationDialog thisHttpAuthenticationDialog = new HttpAuthenticationDialog(); - thisHttpAuthenticationDialog.setArguments(argumentsBundle); - return thisHttpAuthenticationDialog; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Save the host and realm in class variables. - httpAuthHost = getArguments().getString("Host"); - httpAuthRealm = getArguments().getString("Realm"); - } +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(AppCompatDialogFragment dialogFragment); + void onHttpAuthenticationProceed(DialogFragment 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`."); - } + httpAuthenticationListener = (HttpAuthenticationListener) context; + } + + public static HttpAuthenticationDialog displayDialog(String host, String realm) { + // Store the strings in a `Bundle`. + Bundle argumentsBundle = new Bundle(); + argumentsBundle.putString("Host", host); + argumentsBundle.putString("Realm", realm); + + // Add `argumentsBundle` to this instance of `HttpAuthenticationDialog`. + HttpAuthenticationDialog thisHttpAuthenticationDialog = new HttpAuthenticationDialog(); + thisHttpAuthenticationDialog.setArguments(argumentsBundle); + return thisHttpAuthenticationDialog; } // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @@ -94,10 +76,20 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{ @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; + // Get the activity's layout inflater. LayoutInflater layoutInflater = getActivity().getLayoutInflater(); - // Use `AlertDialog.Builder` to create the `AlertDialog`. + // Use an alert dialog builder to create the alert dialog. AlertDialog.Builder dialogBuilder; // Set the style according to the theme. @@ -122,40 +114,39 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{ dialogBuilder.setView(layoutInflater.inflate(R.layout.http_authentication_dialog, null)); // Setup the negative button. - dialogBuilder.setNegativeButton(R.string.close, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Call `onHttpAuthenticationCancel()` and return the `DialogFragment` to the parent activity. - httpAuthenticationListener.onHttpAuthenticationCancel(); - } + dialogBuilder.setNegativeButton(R.string.close, (DialogInterface dialog, int which) -> { + // Call `onHttpAuthenticationCancel()` and return the `DialogFragment` to the parent activity. + httpAuthenticationListener.onHttpAuthenticationCancel(); }); // Setup the positive button. - dialogBuilder.setPositiveButton(R.string.proceed, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Call `onHttpAuthenticationProceed()` and return the `DialogFragment` to the parent activity. - httpAuthenticationListener.onHttpAuthenticationProceed(HttpAuthenticationDialog.this); - } + dialogBuilder.setPositiveButton(R.string.proceed, (DialogInterface dialog, int which) -> { + // Call `onHttpAuthenticationProceed()` and return the `DialogFragment` to the parent activity. + httpAuthenticationListener.onHttpAuthenticationProceed(HttpAuthenticationDialog.this); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the alert dialog builder. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`. + // Remove the warning below that `getWindow()` might be null. assert alertDialog.getWindow() != null; + // Disable screenshots if not allowed. + if (!MainWebViewActivity.allowScreenshots) { + alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); + } + // Show the keyboard when the `AlertDialog` is displayed on the screen. alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); - // The `AlertDialog` needs to be shown before `setOnKeyListener()` can be called. + // The alert dialog needs to be shown before the contents can be modified. alertDialog.show(); // Get handles for the views in `alertDialog`. - TextView realmTextView = (TextView) alertDialog.findViewById(R.id.http_authentication_realm); - TextView hostTextView = (TextView) alertDialog.findViewById(R.id.http_authentication_host); - EditText usernameEditText = (EditText) alertDialog.findViewById(R.id.http_authentication_username); - EditText passwordEditText = (EditText) alertDialog.findViewById(R.id.http_authentication_password); + TextView realmTextView = alertDialog.findViewById(R.id.http_authentication_realm); + TextView hostTextView = alertDialog.findViewById(R.id.http_authentication_host); + EditText usernameEditText = alertDialog.findViewById(R.id.http_authentication_username); + EditText passwordEditText = alertDialog.findViewById(R.id.http_authentication_password); // Set the realm text. realmTextView.setText(httpAuthRealm); @@ -192,40 +183,36 @@ public class HttpAuthenticationDialog extends AppCompatDialogFragment{ hostTextView.setText(hostStringBuilder); // Allow the `enter` key on the keyboard to trigger `onHttpAuthenticationProceed` from `usernameEditText`. - usernameEditText.setOnKeyListener(new View.OnKeyListener() { - public boolean onKey(View view, int keyCode, KeyEvent event) { - // If the event is a key-down on the `enter` key, call `onHttpAuthenticationProceed()`. - if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { - // Trigger `onHttpAuthenticationProceed` and return the `DialogFragment` to the parent activity. - httpAuthenticationListener.onHttpAuthenticationProceed(HttpAuthenticationDialog.this); - - // Manually dismiss the `AlertDialog`. - alertDialog.dismiss(); - - // Consume the event. - return true; - } else { // If any other key was pressed, do not consume the event. - return false; - } + usernameEditText.setOnKeyListener((View view, int keyCode, KeyEvent event) -> { + // If the event is a key-down on the `enter` key, call `onHttpAuthenticationProceed()`. + if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { + // Trigger `onHttpAuthenticationProceed` and return the `DialogFragment` to the parent activity. + httpAuthenticationListener.onHttpAuthenticationProceed(HttpAuthenticationDialog.this); + + // Manually dismiss the `AlertDialog`. + alertDialog.dismiss(); + + // Consume the event. + return true; + } else { // If any other key was pressed, do not consume the event. + return false; } }); // Allow the `enter` key on the keyboard to trigger `onHttpAuthenticationProceed()` from `passwordEditText`. - passwordEditText.setOnKeyListener(new View.OnKeyListener() { - public boolean onKey(View view, int keyCode, KeyEvent event) { - // If the event is a key-down on the `enter` key, call `onHttpAuthenticationProceed()`. - if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { - // Trigger `onHttpAuthenticationProceed` and return the `DialogFragment` to the parent activity. - httpAuthenticationListener.onHttpAuthenticationProceed(HttpAuthenticationDialog.this); - - // Manually dismiss the `AlertDialog`. - alertDialog.dismiss(); - - // Consume the event. - return true; - } else { // If any other key was pressed, do not consume the event. - return false; - } + passwordEditText.setOnKeyListener((View view, int keyCode, KeyEvent event) -> { + // If the event is a key-down on the `enter` key, call `onHttpAuthenticationProceed()`. + if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { + // Trigger `onHttpAuthenticationProceed` and return the `DialogFragment` to the parent activity. + httpAuthenticationListener.onHttpAuthenticationProceed(HttpAuthenticationDialog.this); + + // Manually dismiss the `AlertDialog`. + alertDialog.dismiss(); + + // Consume the event. + return true; + } else { // If any other key was pressed, do not consume the event. + return false; } });