Combine onShouldStartLoadWithRequest event-based and synchronous methods into one

Author: dvicory

src/WebView.android.tsx

@@ -278,18 +278,13 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
   };
 
   onShouldStartLoadWithRequestCallback = (
-    shouldStart: boolean,
-    _: string,
-    lockIdentifier: number,
-  ) => {
-    NativeModules.RNCWebView.onShouldStartLoadWithRequestCallback(shouldStart, lockIdentifier);
-  };
-
-  legacyOnShouldStartLoadWithRequestCallback = (
     shouldStart: boolean,
     url: string,
+    lockIdentifier?: number,
   ) => {
-    if (shouldStart) {
+    if (lockIdentifier) {
+      NativeModules.RNCWebView.onShouldStartLoadWithRequestCallback(shouldStart, lockIdentifier);
+    } else if (shouldStart) {
       UIManager.dispatchViewManagerCommand(
         this.getWebViewHandle(),
         this.getCommands().loadUrl,
@@ -353,13 +348,6 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
       onShouldStartLoadWithRequestProp,
     );
 
-    const onShouldStartLoadWithRequest = createOnShouldStartLoadWithRequest(
-      this.legacyOnShouldStartLoadWithRequestCallback,
-      // casting cause it's in the default props
-      originWhitelist as readonly string[],
-      onShouldStartLoadWithRequestProp,
-    );
-
     const webView = (
       <NativeWebView
         key="webViewKey"
@@ -373,7 +361,7 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
         onHttpError={this.onHttpError}
         onRenderProcessGone={this.onRenderProcessGone}
         onMessage={this.onMessage}
-        onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
+        onShouldStartLoadWithRequest={this.onShouldStartLoadWithRequest}
         ref={this.webViewRef}
         // TODO: find a better way to type this.
         source={resolveAssetSource(source as ImageSourcePropType)}