X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FViewSslCertificateDialog.java;h=90a13271993f2cd24759d7a38c9535c69b833309;hp=8decfca9bb7354b210dee5acd1c19f34db3092b3;hb=0a5d2eabceeafb49a957598538aa74d4f11dfce0;hpb=2e89243b891eaa56a55a992c3513a337236f56e6

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 8decfca9..90a13271 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-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -32,6 +32,7 @@ import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
+import android.view.WindowManager;
 import android.widget.TextView;
 
 import com.stoutner.privacybrowser.activities.MainWebViewActivity;
@@ -51,7 +52,7 @@ public class ViewSslCertificateDialog extends DialogFragment {
         // Create a drawable version of the favorite icon.
         Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), MainWebViewActivity.favoriteIconBitmap);
 
-        // Use `AlertDialog.Builder` to create the `AlertDialog`.
+        // Use a builder to create the alert dialog.
         AlertDialog.Builder dialogBuilder;
 
         // Set the style according to the theme.
@@ -64,7 +65,7 @@ public class ViewSslCertificateDialog extends DialogFragment {
         // Set the icon.
         dialogBuilder.setIcon(favoriteIconDrawable);
 
-        // Set an `onClick` listener on the negative button.  Using `null` closes the dialog without doing anything else.
+        // Set a listener on the negative button.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.close, null);
 
         // Check to see if the website is encrypted.
@@ -75,11 +76,17 @@ public class ViewSslCertificateDialog extends DialogFragment {
             // Set the Layout.  The parent view is `null` because it will be assigned by `AlertDialog`.
             dialogBuilder.setView(layoutInflater.inflate(R.layout.unencrypted_website, null));
 
-            // Create an `AlertDialog` from the `AlertDialog.Builder`
+            // Create an alert dialog from the alert dialog builder.
             final AlertDialog alertDialog = dialogBuilder.create();
 
-            // Show `alertDialog`.
-            alertDialog.show();
+            // Disable screenshots if not allowed.
+            if (!MainWebViewActivity.allowScreenshots) {
+                // Remove the warning below that `getWindow()` might be null.
+                assert alertDialog.getWindow() != null;
+
+                // Disable screenshots.
+                alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+            }
 
             // `onCreateDialog` requires the return of an `AlertDialog`.
             return alertDialog;
@@ -91,22 +98,31 @@ public class ViewSslCertificateDialog extends DialogFragment {
             // 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));
 
-            // Create an `AlertDialog` from the `AlertDialog.Builder`
+            // Create an alert dialog from the builder.
             final AlertDialog alertDialog = dialogBuilder.create();
 
-            // The `AlertDialog` must be shown before items in the layout can be modified.
+            // Disable screenshots if not allowed.
+            if (!MainWebViewActivity.allowScreenshots) {
+                // Remove the warning below that `getWindow()` might be null.
+                assert alertDialog.getWindow() != null;
+
+                // Disable screenshots.
+                alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+            }
+
+            // The alert dialog must be shown before items in the layout can be modified.
             alertDialog.show();
 
             // Get handles for the `TextViews`.
-            TextView domainTextView = (TextView) alertDialog.findViewById(R.id.domain);
-            TextView issuedToCNameTextView = (TextView) alertDialog.findViewById(R.id.issued_to_cname);
-            TextView issuedToONameTextView = (TextView) alertDialog.findViewById(R.id.issued_to_oname);
-            TextView issuedToUNameTextView = (TextView) alertDialog.findViewById(R.id.issued_to_uname);
-            TextView issuedByCNameTextView = (TextView) alertDialog.findViewById(R.id.issued_by_cname);
-            TextView issuedByONameTextView = (TextView) alertDialog.findViewById(R.id.issued_by_oname);
-            TextView issuedByUNameTextView = (TextView) alertDialog.findViewById(R.id.issued_by_uname);
-            TextView startDateTextView = (TextView) alertDialog.findViewById(R.id.start_date);
-            TextView endDateTextView = (TextView) alertDialog.findViewById(R.id.end_date);
+            TextView domainTextView = alertDialog.findViewById(R.id.domain);
+            TextView issuedToCNameTextView = alertDialog.findViewById(R.id.issued_to_cname);
+            TextView issuedToONameTextView = alertDialog.findViewById(R.id.issued_to_oname);
+            TextView issuedToUNameTextView = alertDialog.findViewById(R.id.issued_to_uname);
+            TextView issuedByCNameTextView = alertDialog.findViewById(R.id.issued_by_cname);
+            TextView issuedByONameTextView = alertDialog.findViewById(R.id.issued_by_oname);
+            TextView issuedByUNameTextView = alertDialog.findViewById(R.id.issued_by_uname);
+            TextView startDateTextView = alertDialog.findViewById(R.id.start_date);
+            TextView endDateTextView = alertDialog.findViewById(R.id.end_date);
 
             // Setup the labels.
             String domainLabel = getString(R.string.domain_label) + "  ";