react-native-webview-bootpay 13.8.42 → 13.13.4

package/android/src/main/java/kr/co/bootpay/webview/BPCWebView.java

@@ -1,16 +1,11 @@
 package kr.co.bootpay.webview;
 
-import androidx.annotation.Nullable;
+import android.app.Dialog;
 
 import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
 import android.graphics.Rect;
-import android.os.Build;
+import android.net.Uri;
 import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Log;
-
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -22,9 +17,17 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.webkit.JavaScriptReplyProxy;
+import androidx.webkit.WebMessageCompat;
+import androidx.webkit.WebViewCompat;
+import androidx.webkit.WebViewFeature;
+
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
@@ -32,46 +35,46 @@ import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.ContentSizeChangeEvent;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.views.scroll.OnScrollDispatchHelper;
 import com.facebook.react.views.scroll.ScrollEvent;
 import com.facebook.react.views.scroll.ScrollEventType;
 import kr.co.bootpay.webview.events.TopCustomMenuSelectionEvent;
-import kr.co.bootpay.webview.events.TopLoadingProgressEvent;
 import kr.co.bootpay.webview.events.TopMessageEvent;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class BPCWebView extends WebView implements LifecycleEventListener {
     protected @Nullable
     String injectedJS;
     protected @Nullable
     String injectedJSBeforeContentLoaded;
+    
+    protected @Nullable
+    BPCWebViewBridge fallbackBridge;
     protected @Nullable
-    BPCWebViewBridge bridge;
+    WebViewCompat.WebMessageListener bridgeListener = null;
 
+    /** bootpay added start ***/
+    protected static final String JAVASCRIPT_INTERFACE = "BootpayRNWebView";
 
-  /** bootpay added start ***/
-  protected static final String JAVASCRIPT_INTERFACE = "BootpayRNWebView";
-  Dialog dialog; //popup dialog
-  public void setDialog(Dialog dialog) {
-    this.dialog = dialog;
-  }
+    // protected static final String JAVASCRIPT_INTERFACE = "ReactNativeWebView";
+    
+    Dialog dialog; //popup dialog
+    public void setDialog(Dialog dialog) {
+      this.dialog = dialog;
+    }
 
-  public void dissmissDialog() {
-    if(this.dialog != null) this.dialog.dismiss();
-    this.dialog = null;
-  }
+    public void dissmissDialog() {
+      if(this.dialog != null) this.dialog.dismiss();
+      this.dialog = null;
+    }
   /** bootpay added end ***/
 
     /**
@@ -85,9 +88,9 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
     protected @Nullable
     String messagingModuleName;
     protected @Nullable
-    BPCWebViewClient mBPCWebViewClient;
+    BPCWebViewMessagingModule mMessagingJSModule;
     protected @Nullable
-    CatalystInstance mCatalystInstance;
+    BPCWebViewClient mBPCWebViewClient;
     protected boolean sendContentSizeChangeEvents = false;
     private OnScrollDispatchHelper mOnScrollDispatchHelper;
     protected boolean hasScrollEvent = false;
@@ -102,7 +105,7 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
      */
     public BPCWebView(ThemedReactContext reactContext) {
         super(reactContext);
-        this.createCatalystInstance();
+        mMessagingJSModule = ((ThemedReactContext) this.getContext()).getReactApplicationContext().getJSModule(BPCWebViewMessagingModule.class);
         progressChangedFilter = new ProgressChangedFilter();
     }
 
@@ -157,7 +160,7 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
             dispatchEvent(
                     this,
                     new ContentSizeChangeEvent(
-                            this.getId(),
+                            BPCWebViewWrapper.getReactTagFromWebView(this),
                             w,
                             h
                     )
@@ -208,7 +211,7 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
                   selectionText = new JSONObject(selectionJson).getString("selection");
                 } catch (JSONException ignored) {}
                 wMap.putString("selectedText", selectionText);
-                dispatchEvent(BPCWebView.this, new TopCustomMenuSelectionEvent(BPCWebView.this.getId(), wMap));
+                dispatchEvent(BPCWebView.this, new TopCustomMenuSelectionEvent(BPCWebViewWrapper.getReactTagFromWebView(BPCWebView.this), wMap));
                 mode.finish();
               }
             }
@@ -266,20 +269,45 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
         return this.messagingEnabled;
     }
 
