From 2f8c4c506725b3f17d352317f6c7ce28a6917bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20M=C3=BCller?= Date: Fri, 29 May 2020 18:21:24 +0200 Subject: [PATCH] fix(android): duplicate `setWebChromeClient()` overwrite (#1417) --- .../webview/RNCWebViewManager.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java index 090a845..0a57f4f 100644 --- a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java +++ b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java @@ -409,7 +409,7 @@ public class RNCWebViewManager extends SimpleViewManager { public void setMessagingModuleName(WebView view, String moduleName) { ((RNCWebView) view).setMessagingModuleName(moduleName); } - + @ReactProp(name = "incognito") public void setIncognito(WebView view, boolean enabled) { // Remove all previous cookies @@ -660,7 +660,7 @@ public class RNCWebViewManager extends SimpleViewManager { public Bitmap getDefaultVideoPoster() { return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888); } - + @Override public void onShowCustomView(View view, CustomViewCallback callback) { if (mVideoView != null) { @@ -1086,8 +1086,10 @@ public class RNCWebViewManager extends SimpleViewManager { } } + WebChromeClient mWebChromeClient; @Override public void setWebChromeClient(WebChromeClient client) { + this.mWebChromeClient = client; super.setWebChromeClient(client); if (client instanceof RNCWebChromeClient) { ((RNCWebChromeClient) client).setProgressChangedFilter(progressChangedFilter); @@ -1234,16 +1236,9 @@ public class RNCWebViewManager extends SimpleViewManager { destroy(); } - WebChromeClient mWebChromeClient; - @Override - public void setWebChromeClient(WebChromeClient client) { - this.mWebChromeClient = client; - super.setWebChromeClient(client); - } - @Override public void destroy() { - if(mWebChromeClient!=null){ + if (mWebChromeClient != null) { mWebChromeClient.onHideCustomView(); } super.destroy();