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

Fix back press issue

This commit is contained in:
ydinath 2018-05-05 17:35:43 -04:00
parent bb5f459744
commit ce1f0620fe
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}