-    protected BPCWebViewBridge createBPCWebViewBridge(BPCWebView webView) {
-        if (bridge == null) {
-            bridge = new BPCWebViewBridge(webView);
-            addJavascriptInterface(bridge, JAVASCRIPT_INTERFACE);
+    protected void createBPCWebViewBridge(BPCWebView webView) {
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)){
+          if (this.bridgeListener == null) {
+            this.bridgeListener = new WebViewCompat.WebMessageListener() {
+              @Override
+              public void onPostMessage(@NonNull WebView view, @NonNull WebMessageCompat message, @NonNull Uri sourceOrigin, boolean isMainFrame, @NonNull JavaScriptReplyProxy replyProxy) {
+                BPCWebView.this.onMessage(message.getData(), sourceOrigin.toString());
+              }
+            };
+            WebViewCompat.addWebMessageListener(
+              webView,
+              JAVASCRIPT_INTERFACE,
+              Set.of("*"),
+              this.bridgeListener
+            );
+          }
+        } else {
+          if (fallbackBridge == null) {
+            fallbackBridge = new BPCWebViewBridge(webView);
+            addJavascriptInterface(fallbackBridge, JAVASCRIPT_INTERFACE);
+          }
         }
-        return bridge;
-    }
-
-    protected void createCatalystInstance() {
-      ThemedReactContext reactContext = (ThemedReactContext) this.getContext();
 
-        if (reactContext != null) {
-            mCatalystInstance = reactContext.getCatalystInstance();
-        }
+        //  if (fallbackBridge == null) {
+        //     fallbackBridge = new BPCWebViewBridge(webView);
+        //     addJavascriptInterface(fallbackBridge, JAVASCRIPT_INTERFACE);
+        //   }
+        
+        injectJavascriptObject();
+    }
+
+    private void injectJavascriptObject() {
+      if (getSettings().getJavaScriptEnabled()) {
+        String js = "(function(){\n" +
+          "    window." + JAVASCRIPT_INTERFACE + " = window." + JAVASCRIPT_INTERFACE + " || {};\n" +
+          "    window." + JAVASCRIPT_INTERFACE + ".injectedObjectJson = function () { return " + (injectedJavaScriptObject == null ? null : ("`" + injectedJavaScriptObject + "`")) + "; };\n" +
+          "})();";
+        evaluateJavascriptWithFallback(js);
+      }
     }
 
     @SuppressLint("AddJavascriptInterface")
@@ -304,6 +332,7 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
                 injectedJS != null &&
                 !TextUtils.isEmpty(injectedJS)) {
             evaluateJavascriptWithFallback("(function() {\n" + injectedJS + ";\n})();");
+            injectJavascriptObject(); // re-inject the Javascript object in case it has been overwritten.
         }
     }
 
@@ -312,17 +341,18 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
                 injectedJSBeforeContentLoaded != null &&
                 !TextUtils.isEmpty(injectedJSBeforeContentLoaded)) {
             evaluateJavascriptWithFallback("(function() {\n" + injectedJSBeforeContentLoaded + ";\n})();");
+            injectJavascriptObject();  // re-inject the Javascript object in case it has been overwritten.
         }
     }
 
+    protected String injectedJavaScriptObject = null;
+
     public void setInjectedJavaScriptObject(String obj) {
-        if (getSettings().getJavaScriptEnabled()) {
-            BPCWebViewBridge b = createBPCWebViewBridge(this);
-            b.setInjectedObjectJson(obj);
-        }
+      this.injectedJavaScriptObject = obj;
+      injectJavascriptObject();
     }
 
-    public void onMessage(String message) {
+    public void onMessage(String message, String sourceUrl) {
         ThemedReactContext reactContext = getThemedReactContext();
         BPCWebView mWebView = this;
 
@@ -334,13 +364,13 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
                     if (mBPCWebViewClient == null) {
                         return;
                     }
-                    WritableMap data = mBPCWebViewClient.createWebViewEvent(webView, webView.getUrl());
+                    WritableMap data = mBPCWebViewClient.createWebViewEvent(webView, sourceUrl);
                     data.putString("data", message);
 
-                    if (mCatalystInstance != null) {
-                        mWebView.sendDirectMessage("onMessage", data);
+                    if (mMessagingJSModule != null) {
+                        dispatchDirectMessage(data);
                     } else {
-                        dispatchEvent(webView, new TopMessageEvent(webView.getId(), data));
+                        dispatchEvent(webView, new TopMessageEvent(BPCWebViewWrapper.getReactTagFromWebView(webView), data));
                     }
                 }
             });
@@ -348,22 +378,29 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
             WritableMap eventData = Arguments.createMap();
             eventData.putString("data", message);
 
