/*
- * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.annotation.SuppressLint;
import android.app.Activity;
-import android.app.AlertDialog;
import android.app.Dialog;
-import android.content.Context;
import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.net.Uri;
import android.net.http.SslCertificate;
import android.net.http.SslError;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.view.LayoutInflater;
+import android.view.View;
import android.view.WindowManager;
+import android.webkit.SslErrorHandler;
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;
+import com.stoutner.privacybrowser.fragments.WebViewTabFragment;
+import com.stoutner.privacybrowser.views.NestedScrollWebView;
import java.lang.ref.WeakReference;
import java.net.InetAddress;
import java.util.Date;
public class SslCertificateErrorDialog extends DialogFragment {
- // `sslCertificateErrorListener` is used in `onAttach` and `onCreateDialog`.
- private SslCertificateErrorListener sslCertificateErrorListener;
-
- // The public interface is used to send information back to the parent activity.
- public interface SslCertificateErrorListener {
- void onSslErrorCancel();
-
- void onSslErrorProceed();
- }
-
- public void onAttach(Context context) {
- // Run the default commands.
- super.onAttach(context);
-
- // Get a handle for `SslCertificateErrorListener` from the launching context.
- sslCertificateErrorListener = (SslCertificateErrorListener) context;
- }
-
- public static SslCertificateErrorDialog displayDialog(SslError error) {
+ public static SslCertificateErrorDialog displayDialog(SslError error, long webViewFragmentId) {
// Get the various components of the SSL error message.
int primaryErrorIntForBundle = error.getPrimaryError();
String urlWithErrorForBundle = error.getUrl();
Date startDateForBundle = sslCertificate.getValidNotBeforeDate();
Date endDateForBundle = sslCertificate.getValidNotAfterDate();
- // Store the SSL error message components in a `Bundle`.
+ // Create an arguments bundle.
Bundle argumentsBundle = new Bundle();
- argumentsBundle.putInt("PrimaryErrorInt", primaryErrorIntForBundle);
- argumentsBundle.putString("UrlWithError", urlWithErrorForBundle);
- argumentsBundle.putString("IssuedToCName", issuedToCNameForBundle);
- argumentsBundle.putString("IssuedToOName", issuedToONameForBundle);
- argumentsBundle.putString("IssuedToUName", issuedToUNameForBundle);
- argumentsBundle.putString("IssuedByCName", issuedByCNameForBundle);
- argumentsBundle.putString("IssuedByOName", issuedByONameForBundle);
- argumentsBundle.putString("IssuedByUName", issuedByUNameForBundle);
- argumentsBundle.putString("StartDate", DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(startDateForBundle));
- argumentsBundle.putString("EndDate", DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(endDateForBundle));
-
- // Add `argumentsBundle` to this instance of `SslCertificateErrorDialog`.
+
+ // Store the SSL error message components in a `Bundle`.
+ argumentsBundle.putInt("primary_error_int", primaryErrorIntForBundle);
+ argumentsBundle.putString("url_with_error", urlWithErrorForBundle);
+ argumentsBundle.putString("issued_to_cname", issuedToCNameForBundle);
+ argumentsBundle.putString("issued_to_oname", issuedToONameForBundle);
+ argumentsBundle.putString("issued_to_uname", issuedToUNameForBundle);
+ argumentsBundle.putString("issued_by_cname", issuedByCNameForBundle);
+ argumentsBundle.putString("issued_by_oname", issuedByONameForBundle);
+ argumentsBundle.putString("issued_by_uname", issuedByUNameForBundle);
+ argumentsBundle.putString("start_date", DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(startDateForBundle));
+ argumentsBundle.putString("end_date", DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(endDateForBundle));
+ argumentsBundle.putLong("webview_fragment_id", webViewFragmentId);
+
+ // Create a new instance of the SSL certificate error dialog.
SslCertificateErrorDialog thisSslCertificateErrorDialog = new SslCertificateErrorDialog();
+
+ // Add the arguments bundle to the new dialog.
thisSslCertificateErrorDialog.setArguments(argumentsBundle);
+
+ // Return the new dialog.
return thisSslCertificateErrorDialog;
}
- // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
+ // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
@SuppressLint("InflateParams")
- @SuppressWarnings("deprecation")
@Override
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
- // Remove the incorrect lint warning that `getArguments()` might be null.
- assert getArguments() != null;
-
- // Get the components of the SSL error message from the bundle.
- int primaryErrorInt = getArguments().getInt("PrimaryErrorInt");
- String urlWithErrors = getArguments().getString("UrlWithError");
- String issuedToCName = getArguments().getString("IssuedToCName");
- String issuedToOName = getArguments().getString("IssuedToOName");
- String issuedToUName = getArguments().getString("IssuedToUName");
- String issuedByCName = getArguments().getString("IssuedByCName");
- String issuedByOName = getArguments().getString("IssuedByOName");
- String issuedByUName = getArguments().getString("IssuedByUName");
- String startDate = getArguments().getString("StartDate");
- String endDate = getArguments().getString("EndDate");
-
- // Remove the incorrect lint warning that `getActivity()` might be null.
- assert getActivity() != null;
+ // Get a handle for the arguments.
+ Bundle arguments = getArguments();
+
+ // Remove the incorrect lint warning that the arguments might be null.
+ assert arguments != null;
+
+ // Get the variables from the bundle.
+ int primaryErrorInt = arguments.getInt("primary_error_int");
+ String urlWithErrors = arguments.getString("url_with_error");
+ String issuedToCName = arguments.getString("issued_to_cname");
+ String issuedToOName = arguments.getString("issued_to_oname");
+ String issuedToUName = arguments.getString("issued_to_uname");
+ String issuedByCName = arguments.getString("issued_by_cname");
+ String issuedByOName = arguments.getString("issued_by_oname");
+ String issuedByUName = arguments.getString("issued_by_uname");
+ String startDate = arguments.getString("start_date");
+ String endDate = arguments.getString("end_date");
+ long webViewFragmentId = arguments.getLong("webview_fragment_id");
+
+ // Get the current position of this WebView fragment.
+ int webViewPosition = MainWebViewActivity.webViewPagerAdapter.getPositionForId(webViewFragmentId);
+
+ // Get the WebView tab fragment.
+ WebViewTabFragment webViewTabFragment = MainWebViewActivity.webViewPagerAdapter.getPageFragment(webViewPosition);
+
+ // Get the fragment view.
+ View fragmentView = webViewTabFragment.getView();
+
+ // Remove the incorrect lint warning below that the fragment view might be null.
+ assert fragmentView != null;
+
+ // Get a handle for the current WebView.
+ NestedScrollWebView nestedScrollWebView = fragmentView.findViewById(R.id.nestedscroll_webview);
+
+ // Get a handle for the SSL error handler.
+ SslErrorHandler sslErrorHandler = nestedScrollWebView.getSslErrorHandler();
// Get the activity's layout inflater.
- LayoutInflater layoutInflater = getActivity().getLayoutInflater();
+ LayoutInflater layoutInflater = requireActivity().getLayoutInflater();
// Use an alert dialog builder to create the alert dialog.
- AlertDialog.Builder dialogBuilder;
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog);
- // Set the style and icon according to the theme.
- if (MainWebViewActivity.darkTheme) {
- // Set the style.
- dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark);
+ // Get the current theme status.
+ int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
- // Set the icon.
- dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled_dark);
+ // Set the icon according to the theme.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled_night);
} else {
- // Set the style.
- dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight);
-
- // Set the icon.
- dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled_light);
+ dialogBuilder.setIcon(R.drawable.ssl_certificate_enabled_day);
}
// Set the title.
// Set the view. The parent view is `null` because it will be assigned by `AlertDialog`.
dialogBuilder.setView(layoutInflater.inflate(R.layout.ssl_certificate_error, null));
- // Set a listener on the negative button.
- dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> sslCertificateErrorListener.onSslErrorCancel());
+ // Set a listener on the cancel button.
+ dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> {
+ // Check to make sure the SSL error handler is not null. This might happen if multiple dialogs are displayed at once.
+ if (sslErrorHandler != null) {
+ // Cancel the request.
+ sslErrorHandler.cancel();
- // Set a listener on the positive button.
- dialogBuilder.setPositiveButton(R.string.proceed, (DialogInterface dialog, int which) -> sslCertificateErrorListener.onSslErrorProceed());
+ // Reset the SSL error handler.
+ nestedScrollWebView.resetSslErrorHandler();
+ }
+ });
+
+ // Set a listener on the proceed button.
+ dialogBuilder.setPositiveButton(R.string.proceed, (DialogInterface dialog, int which) -> {
+ // Check to make sure the SSL error handler is not null. This might happen if multiple dialogs are displayed at once.
+ if (sslErrorHandler != null) {
+ // Cancel the request.
+ sslErrorHandler.proceed();
+
+ // Reset the SSL error handler.
+ nestedScrollWebView.resetSslErrorHandler();
+ }
+ });
// Create an alert dialog from the alert dialog builder.
AlertDialog alertDialog = dialogBuilder.create();
+ // 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 (!MainWebViewActivity.allowScreenshots) {
+ if (!allowScreenshots) {
// Remove the warning below that `getWindow()` might be null.
assert alertDialog.getWindow() != null;
TextView startDateTextView = alertDialog.findViewById(R.id.start_date);
TextView endDateTextView = alertDialog.findViewById(R.id.end_date);
+ // Remove the incorrect lint warnings below that the views might be null.
+ assert primaryErrorTextView != null;
+ assert urlTextView != null;
+ assert issuedToCNameTextView != null;
+ assert issuedToONameTextView != null;
+ assert issuedToUNameTextView != null;
+ assert issuedByTextView != null;
+ assert issuedByCNameTextView != null;
+ assert issuedByONameTextView != null;
+ assert issuedByUNameTextView != null;
+ assert validDatesTextView != null;
+ assert startDateTextView != null;
+ assert endDateTextView != null;
+
// Setup the common strings.
String urlLabel = getString(R.string.url_label) + " ";
String cNameLabel = getString(R.string.common_name) + " ";
SpannableStringBuilder startDateStringBuilder = new SpannableStringBuilder(startDateLabel + startDate);
SpannableStringBuilder endDateStringBuilder = new SpannableStringBuilder((endDateLabel + endDate));
- // Create a red foreground color span. The deprecated `getResources().getColor` must be used until the minimum API >= 23.
- @SuppressWarnings("deprecation") ForegroundColorSpan redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_a700));
-
- // Create a blue `ForegroundColorSpan`.
+ // Define the color spans.
ForegroundColorSpan blueColorSpan;
+ ForegroundColorSpan redColorSpan;
- // Set a blue color span according to the theme. The deprecated `getResources().getColor` must be used until the minimum API >= 23.
- if (MainWebViewActivity.darkTheme) {
- //noinspection deprecation
- blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
- } else {
- //noinspection deprecation
+ // Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23.
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
+ redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_a700));
+ } else {
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_700));
+ redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900));
}
// Setup the spans to display the certificate information in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction.
case SslError.SSL_UNTRUSTED:
// Change the issued by text view text to red. The deprecated `getResources().getColor` must be used until the minimum API >= 23.
- issuedByTextView.setTextColor(getResources().getColor(R.color.red_a700));
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ issuedByTextView.setTextColor(getResources().getColor(R.color.red_900));
+ } else {
+ issuedByTextView.setTextColor(getResources().getColor(R.color.red_a700));
+ }
// Change the issued by span color to red.
issuedByCNameStringBuilder.setSpan(redColorSpan, cNameLabel.length(), issuedByCNameStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
case SslError.SSL_DATE_INVALID:
// Change the valid dates text view text to red. The deprecated `getResources().getColor` must be used until the minimum API >= 23.
- validDatesTextView.setTextColor(getResources().getColor(R.color.red_a700));
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ validDatesTextView.setTextColor(getResources().getColor(R.color.red_900));
+ } else {
+ validDatesTextView.setTextColor(getResources().getColor(R.color.red_a700));
+ }
// Change the date span colors to red.
startDateStringBuilder.setSpan(redColorSpan, startDateLabel.length(), startDateStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
// This must run asynchronously because it involves a network request. `String` declares the parameters. `Void` does not declare progress units. `SpannableStringBuilder` contains the results.
private static class GetIpAddresses extends AsyncTask<String, Void, SpannableStringBuilder> {
// The weak references are used to determine if the activity or the alert dialog have disappeared while the AsyncTask is running.
- private WeakReference<Activity> activityWeakReference;
- private WeakReference<AlertDialog> alertDialogWeakReference;
+ private
final WeakReference<Activity> activityWeakReference;
+ private
final WeakReference<AlertDialog> alertDialogWeakReference;
GetIpAddresses(Activity activity, AlertDialog alertDialog) {
// Populate the weak references.
// Add each IP address to the string builder.
for (InetAddress inetAddress : inetAddressesArray) {
- if (ipAddresses.length() == 0) { // This is the first IP address.
- // Add the IP Address to the string builder.
- ipAddresses.append(inetAddress.getHostAddress());
- } else { // This is not the first IP address.
+ // Check to see if this is not the first IP address.
+ if (ipAddresses.length() > 0) {
// Add a line break to the string builder first.
ipAddresses.append("\n");
-
- // Add the IP address to the string builder.
- ipAddresses.append(inetAddress.getHostAddress());
}
+
+ // Add the IP Address to the string builder.
+ ipAddresses.append(inetAddress.getHostAddress());
}
} catch (UnknownHostException exception) {
// Do nothing.
// Create a blue foreground color span.
ForegroundColorSpan blueColorSpan;
+ // Get the current theme status.
+ int currentThemeStatus = activity.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
// Set the blue color span according to the theme. The deprecated `getColor()` must be used until the minimum API >= 23.
- if (MainWebViewActivity.darkTheme) {
- //noinspection deprecation
- blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.blue_400));
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+ blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.violet_500));
} else {
- //noinspection deprecation
blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.blue_700));
}
// Get a handle for the IP addresses text view.
TextView ipAddressesTextView = alertDialog.findViewById(R.id.ip_addresses);
+ // Remove the incorrect lint warning below that the view might be null.
+ assert ipAddressesTextView != null;
+
// Populate the IP addresses text view.
ipAddressesTextView.setText(ipAddresses);
}
projects / PrivacyBrowserAndroid.git / blobdiff