X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FAddDomainDialog.java;h=cfba553e4f9587cc97fdb947af60cd4baac34361;hp=396e920d378639a636ee02ba42828f0a143ef01e;hb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e;hpb=500012f6332dee70b77f7a2c3f69a78cdac435af diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java index 396e920d..cfba553e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Soren Stoutner . + * Copyright © 2017-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -26,9 +26,6 @@ import android.content.Context; import android.content.DialogInterface; import android.net.Uri; import android.os.Bundle; -// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <= 22. -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatDialogFragment; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -38,14 +35,18 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; +// The AndroidX dialog fragment must be used or an error is produced on API <=22. +import androidx.fragment.app.DialogFragment; + import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; -public class AddDomainDialog extends AppCompatDialogFragment { +public class AddDomainDialog extends DialogFragment { // The public interface is used to send information back to the parent activity. public interface AddDomainListener { - void onAddDomain(AppCompatDialogFragment dialogFragment); + void onAddDomain(DialogFragment dialogFragment); } // `addDomainListener` is used in `onAttach()` and `onCreateDialog()`. @@ -53,14 +54,11 @@ public class AddDomainDialog extends AppCompatDialogFragment { public void onAttach(Context context) { + // Run the default commands. super.onAttach(context); - // Get a handle for `AddDomainListener` from `context`. - try { - addDomainListener = (AddDomainListener) context; - } catch(ClassCastException exception) { - throw new ClassCastException(context.toString() + " must implement `AddDomainListener`."); - } + // Get a handle for the listener from the launching context. + addDomainListener = (AddDomainListener) context; } // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @@ -68,7 +66,7 @@ public class AddDomainDialog extends AppCompatDialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // 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. @@ -81,47 +79,49 @@ public class AddDomainDialog extends AppCompatDialogFragment { // Set the title. dialogBuilder.setTitle(R.string.add_domain); - // Set the view. The parent view is `null` because it will be assigned by the `AlertDialog`. + // Remove the incorrect lint warning below that `getActivity()` might be null. + assert getActivity() != null; + + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.add_domain_dialog, null)); - // Set an `onClick()` listener for the negative button. - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Do nothing. The `AlertDialog` will close automatically. - } + // Set a listener for the negative button. + dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { + // Do nothing. The `AlertDialog` will close automatically. }); - // Set an `onClick()` listener for the positive button. - dialogBuilder.setPositiveButton(R.string.add, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Return the `DialogFragment` to the parent activity on add. - addDomainListener.onAddDomain(AddDomainDialog.this); - } + // Set a listener for the positive button. + dialogBuilder.setPositiveButton(R.string.add, (DialogInterface dialog, int which) -> { + // Return the `DialogFragment` to the parent activity on add. + addDomainListener.onAddDomain(AddDomainDialog.this); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the builder. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below the `setSoftInputMode` might produce `java.lang.NullPointerException`. + // Remove the warning below that `getWindow()` might be null. assert alertDialog.getWindow() != null; - // Show the keyboard when the `AlertDialog` is displayed on the screen. + // Disable screenshots if not allowed. + if (!MainWebViewActivity.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); - // The `AlertDialog` must be shown before the contents can be edited. + // The alert dialog must be shown before the contents can be edited. alertDialog.show(); - // Initialize `domainsDatabaseHelper`. The two `nulls` do not specify the database name or a `CursorFactory`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. + // Initialize `domainsDatabaseHelper`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. final DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0); - // Get handles for the views in `alertDialog`. - final EditText addDomainEditText = (EditText) alertDialog.findViewById(R.id.domain_name_edittext); - final TextView domainNameAlreadyExistsTextView = (TextView) alertDialog.findViewById(R.id.domain_name_already_exists_textview); + // Get handles for the views in the alert dialog. + final EditText addDomainEditText = alertDialog.findViewById(R.id.domain_name_edittext); + final TextView domainNameAlreadyExistsTextView = alertDialog.findViewById(R.id.domain_name_already_exists_textview); final Button addButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - // Update the status of the warning text and the `add` button. + // Update the status of the warning text and the add button. addDomainEditText.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -139,13 +139,13 @@ public class AddDomainDialog extends AppCompatDialogFragment { // Show the warning text. domainNameAlreadyExistsTextView.setVisibility(View.VISIBLE); - // Disable the `add` button. + // Disable the add button. addButton.setEnabled(false); } else { // The domain do not yet exist. // Hide the warning text. domainNameAlreadyExistsTextView.setVisibility(View.GONE); - // Enable the `add` button. + // Enable the add button. addButton.setEnabled(true); } } @@ -156,19 +156,17 @@ public class AddDomainDialog extends AppCompatDialogFragment { addDomainEditText.setText(currentUri.getHost()); // Allow the `enter` key on the keyboard to create the domain from `add_domain_edittext`. - addDomainEditText.setOnKeyListener(new View.OnKeyListener() { - public boolean onKey(View view, int keyCode, KeyEvent event) { - // If the event is a key-down on the `enter` key, select the `PositiveButton` `Add`. - if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { - // Trigger `addDomainListener` and return the `DialogFragment` to the parent activity. - addDomainListener.onAddDomain(AddDomainDialog.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; - } + addDomainEditText.setOnKeyListener((View view, int keyCode, KeyEvent event) -> { + // If the event is a key-down on the `enter` key, select the `PositiveButton` `Add`. + if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { + // Trigger `addDomainListener` and return the `DialogFragment` to the parent activity. + addDomainListener.onAddDomain(AddDomainDialog.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; } });