/*
- * 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>.
*
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;
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;
-
+ @Override
public void onAttach(Context context) {
// Run the default commands.
super.onAttach(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`.
@SuppressLint("InflateParams")
@Override
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
+ // 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);
// 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 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 alert dialog from the builder.
assert alertDialog.getWindow() != null;
// Disable screenshots if not allowed.
- if (!MainWebViewActivity.allowScreenshots) {
+ if (!allowScreenshots) {
alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
}
});
- // 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.
}
});
- // `onCreateDialog()` requires the return of an `AlertDialog`.
+ // Return the alert dialog.
return alertDialog;
}
-}
+}
\ No newline at end of file