X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FAboutDialog.java;h=44d3ac0868c0f79f6e404147f3acf4185ef38d54;hb=e90fe1c8be4ede280e8f9e4b17710330f11f9355;hp=ed6f8c3153eac4e9214579a016ead6e156820a1a;hpb=bcd01c3400c860a20621bd969dbd0243c3362908;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java b/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java
index ed6f8c31..44d3ac08 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
  *
@@ -26,10 +26,11 @@ import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDialogFragment;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 public class AboutDialog extends AppCompatDialogFragment {
-    // onCreateDialog requires @NonNull.
     @Override
+    // onCreateDialog requires @NonNull.
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Create a WebView to display about_text.html
@@ -37,7 +38,7 @@ public class AboutDialog extends AppCompatDialogFragment {
         aboutDialogWebView.loadUrl("file:///android_asset/about_text.html");
 
         // Use AlertDialog.Builder to create the AlertDialog
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
         alertDialogBuilder.setTitle(R.string.about_privacy_browser);
         alertDialogBuilder.setView(aboutDialogWebView);
         alertDialogBuilder.setPositiveButton(R.string.dismiss, new DialogInterface.OnClickListener() {
@@ -51,6 +52,16 @@ public class AboutDialog extends AppCompatDialogFragment {
         final AlertDialog alertDialog = alertDialogBuilder.create();
         alertDialog.show();
 
+        aboutDialogWebView.setWebViewClient(new WebViewClient() {
+            // shouldOverrideUrlLoading lets us close AboutDialog when a link is touched.  Otherwise the dialog covers the website that loads beneath in Privacy Browser.
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                MainWebView.mainWebView.loadUrl(url);
+                alertDialog.dismiss();
+                return true;
+            }
+        });
+
         // onCreateDialog requires the return of an AlertDialog.
         return alertDialog;
     }