Fix for trac ticket #2485.

This commit is contained in:
meeh
2019-05-01 12:59:56 +00:00
parent 6c0a60892f
commit b73b72c9c8

View File

@ -49,19 +49,21 @@ public class WebFragment extends I2PFragmentBase {
wv.getSettings().setBuiltInZoomControls(true); wv.getSettings().setBuiltInZoomControls(true);
// http://stackoverflow.com/questions/2369310/webview-double-tap-zoom-not-working-on-a-motorola-droid-a855 // http://stackoverflow.com/questions/2369310/webview-double-tap-zoom-not-working-on-a-motorola-droid-a855
wv.getSettings().setUseWideViewPort(true); wv.getSettings().setUseWideViewPort(true);
_uriStr = getArguments().getString(HTML_URI); if (getArguments() != null) {
if (_uriStr != null) { _uriStr = getArguments().getString(HTML_URI);
Uri uri = Uri.parse(_uriStr); if (_uriStr != null) {
//wv.getSettings().setLoadsImagesAutomatically(true); Uri uri = Uri.parse(_uriStr);
//wv.loadUrl(uri.toString()); //wv.getSettings().setLoadsImagesAutomatically(true);
// go thru the client so .i2p will work too //wv.loadUrl(uri.toString());
_wvClient.shouldOverrideUrlLoading(wv, uri.toString()); // go thru the client so .i2p will work too
} else { _wvClient.shouldOverrideUrlLoading(wv, uri.toString());
wv.getSettings().setLoadsImagesAutomatically(false); } else {
int id = getArguments().getInt(HTML_RESOURCE_ID, 0); wv.getSettings().setLoadsImagesAutomatically(false);
// no default, so restart should keep previous view int id = getArguments().getInt(HTML_RESOURCE_ID, 0);
if (id != 0) // no default, so restart should keep previous view
loadResource(wv, id); if (id != 0)
loadResource(wv, id);
}
} }
return v; return v;
} }