kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 20:54:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1623 from kiwix/feature/macgills/1618-webview-error-behind-dialog

Browse Source 
#1618 Error displayed behind authorization request - prevent loading …
This commit is contained in:
Kelson 2019-12-08 20:29:06 +01:00 committed by GitHub
commit e738ea39c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
View File

@ -379,11 +379,11 @@ public abstract class CoreMainActivity extends BaseActivity
}
if (intent.hasExtra(EXTRA_CHOSE_X_URL)) {
newMainPageTab();
getCurrentWebView().loadUrl(intent.getStringExtra(EXTRA_CHOSE_X_URL));
loadUrlWithCurrentWebview(intent.getStringExtra(EXTRA_CHOSE_X_URL));
}
if (intent.hasExtra(EXTRA_CHOSE_X_TITLE)) {
newMainPageTab();
getCurrentWebView().loadUrl(intent.getStringExtra(EXTRA_CHOSE_X_TITLE));
loadUrlWithCurrentWebview(intent.getStringExtra(EXTRA_CHOSE_X_TITLE));
}
}
@ -467,7 +467,7 @@ public abstract class CoreMainActivity extends BaseActivity
@Override
public void onSectionClick(View view, int position) {
getCurrentWebView().loadUrl("javascript:document.getElementById('"
loadUrlWithCurrentWebview("javascript:document.getElementById('"
+ documentSections.get(position).id
+ "').scrollIntoView();");
drawerLayout.closeDrawers();
@ -727,7 +727,17 @@ public abstract class CoreMainActivity extends BaseActivity
}
private void updateTableOfContents() {
getCurrentWebView().loadUrl("javascript:(" + documentParserJs + ")()");
loadUrlWithCurrentWebview("javascript:(" + documentParserJs + ")()");
}
private void loadUrlWithCurrentWebview(String url) {
loadUrl(url, getCurrentWebView());
}
private void loadUrl(String url, KiwixWebView webview) {
if (url != null && !url.endsWith("null")) {
webview.loadUrl(url);
}
}
private KiwixWebView getWebView(String url) {
@ -742,7 +752,7 @@ public abstract class CoreMainActivity extends BaseActivity
this, this, attrs, root, videoView, createWebClient(this, zimReaderContainer),
sharedPreferenceUtil);
}
webView.loadUrl(url);
loadUrl(url, webView);
webView.loadPrefs();
return webView;
}
@ -1292,7 +1302,7 @@ public abstract class CoreMainActivity extends BaseActivity
private void openArticle(String articleUrl) {
if (articleUrl != null) {
getCurrentWebView().loadUrl(redirectOrOriginal(contentUrl(articleUrl)));
loadUrlWithCurrentWebview(redirectOrOriginal(contentUrl(articleUrl)));
}
}
@ -1441,9 +1451,9 @@ public abstract class CoreMainActivity extends BaseActivity
}
newMainPageTab();
if (url != null) {
getCurrentWebView().loadUrl(url);
loadUrlWithCurrentWebview(url);
} else if (title != null) {
getCurrentWebView().loadUrl(zimReaderContainer.getPageUrlFromTitle(title));
loadUrlWithCurrentWebview(zimReaderContainer.getPageUrlFromTitle(title));
}
}
}