-            if (mCatalystInstance != null) {
-                this.sendDirectMessage("onMessage", eventData);
+            if (mMessagingJSModule != null) {
+                dispatchDirectMessage(eventData);
             } else {
-                dispatchEvent(this, new TopMessageEvent(this.getId(), eventData));
+                dispatchEvent(this, new TopMessageEvent(BPCWebViewWrapper.getReactTagFromWebView(this), eventData));
             }
         }
     }
 
-    protected void sendDirectMessage(final String method, WritableMap data) {
+    protected void dispatchDirectMessage(WritableMap data) {
         WritableNativeMap event = new WritableNativeMap();
         event.putMap("nativeEvent", data);
+        event.putString("messagingModuleName", messagingModuleName);
 
-        WritableNativeArray params = new WritableNativeArray();
-        params.pushMap(event);
+        mMessagingJSModule.onMessage(event);
+    }
 
-        mCatalystInstance.callFunction(messagingModuleName, method, params);
+    protected boolean dispatchDirectShouldStartLoadWithRequest(WritableMap data) {
+        WritableNativeMap event = new WritableNativeMap();
+        event.putMap("nativeEvent", data);
+        event.putString("messagingModuleName", messagingModuleName);
+
+        mMessagingJSModule.onShouldStartLoadWithRequest(event);
+        return true;
     }
 
     protected void onScrollChanged(int x, int y, int oldX, int oldY) {
@@ -379,7 +416,7 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
 
         if (mOnScrollDispatchHelper.onScrollChanged(x, y)) {
             ScrollEvent event = ScrollEvent.obtain(
-                    this.getId(),
+                    BPCWebViewWrapper.getReactTagFromWebView(this),
                     ScrollEventType.SCROLL,
                     x,
                     y,
@@ -396,7 +433,7 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
 
     protected void dispatchEvent(WebView webView, Event event) {
         ThemedReactContext reactContext = getThemedReactContext();
-        int reactTag = webView.getId();
+        int reactTag = BPCWebViewWrapper.getReactTagFromWebView(webView);
         UIManagerHelper.getEventDispatcherForReactTag(reactContext, reactTag).dispatchEvent(event);
     }
 
@@ -417,19 +454,18 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
     return (ThemedReactContext) this.getContext();
   }
 
+  public ReactApplicationContext getReactApplicationContext() {
+      return this.getThemedReactContext().getReactApplicationContext();
+  }
+
   protected class BPCWebViewBridge {
         private String TAG = "BPCWebViewBridge";
         BPCWebView mWebView;
-        String injectedObjectJson;
 
         BPCWebViewBridge(BPCWebView c) {
           mWebView = c;
         }
 
-        public void setInjectedObjectJson(String s) {
-            injectedObjectJson = s;
-        }
-
         /**
          * This method is called whenever JavaScript running within the web view calls:
          * - window[JAVASCRIPT_INTERFACE].postMessage
@@ -437,14 +473,11 @@ public class BPCWebView extends WebView implements LifecycleEventListener {
         @JavascriptInterface
         public void postMessage(String message) {
             if (mWebView.getMessagingEnabled()) {
-                mWebView.onMessage(message);
+                mWebView.onMessage(message, mWebView.getUrl());
             } else {
                 FLog.w(TAG, "ReactNativeWebView.postMessage method was called but messaging is disabled. Pass an onMessage handler to the WebView.");
             }
         }
-
-        @JavascriptInterface
-        public String injectedObjectJson() { return injectedObjectJson; }
     }
 
 

package/android/src/main/java/kr/co/bootpay/webview/BPCWebViewClient.java

@@ -31,10 +31,11 @@ import kr.co.bootpay.webview.events.TopLoadingFinishEvent;
 import kr.co.bootpay.webview.events.TopLoadingStartEvent;
 import kr.co.bootpay.webview.events.TopRenderProcessGoneEvent;
 import kr.co.bootpay.webview.events.TopShouldStartLoadWithRequestEvent;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -61,9 +62,14 @@ public class BPCWebViewClient extends WebViewClient {
     @Override
     public void onPageFinished(WebView webView, String url) {
         super.onPageFinished(webView, url);
-
-        
-        Log.d("bootpay url finish", url);
+        String cookies = CookieManager.getInstance().getCookie(url);
+        if (cookies != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                CookieManager.getInstance().flush();
+            }else {
+                CookieSyncManager.getInstance().sync();
+            }
+        }
 
         if (!mLastLoadFailed) {
             BPCWebView reactWebView = (BPCWebView) webView;
@@ -81,7 +87,7 @@ public class BPCWebViewClient extends WebViewClient {
       ((BPCWebView) webView).dispatchEvent(
         webView,
         new TopLoadingStartEvent(
-          webView.getId(),
+          BPCWebViewWrapper.getReactTagFromWebView(webView),
           createWebViewEvent(webView, url)));
     }
 
@@ -96,60 +102,63 @@ public class BPCWebViewClient extends WebViewClient {
 
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
-        Log.d("bootpay url", url);
 
+    //   Log.i("bootpay url", url);
       if(BootpayUrlHelper.shouldOverrideUrlLoading(view, url)) {
         return true;
       }
+    //   return false;
       return shouldOverrideUrlLoadingRN(view, url);
     }
 
+
+    
     public boolean shouldOverrideUrlLoadingRN(WebView view, String url) {
-      final BPCWebView BPCWebView = (BPCWebView) view;
-      final boolean isJsDebugging = ((ReactContext) view.getContext()).getJavaScriptContextHolder().get() == 0;
-
-      if (!isJsDebugging && BPCWebView.mCatalystInstance != null) {
-        final Pair<Double, AtomicReference<BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState>> lock = BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.getNewLock();
-        final double lockIdentifier = lock.first;
-        final AtomicReference<BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = lock.second;
-
-        final WritableMap event = createWebViewEvent(view, url);
-        event.putDouble("lockIdentifier", lockIdentifier);
-        BPCWebView.sendDirectMessage("onShouldStartLoadWithRequest", event);
-
-        try {
-          assert lockObject != null;
-          synchronized (lockObject) {
-            final long startTime = SystemClock.elapsedRealtime();
-            while (lockObject.get() == BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.UNDECIDED) {
-              if (SystemClock.elapsedRealtime() - startTime > SHOULD_OVERRIDE_URL_LOADING_TIMEOUT) {
-                FLog.w(TAG, "Did not receive response to shouldOverrideUrlLoading in time, defaulting to allow loading.");
+        final BPCWebView BPCWebView = (BPCWebView) view;
+        final boolean isJsDebugging = BPCWebView.getReactApplicationContext().getJavaScriptContextHolder().get() == 0;
+
+        if (!isJsDebugging && BPCWebView.mMessagingJSModule != null) {
+            final Pair<Double, AtomicReference<BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState>> lock = BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.getNewLock();
+            final double lockIdentifier = lock.first;
+            final AtomicReference<BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = lock.second;
+
+            final WritableMap event = createWebViewEvent(view, url);
+            event.putDouble("lockIdentifier", lockIdentifier);
+            BPCWebView.dispatchDirectShouldStartLoadWithRequest(event);
+
+            try {
+                assert lockObject != null;
+                synchronized (lockObject) {
+                    final long startTime = SystemClock.elapsedRealtime();
+                    while (lockObject.get() == BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.UNDECIDED) {
+                        if (SystemClock.elapsedRealtime() - startTime > SHOULD_OVERRIDE_URL_LOADING_TIMEOUT) {
+                            FLog.w(TAG, "Did not receive response to shouldOverrideUrlLoading in time, defaulting to allow loading.");
+                            BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
+                            return false;
+                        }
+                        lockObject.wait(SHOULD_OVERRIDE_URL_LOADING_TIMEOUT);
+                    }
+                }
+            } catch (InterruptedException e) {
+                FLog.e(TAG, "shouldOverrideUrlLoading was interrupted while waiting for result.", e);
                 BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
                 return false;
-              }
-              lockObject.wait(SHOULD_OVERRIDE_URL_LOADING_TIMEOUT);
             }
-          }
-        } catch (InterruptedException e) {
-          FLog.e(TAG, "shouldOverrideUrlLoading was interrupted while waiting for result.", e);
-          BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
-          return false;
-        }
 
-        final boolean shouldOverride = lockObject.get() == BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE;
-        BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
+            final boolean shouldOverride = lockObject.get() == BPCWebViewModuleImpl.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE;
+            BPCWebViewModuleImpl.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
 
-        return shouldOverride;
-      } else {
-        FLog.w(TAG, "Couldn't use blocking synchronous call for onShouldStartLoadWithRequest due to debugging or missing Catalyst instance, falling back to old event-and-load.");
-        progressChangedFilter.setWaitingForCommandLoadUrl(true);
+            return shouldOverride;
+        } else {
+            FLog.w(TAG, "Couldn't use blocking synchronous call for onShouldStartLoadWithRequest due to debugging or missing Catalyst instance, falling back to old event-and-load.");
+            progressChangedFilter.setWaitingForCommandLoadUrl(true);
 
-        int reactTag = view.getId();
-        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) view.getContext(), reactTag).dispatchEvent(new TopShouldStartLoadWithRequestEvent(
-          reactTag,
-          createWebViewEvent(view, url)));
-        return true;
-      }
+            int reactTag = BPCWebViewWrapper.getReactTagFromWebView(view);
+            UIManagerHelper.getEventDispatcherForReactTag((ReactContext) view.getContext(), reactTag).dispatchEvent(new TopShouldStartLoadWithRequestEvent(
+                    reactTag,
+                    createWebViewEvent(view, url)));
+            return true;
+        }
     }
 
     @TargetApi(Build.VERSION_CODES.N)
@@ -182,11 +191,11 @@ public class BPCWebViewClient extends WebViewClient {
         // Undesired behavior: Return value of WebView.getUrl() may be the current URL instead of the failing URL.
         handler.cancel();
 
-        // if (!topWindowUrl.equalsIgnoreCase(failingUrl)) {
-        //     // If error is not due to top-level navigation, then do not call onReceivedError()
-        //     Log.w(TAG, "Resource blocked from loading due to SSL error. Blocked URL: "+failingUrl);
-        //     return;
-        // }
+        if (!topWindowUrl.equalsIgnoreCase(failingUrl)) {
+            // If error is not due to top-level navigation, then do not call onReceivedError()
+            Log.w(TAG, "Resource blocked from loading due to SSL error. Blocked URL: "+failingUrl);
+            return;
+        }
 
         int code = error.getPrimaryError();
         String description = "";
@@ -225,7 +234,6 @@ public class BPCWebViewClient extends WebViewClient {
                 description,
                 failingUrl
         );
-        alertSSLError(webView, handler, error);
     }
 
     void alertSSLError(WebView view, SslErrorHandler handler, SslError error) {
@@ -290,8 +298,8 @@ public class BPCWebViewClient extends WebViewClient {
         eventData.putDouble("code", errorCode);
         eventData.putString("description", description);
 
-        int reactTag = webView.getId();
-        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopLoadingErrorEvent(webView.getId(), eventData));
+        int reactTag = BPCWebViewWrapper.getReactTagFromWebView(webView);
+        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopLoadingErrorEvent(reactTag, eventData));
     }
 
     @RequiresApi(api = Build.VERSION_CODES.M)
@@ -307,8 +315,8 @@ public class BPCWebViewClient extends WebViewClient {
             eventData.putInt("statusCode", errorResponse.getStatusCode());
             eventData.putString("description", errorResponse.getReasonPhrase());
 
-            int reactTag = webView.getId();
-            UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopHttpErrorEvent(webView.getId(), eventData));
+            int reactTag = BPCWebViewWrapper.getReactTagFromWebView(webView);
+            UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopHttpErrorEvent(reactTag, eventData));
         }
     }
 
@@ -337,21 +345,21 @@ public class BPCWebViewClient extends WebViewClient {
 
         WritableMap event = createWebViewEvent(webView, webView.getUrl());
         event.putBoolean("didCrash", detail.didCrash());
-        int reactTag = webView.getId();
-        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopRenderProcessGoneEvent(webView.getId(), event));
+        int reactTag = BPCWebViewWrapper.getReactTagFromWebView(webView);
+        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopRenderProcessGoneEvent(reactTag, event));
 
         // returning false would crash the app.
         return true;
     }
 
     protected void emitFinishEvent(WebView webView, String url) {
-        int reactTag = webView.getId();
-        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopLoadingFinishEvent(webView.getId(), createWebViewEvent(webView, url)));
+        int reactTag = BPCWebViewWrapper.getReactTagFromWebView(webView);
+        UIManagerHelper.getEventDispatcherForReactTag((ReactContext) webView.getContext(), reactTag).dispatchEvent(new TopLoadingFinishEvent(reactTag, createWebViewEvent(webView, url)));
     }
 
     protected WritableMap createWebViewEvent(WebView webView, String url) {
         WritableMap event = Arguments.createMap();
-        event.putDouble("target", webView.getId());
+        event.putDouble("target", BPCWebViewWrapper.getReactTagFromWebView(webView));
         // Don't use webView.getUrl() here, the URL isn't updated to the new value yet in callbacks
         // like onPageFinished
         event.putString("url", url);