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=87c336df1956dca016923a11ead759f0dbf337a9;hp=9c15026ce72e8eaeb555dd3346db23214a41fd0e;hb=ca7516a7edb9e06d0f9fe9186513986cd82be716;hpb=1cafe068c513943996a59c8ba94945832792061e 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 9c15026c..87c336df 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 . * @@ -24,11 +24,10 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; 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.preference.PreferenceManager; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -38,29 +37,45 @@ import android.widget.Button; 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; 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()`. + // The add domain listener is used in `onAttach()` and `onCreateDialog()`. private AddDomainListener addDomainListener; - - public void onAttach(Context context) { + @Override + public void onAttach(@NonNull 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; + } + + public static AddDomainDialog addDomain(String url) { + // Create an arguments bundle. + Bundle argumentsBundle = new Bundle(); + + // Store the URL in the bundle. + argumentsBundle.putString("url", url); + + // Create a new instance of the dialog. + AddDomainDialog addDomainDialog = new AddDomainDialog(); + + // Add the bundle to the dialog. + addDomainDialog.setArguments(argumentsBundle); + + // Return the new dialog. + return addDomainDialog; } // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @@ -68,11 +83,27 @@ public class AddDomainDialog extends AppCompatDialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // Use `AlertDialog.Builder` to create the `AlertDialog`. + // Get the arguments. + Bundle arguments = getArguments(); + + // Remove the incorrect lint warning below that the arguments might be null. + assert arguments != null; + + // Get the URL from the bundle. + String url = arguments.getString("url"); + + // 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 allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + // 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); @@ -81,41 +112,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. + // Set a listener for the negative button. dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { - // Do nothing. The `AlertDialog` will close automatically. + // Do nothing. The alert dialog will close automatically. }); - // Set an `onClick()` listener for the positive button. + // 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); + // Return the dialog fragment to the parent activity on add. + addDomainListener.onAddDomain(this); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the 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; - // Show the keyboard when the `AlertDialog` is displayed on the screen. + // 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); - // 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`. + // 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) { @@ -133,30 +172,34 @@ 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); } } }); - // Get the current domain from `formattedUrlString`. - Uri currentUri = Uri.parse(MainWebViewActivity.formattedUrlString); + // Convert the URL to a URI. + Uri currentUri = Uri.parse(url); + + // Display the host in the add domain edit text. addDomainEditText.setText(currentUri.getHost()); - // Allow the `enter` key on the keyboard to create the domain from `add_domain_edittext`. + // Allow the enter key on the keyboard to create the domain from the add domain edit text. addDomainEditText.setOnKeyListener((View view, int keyCode, KeyEvent event) -> { - // If the event is a key-down on the `enter` key, select the `PositiveButton` `Add`. + // 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`. + // Trigger `addDomainListener` and return the dialog fragment to the parent activity. + addDomainListener.onAddDomain(this); + + // Manually dismiss the alert dialog. alertDialog.dismiss(); + // Consume the event. return true; } else { // If any other key was pressed, do not consume the event. @@ -164,7 +207,7 @@ public class AddDomainDialog extends AppCompatDialogFragment { } }); - // `onCreateDialog()` requires the return of an `AlertDialog`. + // Return the alert dialog. return alertDialog; } -} +} \ No newline at end of file