status-im
/
react-native-webview
mirror of https://github.com/status-im/react-native-webview.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(android): duplicate `setWebChromeClient()` overwrite (#1417)

This commit is contained in:
Jacob Müller 2020-05-29 18:21:24 +02:00 committed by GitHub
parent d55b25c09e
commit 2f8c4c5067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java
View File

@ -409,7 +409,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
public void setMessagingModuleName(WebView view, String moduleName) { public void setMessagingModuleName(WebView view, String moduleName) {
((RNCWebView) view).setMessagingModuleName(moduleName); ((RNCWebView) view).setMessagingModuleName(moduleName);
} }
@ReactProp(name = "incognito") @ReactProp(name = "incognito")
public void setIncognito(WebView view, boolean enabled) { public void setIncognito(WebView view, boolean enabled) {
// Remove all previous cookies // Remove all previous cookies
@ -660,7 +660,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
public Bitmap getDefaultVideoPoster() { public Bitmap getDefaultVideoPoster() {
return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888); return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
} }
@Override @Override
public void onShowCustomView(View view, CustomViewCallback callback) { public void onShowCustomView(View view, CustomViewCallback callback) {
if (mVideoView != null) { if (mVideoView != null) {
@ -1086,8 +1086,10 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
} }
} }
WebChromeClient mWebChromeClient;
@Override @Override
public void setWebChromeClient(WebChromeClient client) { public void setWebChromeClient(WebChromeClient client) {
this.mWebChromeClient = client;
super.setWebChromeClient(client); super.setWebChromeClient(client);
if (client instanceof RNCWebChromeClient) { if (client instanceof RNCWebChromeClient) {
((RNCWebChromeClient) client).setProgressChangedFilter(progressChangedFilter); ((RNCWebChromeClient) client).setProgressChangedFilter(progressChangedFilter);
@ -1234,16 +1236,9 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
destroy(); destroy();
} }
WebChromeClient mWebChromeClient;
@Override
public void setWebChromeClient(WebChromeClient client) {
this.mWebChromeClient = client;
super.setWebChromeClient(client);
}
@Override @Override
public void destroy() { public void destroy() {
if(mWebChromeClient!=null){ if (mWebChromeClient != null) {
mWebChromeClient.onHideCustomView(); mWebChromeClient.onHideCustomView();
} }
super.destroy(); super.destroy();