From ff9cc13b6a92ac1855ad1e9c36a71d195f4ec3e2 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sat, 19 Sep 2015 21:01:54 +0200
Subject: Fix about link handling

---
 .../java/de/danoeh/antennapod/activity/AboutActivity.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
index df764e829..fe31ccda8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
@@ -57,9 +57,13 @@ public class AboutActivity extends ActionBarActivity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                url = url.replace("file:///android_asset/", "");
-                loadAsset(url);
-                return true;
+                if(url.startsWith("http")) {
+                    return false;
+                } else {
+                    url = url.replace("file:///android_asset/", "");
+                    loadAsset(url);
+                    return true;
+                }
             }
 
         });
@@ -126,8 +130,10 @@ public class AboutActivity extends ActionBarActivity {
 
     @Override
     public void onBackPressed() {
-        if(showingLicense) {
+        if(showingLicense || webview.canGoBack()) {
             loadAsset("about.html");
+        } else if(webview.canGoBack()) {
+            webview.goBack();
         } else {
             super.onBackPressed();
         }
-- 
cgit v1.2.3