From ce1f0620fec7edb96cb08b46a3713a12263e5c48 Mon Sep 17 00:00:00 2001 From: ydinath Date: Sat, 5 May 2018 17:35:43 -0400 Subject: Fix back press issue --- .../main/java/de/danoeh/antennapod/activity/AboutActivity.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'app/src/main/java') 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 6715ecf97..b3418e7b2 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java @@ -36,7 +36,6 @@ public class AboutActivity extends AppCompatActivity { private WebView webView; private LinearLayout webViewContainer; private Subscription subscription; - private int depth = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -57,7 +56,6 @@ public class AboutActivity extends AppCompatActivity { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { - depth++; if (!url.startsWith("http")) { url = url.replace("file:///android_asset/", ""); loadAsset(url); @@ -101,8 +99,6 @@ public class AboutActivity extends AppCompatActivity { " " + "

" + webViewData + "

"; webViewData = webViewData.replace("\n", "
"); - } else { - depth = 0; } webViewData = String.format(webViewData, colorString); subscriber.onSuccess(webViewData); @@ -117,16 +113,15 @@ public class AboutActivity extends AppCompatActivity { .observeOn(AndroidSchedulers.mainThread()) .subscribe( webViewData -> - webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "about:blank"), + webView.loadDataWithBaseURL("file:///android_asset/", webViewData.toString(), "text/html", "utf-8", "file:///android_asset/" + webViewData.toString()), error -> Log.e(TAG, Log.getStackTraceString(error)) ); } @Override public void onBackPressed() { - if (depth != 0) { + if (webView.canGoBack()) { webView.goBack(); - depth--; } else { super.onBackPressed(); } -- cgit v1.2.3