Fixed Android RendererPriorityPolicy.waivedWhenNotVisible type 'Null' is not a subtype of type 'bool' #1334
This commit is contained in:
parent
4955443e6c
commit
25cb58dce7
|
@ -3,6 +3,7 @@
|
||||||
- Fixed missing `PullToRefreshController.isRefreshing` iOS implementation
|
- Fixed missing `PullToRefreshController.isRefreshing` iOS implementation
|
||||||
- Fixed Android `PullToRefreshController.setEnabled` at runtime
|
- Fixed Android `PullToRefreshController.setEnabled` at runtime
|
||||||
- Fixed iOS `findNext`
|
- Fixed iOS `findNext`
|
||||||
|
- Fixed Android `RendererPriorityPolicy.waivedWhenNotVisible` type 'Null' is not a subtype of type 'bool'
|
||||||
|
|
||||||
## 5.4.4+3
|
## 5.4.4+3
|
||||||
|
|
||||||
|
|
|
@ -360,10 +360,6 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
|
||||||
setRendererPriorityPolicy(
|
setRendererPriorityPolicy(
|
||||||
(int) options.rendererPriorityPolicy.get("rendererRequestedPriority"),
|
(int) options.rendererPriorityPolicy.get("rendererRequestedPriority"),
|
||||||
(boolean) options.rendererPriorityPolicy.get("waivedWhenNotVisible"));
|
(boolean) options.rendererPriorityPolicy.get("waivedWhenNotVisible"));
|
||||||
} else if ((options.rendererPriorityPolicy == null || (options.rendererPriorityPolicy != null && options.rendererPriorityPolicy.isEmpty())) &&
|
|
||||||
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
|
||||||
options.rendererPriorityPolicy.put("rendererRequestedPriority", getRendererRequestedPriority());
|
|
||||||
options.rendererPriorityPolicy.put("waivedWhenNotVisible", getRendererPriorityWaivedWhenNotVisible());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
contentBlockerHandler.getRuleList().clear();
|
contentBlockerHandler.getRuleList().clear();
|
||||||
|
@ -939,9 +935,9 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
|
||||||
if (newOptionsMap.get("networkAvailable") != null && options.networkAvailable != newOptions.networkAvailable)
|
if (newOptionsMap.get("networkAvailable") != null && options.networkAvailable != newOptions.networkAvailable)
|
||||||
setNetworkAvailable(newOptions.networkAvailable);
|
setNetworkAvailable(newOptions.networkAvailable);
|
||||||
|
|
||||||
if (newOptionsMap.get("rendererPriorityPolicy") != null &&
|
if (newOptionsMap.get("rendererPriorityPolicy") != null && (options.rendererPriorityPolicy == null ||
|
||||||
(options.rendererPriorityPolicy.get("rendererRequestedPriority") != newOptions.rendererPriorityPolicy.get("rendererRequestedPriority") ||
|
(options.rendererPriorityPolicy.get("rendererRequestedPriority") != newOptions.rendererPriorityPolicy.get("rendererRequestedPriority") ||
|
||||||
options.rendererPriorityPolicy.get("waivedWhenNotVisible") != newOptions.rendererPriorityPolicy.get("waivedWhenNotVisible")) &&
|
options.rendererPriorityPolicy.get("waivedWhenNotVisible") != newOptions.rendererPriorityPolicy.get("waivedWhenNotVisible"))) &&
|
||||||
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
setRendererPriorityPolicy(
|
setRendererPriorityPolicy(
|
||||||
(int) newOptions.rendererPriorityPolicy.get("rendererRequestedPriority"),
|
(int) newOptions.rendererPriorityPolicy.get("rendererRequestedPriority"),
|
||||||
|
|
|
@ -95,7 +95,8 @@ public class InAppWebViewOptions implements Options<InAppWebViewInterface> {
|
||||||
public Integer scrollBarDefaultDelayBeforeFade = null;
|
public Integer scrollBarDefaultDelayBeforeFade = null;
|
||||||
public Boolean scrollbarFadingEnabled = true;
|
public Boolean scrollbarFadingEnabled = true;
|
||||||
public Integer scrollBarFadeDuration = null;
|
public Integer scrollBarFadeDuration = null;
|
||||||
public Map<String, Object> rendererPriorityPolicy = new HashMap<>();
|
@Nullable
|
||||||
|
public Map<String, Object> rendererPriorityPolicy = null;
|
||||||
public Boolean useShouldInterceptRequest = false;
|
public Boolean useShouldInterceptRequest = false;
|
||||||
public Boolean useOnRenderProcessGone = false;
|
public Boolean useOnRenderProcessGone = false;
|
||||||
public Boolean disableDefaultErrorPage = false;
|
public Boolean disableDefaultErrorPage = false;
|
||||||
|
|
Loading…
Reference in New Issue