X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FViewSslCertificateDialog.java;h=b7f0b487246e05bb601efad0346c71eb9381de44;hb=b55485cdd89be2ad6291f58be79ad839762867b8;hp=b88ef7666453932546f93e7a51461ae82a26f578;hpb=ca7516a7edb9e06d0f9fe9186513986cd82be716;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java index b88ef766..b7f0b487 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewSslCertificateDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2019 Soren Stoutner . + * Copyright © 2016-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -51,8 +51,6 @@ import java.text.DateFormat; import java.util.Calendar; import java.util.Date; -// `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. -@SuppressLint("InflateParams") public class ViewSslCertificateDialog extends DialogFragment { public static ViewSslCertificateDialog displayDialog(long webViewFragmentId) { // Create an arguments bundle. @@ -71,6 +69,8 @@ public class ViewSslCertificateDialog extends DialogFragment { return viewSslCertificateDialog; } + // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. + @SuppressLint("InflateParams") @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { @@ -88,7 +88,7 @@ public class ViewSslCertificateDialog extends DialogFragment { // Get the arguments. Bundle arguments = getArguments(); - // Remove the incorrect lint warning below that `getLong()` might be null. + // Remove the incorrect lint warning below that the arguments might be null. assert arguments != null; // Get the current position of this WebView fragment. @@ -141,8 +141,8 @@ public class ViewSslCertificateDialog extends DialogFragment { // Set the title. dialogBuilder.setTitle(R.string.unencrypted_website); - // Set the Layout. The parent view is `null` because it will be assigned by `AlertDialog`. - dialogBuilder.setView(layoutInflater.inflate(R.layout.unencrypted_website, null)); + // Set the Layout. The parent view is `null` because it will be assigned by the alert dialog. + dialogBuilder.setView(layoutInflater.inflate(R.layout.unencrypted_website_dialog, null)); // Create an alert dialog from the alert dialog builder. final AlertDialog alertDialog = dialogBuilder.create(); @@ -158,13 +158,12 @@ public class ViewSslCertificateDialog extends DialogFragment { // `onCreateDialog` requires the return of an `AlertDialog`. return alertDialog; - } else { // Display the SSL certificate information // Set the title. dialogBuilder.setTitle(R.string.ssl_certificate); - // Set the layout. The parent view is `null` because it will be assigned by `AlertDialog`. - dialogBuilder.setView(layoutInflater.inflate(R.layout.view_ssl_certificate, null)); + // Set the layout. The parent view is `null` because it will be assigned by the alert dialog. + dialogBuilder.setView(layoutInflater.inflate(R.layout.view_ssl_certificate_dialog, null)); // Create an alert dialog from the builder. final AlertDialog alertDialog = dialogBuilder.create();