X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FAboutDialog.java;h=44d3ac0868c0f79f6e404147f3acf4185ef38d54;hp=5cedfd6d28af410013ec183ae2bcf8d22b4fd38c;hb=e90fe1c8be4ede280e8f9e4b17710330f11f9355;hpb=dcc9119811a9eed34df55da205c55c3092c262a4 diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java b/app/src/main/java/com/stoutner/privacybrowser/AboutDialog.java index 5cedfd6d..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 . + * Copyright 2015-2016 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -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 @@ -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; }