summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2015-09-19 21:01:54 +0200
committerMartin Fietz <Martin.Fietz@gmail.com>2015-09-19 21:01:54 +0200
commitff9cc13b6a92ac1855ad1e9c36a71d195f4ec3e2 (patch)
tree1e1dd3f248d153b04b3d9d88c926e98b27ba39b2 /app
parent1b232992f9c35fd228af4ed0dc941caa502f3da2 (diff)
downloadAntennaPod-ff9cc13b6a92ac1855ad1e9c36a71d195f4ec3e2.zip
Fix about link handling
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java14
1 files changed, 10 insertions, 4 deletions
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();
}