Skip to content
Snippets Groups Projects
Unverified Commit ef0ce38b authored by mueller-ma's avatar mueller-ma Committed by GitHub
Browse files

Fix selection of HABPanel panel (#1214)


and one NPE.

Fixes #1207

Signed-off-by: default avatarmueller-ma <mueller-ma@users.noreply.github.com>
parent cd7aaa47
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,7 @@ import android.view.LayoutInflater; ...@@ -26,6 +26,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewStub; import android.view.ViewStub;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceError; import android.webkit.WebResourceError;
import android.webkit.WebResourceRequest; import android.webkit.WebResourceRequest;
import android.webkit.WebView; import android.webkit.WebView;
...@@ -720,7 +721,7 @@ public abstract class ContentController implements PageConnectionHolderFragment. ...@@ -720,7 +721,7 @@ public abstract class ContentController implements PageConnectionHolderFragment.
TextView error = view.findViewById(R.id.empty_message); TextView error = view.findViewById(R.id.empty_message);
error.setText(getString(mErrorMessage)); error.setText(getString(mErrorMessage));
if (savedInstanceState != null) { if (savedInstanceState != null) {
loadWebsite(savedInstanceState.getString(KEY_CURRENT_URL, "")); loadWebsite(savedInstanceState.getString(KEY_CURRENT_URL, mUrltoLoad));
} else { } else {
loadWebsite(); loadWebsite();
} }
...@@ -728,8 +729,10 @@ public abstract class ContentController implements PageConnectionHolderFragment. ...@@ -728,8 +729,10 @@ public abstract class ContentController implements PageConnectionHolderFragment.
@Override @Override
public void onSaveInstanceState(@NonNull Bundle outState) { public void onSaveInstanceState(@NonNull Bundle outState) {
if (mWebview != null) {
outState.putString(KEY_CURRENT_URL, mWebview.getUrl()); outState.putString(KEY_CURRENT_URL, mWebview.getUrl());
} }
}
private void loadWebsite() { private void loadWebsite() {
loadWebsite(mUrltoLoad); loadWebsite(mUrltoLoad);
...@@ -782,6 +785,7 @@ public abstract class ContentController implements PageConnectionHolderFragment. ...@@ -782,6 +785,7 @@ public abstract class ContentController implements PageConnectionHolderFragment.
updateViewVisibility(true, false); updateViewVisibility(true, false);
} }
}); });
mWebview.setWebChromeClient(new WebChromeClient());
mWebview.getSettings().setDomStorageEnabled(true); mWebview.getSettings().setDomStorageEnabled(true);
mWebview.getSettings().setJavaScriptEnabled(true); mWebview.getSettings().setJavaScriptEnabled(true);
mWebview.loadUrl(url); mWebview.loadUrl(url);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment