diff options
| author | ydinath <ydinath@gmail.com> | 2018-05-05 17:35:43 -0400 |
|---|---|---|
| committer | ydinath <ydinath@gmail.com> | 2018-05-05 17:35:43 -0400 |
| commit | ce1f0620fec7edb96cb08b46a3713a12263e5c48 (patch) | |
| tree | 9889bf6bac8ddf5c3d59c3f0279c84c55373668a /app/src/main/java | |
| parent | bb5f4597442d061719b934ee31510aea8c1b5d9a (diff) | |
| download | AntennaPod-ce1f0620fec7edb96cb08b46a3713a12263e5c48.zip | |
Fix back press issue
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java | 9 |
1 files changed, 2 insertions, 7 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 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 { " </style>" + "</head><body><p>" + webViewData + "</p></body></html>"; webViewData = webViewData.replace("\n", "<br/>"); - } 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(); } |