Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let webview handle if it can go back. When navigating the links, depth would increment, but never return to 0, and then get stuck on the about page.

This commit is contained in:
heckler01 2018-04-11 20:49:21 -04:00 committed by ydinath
parent 00ace172fc
commit b3d8a4c69f
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java
View File

@ -36,8 +36,6 @@ public class AboutActivity extends AppCompatActivity {
private WebView webview;
private LinearLayout webviewContainer;
private int depth = 0;
private Subscription subscription;
@Override
@ -60,14 +58,12 @@ public class AboutActivity extends AppCompatActivity {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
if(url.startsWith("http")) {
depth++;
return false;
} else {
if (!url.startsWith("http")) {
url = url.replace("file:///android_asset/", "");
loadAsset(url);
return true;
}
return false;
}
});
@ -105,9 +101,6 @@ public class AboutActivity extends AppCompatActivity {
" </style>" +
"</head><body><p>" + webViewData + "</p></body></html>";
webViewData = webViewData.replace("\n", "<br/>");
depth++;
} else {
depth = 0;
}
webViewData = String.format(webViewData, colorString);
return webViewData;
@ -129,10 +122,7 @@ public class AboutActivity extends AppCompatActivity {
@Override
public void onBackPressed() {
Log.d(TAG, "depth: " + depth);
if(depth == 1) {
loadAsset("about.html");
} else if(depth > 1) {
if (webview.canGoBack()) {
webview.goBack();
} else {
super.onBackPressed();