@exodus/react-native-webview 11.26.1-exodus.3 → 11.26.1-exodus.31

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -30,7 +30,6 @@ import android.webkit.DownloadListener;
 import android.webkit.GeolocationPermissions;
 import android.webkit.HttpAuthHandler;
 import android.webkit.JavascriptInterface;
-import android.webkit.RenderProcessGoneDetail;
 import android.webkit.SslErrorHandler;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
@@ -78,13 +77,12 @@ import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.reactnativecommunity.webview.RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState;
 import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
-import com.reactnativecommunity.webview.events.TopHttpErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
 import com.reactnativecommunity.webview.events.TopLoadingProgressEvent;
+import com.reactnativecommunity.webview.events.TopOpenWindowEvent;
 import com.reactnativecommunity.webview.events.TopLoadingStartEvent;
 import com.reactnativecommunity.webview.events.TopMessageEvent;
 import com.reactnativecommunity.webview.events.TopShouldStartLoadWithRequestEvent;
-import com.reactnativecommunity.webview.events.TopRenderProcessGoneEvent;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -100,6 +98,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
+
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -159,14 +160,19 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
   protected WebViewConfig mWebViewConfig;
 
   protected RNCWebChromeClient mWebChromeClient = null;
-  protected boolean mAllowsFullscreenVideo = false;
   protected boolean mAllowsProtectedMedia = false;
   protected @Nullable String mUserAgent = null;
   protected @Nullable String mUserAgentWithApplicationName = null;
   protected @Nullable String mDownloadingMessage = null;
   protected @Nullable String mLackPermissionToDownloadMessage = null;
 
+  private static Set<String> cameraPermissionOriginWhitelist;
+
   public RNCWebViewManager() {
+    cameraPermissionOriginWhitelist = new HashSet<>();
+    cameraPermissionOriginWhitelist.add("https://alchemy.veriff.com/");
+    cameraPermissionOriginWhitelist.add("https://magic.veriff.me/");
+
     mWebViewConfig = new WebViewConfig() {
       public void configWebView(WebView webView) {
       }
@@ -201,10 +207,9 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
     settings.setAllowFileAccess(false);
     settings.setAllowContentAccess(false);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-      settings.setAllowFileAccessFromFileURLs(false);
-      setAllowUniversalAccessFromFileURLs(webView, false);
-    }
+    settings.setAllowFileAccessFromFileURLs(false);
+    settings.setJavaScriptCanOpenWindowsAutomatically(false);
+    settings.setAllowUniversalAccessFromFileURLs(false);
     setMixedContentMode(webView, "never");
 
     // Fixes broken full-screen modals/galleries due to body height being 0.
@@ -212,7 +217,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
       new LayoutParams(LayoutParams.MATCH_PARENT,
         LayoutParams.MATCH_PARENT));
 
-    if (ReactBuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+    if (ReactBuildConfig.DEBUG) {
       WebView.setWebContentsDebuggingEnabled(true);
     }
 
@@ -340,9 +345,12 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
   @ReactProp(name = "thirdPartyCookiesEnabled")
   public void setThirdPartyCookiesEnabled(WebView view, boolean enabled) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      CookieManager.getInstance().setAcceptThirdPartyCookies(view, enabled);
-    }
+    CookieManager.getInstance().setAcceptThirdPartyCookies(view, enabled);
+  }
+
+  @ReactProp(name = "webviewDebuggingEnabled")
+  public void setWebviewDebuggingEnabled(WebView view, boolean value) {
+      ((RNCWebView) view).setWebContentsDebuggingEnabled(value);
   }
 
   @ReactProp(name = "textZoom")
@@ -371,26 +379,13 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     this.setUserAgentString(view);
   }
 
-  @ReactProp(name = "applicationNameForUserAgent")
-  public void setApplicationNameForUserAgent(WebView view, @Nullable String applicationName) {
-    if(applicationName != null) {
-      if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-        String defaultUserAgent = WebSettings.getDefaultUserAgent(view.getContext());
-        mUserAgentWithApplicationName = defaultUserAgent + " " + applicationName;
-      }
-    } else {
-      mUserAgentWithApplicationName = null;
-    }
-    this.setUserAgentString(view);
-  }
-
   protected void setUserAgentString(WebView view) {
     if(mUserAgent != null) {
       view.getSettings().setUserAgentString(mUserAgent);
     } else if(mUserAgentWithApplicationName != null) {
       view.getSettings().setUserAgentString(mUserAgentWithApplicationName);
-    } else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      // handle unsets of `userAgent` prop as long as device is >= API 17
+    } else {
+      // handle unsets of `userAgent` prop
       view.getSettings().setUserAgentString(WebSettings.getDefaultUserAgent(view.getContext()));
     }
   }
@@ -401,21 +396,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     view.getSettings().setMediaPlaybackRequiresUserGesture(requires);
   }
 
-  @ReactProp(name = "javaScriptCanOpenWindowsAutomatically")
-  public void setJavaScriptCanOpenWindowsAutomatically(WebView view, boolean enabled) {
-    view.getSettings().setJavaScriptCanOpenWindowsAutomatically(false);
-  }
-
-  @ReactProp(name = "allowFileAccessFromFileURLs")
-  public void setAllowFileAccessFromFileURLs(WebView view, boolean allow) {
-    view.getSettings().setAllowFileAccessFromFileURLs(allow);
-  }
-
-  @ReactProp(name = "allowUniversalAccessFromFileURLs")
-  public void setAllowUniversalAccessFromFileURLs(WebView view, boolean allow) {
-    view.getSettings().setAllowUniversalAccessFromFileURLs(allow);
-  }
-
   @ReactProp(name = "saveFormDataDisabled")
   public void setSaveFormDataDisabled(WebView view, boolean disable) {
     view.getSettings().setSaveFormData(!disable);
@@ -431,16 +411,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     ((RNCWebView) view).setInjectedJavaScriptBeforeContentLoaded(injectedJavaScriptBeforeContentLoaded);
   }
 
-  @ReactProp(name = "injectedJavaScriptForMainFrameOnly")
-  public void setInjectedJavaScriptForMainFrameOnly(WebView view, boolean enabled) {
-    ((RNCWebView) view).setInjectedJavaScriptForMainFrameOnly(enabled);
-  }
-
-  @ReactProp(name = "injectedJavaScriptBeforeContentLoadedForMainFrameOnly")
-  public void setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(WebView view, boolean enabled) {
-    ((RNCWebView) view).setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(enabled);
-  }
-
   @ReactProp(name = "messagingEnabled")
   public void setMessagingEnabled(WebView view, boolean enabled) {
     ((RNCWebView) view).setMessagingEnabled(enabled);
@@ -459,11 +429,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
 
     // Remove all previous cookies
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      CookieManager.getInstance().removeAllCookies(null);
-    } else {
-      CookieManager.getInstance().removeAllCookie();
-    }
+    CookieManager.getInstance().removeAllCookies(null);
 
     // Disable caching
     view.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
@@ -546,14 +512,12 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
   @ReactProp(name = "mixedContentMode")
   public void setMixedContentMode(WebView view, @Nullable String mixedContentMode) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      if (mixedContentMode == null || "never".equals(mixedContentMode)) {
-        view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_NEVER_ALLOW);
-      } else if ("always".equals(mixedContentMode)) {
-        view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-      } else if ("compatibility".equals(mixedContentMode)) {
-        view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
-      }
+    if (mixedContentMode == null || "never".equals(mixedContentMode)) {
+      view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_NEVER_ALLOW);
+    } else if ("always".equals(mixedContentMode)) {
+      view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+    } else if ("compatibility".equals(mixedContentMode)) {
+      view.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
     }
   }
 
@@ -567,21 +531,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
   }
 
-  @ReactProp(name = "allowsFullscreenVideo")
-  public void setAllowsFullscreenVideo(
-    WebView view,
-    @Nullable Boolean allowsFullscreenVideo) {
-    mAllowsFullscreenVideo = allowsFullscreenVideo != null && allowsFullscreenVideo;
-    setupWebChromeClient((ReactContext)view.getContext(), view);
-  }
-
-  @ReactProp(name = "allowFileAccess")
-  public void setAllowFileAccess(
-    WebView view,
-    @Nullable Boolean allowFileAccess) {
-    view.getSettings().setAllowFileAccess(allowFileAccess != null && allowFileAccess);
-  }
-
   @ReactProp(name = "geolocationEnabled")
   public void setGeolocationEnabled(
     WebView view,
@@ -656,8 +605,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     export.put(TopLoadingProgressEvent.EVENT_NAME, MapBuilder.of("registrationName", "onLoadingProgress"));
     export.put(TopShouldStartLoadWithRequestEvent.EVENT_NAME, MapBuilder.of("registrationName", "onShouldStartLoadWithRequest"));
     export.put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"));
-    export.put(TopHttpErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onHttpError"));
-    export.put(TopRenderProcessGoneEvent.EVENT_NAME, MapBuilder.of("registrationName", "onRenderProcessGone"));
+    export.put(TopOpenWindowEvent.EVENT_NAME, MapBuilder.of("registrationName", "onOpenWindow"));
     return export;
   }
 
@@ -699,17 +647,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
           RNCWebView reactWebView = (RNCWebView) root;
           JSONObject eventInitDict = new JSONObject();
           eventInitDict.put("data", args.getString(0));
-          reactWebView.evaluateJavascriptWithFallback("(function () {" +
-            "var event;" +
-            "var data = " + eventInitDict.toString() + ";" +
-            "try {" +
-            "event = new MessageEvent('message', data);" +
-            "} catch (e) {" +
-            "event = document.createEvent('MessageEvent');" +
-            "event.initMessageEvent('message', true, true, data.data, data.origin, data.lastEventId, data.source);" +
-            "}" +
-            "document.dispatchEvent(event);" +
-            "})();");
+          reactWebView.evaluateJavascriptWithFallback("document.dispatchEvent(new MessageEvent('message', " + eventInitDict.toString() + "));");
         } catch (JSONException e) {
           throw new RuntimeException(e);
         }
@@ -756,101 +694,16 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
   protected void setupWebChromeClient(ReactContext reactContext, WebView webView) {
     Activity activity = reactContext.getCurrentActivity();
+    if (mWebChromeClient != null) {
+      mWebChromeClient.onHideCustomView();
+    }
 
-    if (mAllowsFullscreenVideo && activity != null) {
-      int initialRequestedOrientation = activity.getRequestedOrientation();
-
-      mWebChromeClient = new RNCWebChromeClient(reactContext, webView) {
-        @Override
-        public Bitmap getDefaultVideoPoster() {
-          return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
-        }
-
-        @Override
-        public void onShowCustomView(View view, CustomViewCallback callback) {
-          if (mVideoView != null) {
-            callback.onCustomViewHidden();
-            return;
-          }
-
-          mVideoView = view;
-          mCustomViewCallback = callback;
-
-          activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            mVideoView.setSystemUiVisibility(FULLSCREEN_SYSTEM_UI_VISIBILITY);
-            activity.getWindow().setFlags(
-              WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
-              WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-            );
-          }
-
-          mVideoView.setBackgroundColor(Color.BLACK);
-
-          // Since RN's Modals interfere with the View hierarchy
-          // we will decide which View to hide if the hierarchy
-          // does not match (i.e., the WebView is within a Modal)
-          // NOTE: We could use `mWebView.getRootView()` instead of `getRootView()`
-          // but that breaks the Modal's styles and layout, so we need this to render
-          // in the main View hierarchy regardless
-          ViewGroup rootView = getRootView();
-          rootView.addView(mVideoView, FULLSCREEN_LAYOUT_PARAMS);
-
-          // Different root views, we are in a Modal
-          if (rootView.getRootView() != mWebView.getRootView()) {
-            mWebView.getRootView().setVisibility(View.GONE);
-          } else {
-            // Same view hierarchy (no Modal), just hide the WebView then
-            mWebView.setVisibility(View.GONE);
-          }
-
-          mReactContext.addLifecycleEventListener(this);
-        }
-
-        @Override
-        public void onHideCustomView() {
-          if (mVideoView == null) {
-            return;
-          }
-
-          // Same logic as above
-          ViewGroup rootView = getRootView();
-
-          if (rootView.getRootView() != mWebView.getRootView()) {
-            mWebView.getRootView().setVisibility(View.VISIBLE);
-          } else {
-            // Same view hierarchy (no Modal)
-            mWebView.setVisibility(View.VISIBLE);
-          }
-
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
-          }
-
-          rootView.removeView(mVideoView);
-          mCustomViewCallback.onCustomViewHidden();
-
-          mVideoView = null;
-          mCustomViewCallback = null;
-
-          activity.setRequestedOrientation(initialRequestedOrientation);
-
-          mReactContext.removeLifecycleEventListener(this);
-        }
-      };
-    } else {
-      if (mWebChromeClient != null) {
-        mWebChromeClient.onHideCustomView();
+    mWebChromeClient = new RNCWebChromeClient(reactContext, webView) {
+      @Override
+      public Bitmap getDefaultVideoPoster() {
+        return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
       }
-
-      mWebChromeClient = new RNCWebChromeClient(reactContext, webView) {
-        @Override
-        public Bitmap getDefaultVideoPoster() {
-          return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
-        }
-      };
-    }
+    };
     mWebChromeClient.setAllowsProtectedMedia(mAllowsProtectedMedia);
     webView.setWebChromeClient(mWebChromeClient);
   }
@@ -912,6 +765,8 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
         final WritableMap event = createWebViewEvent(view, url);
         event.putInt("lockIdentifier", lockIdentifier);
+        // Android does not raise shouldOverrideUrlLoading for inner frames
+        event.putBoolean("isTopFrame", true);
         rncWebView.sendDirectMessage("onShouldStartLoadWithRequest", event);
 
         try {
@@ -1061,60 +916,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
         new TopLoadingErrorEvent(webView.getId(), eventData));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    @Override
-    public void onReceivedHttpError(
-      WebView webView,
-      WebResourceRequest request,
-      WebResourceResponse errorResponse) {
-      super.onReceivedHttpError(webView, request, errorResponse);
-
-      if (request.isForMainFrame()) {
-        WritableMap eventData = createWebViewEvent(webView, request.getUrl().toString());
-        eventData.putInt("statusCode", errorResponse.getStatusCode());
-        eventData.putString("description", errorResponse.getReasonPhrase());
-
-        ((RNCWebView) webView).dispatchEvent(
-          webView,
-          new TopHttpErrorEvent(webView.getId(), eventData));
-      }
-    }
-
-    @TargetApi(Build.VERSION_CODES.O)
-    @Override
-    public boolean onRenderProcessGone(WebView webView, RenderProcessGoneDetail detail) {
-        // WebViewClient.onRenderProcessGone was added in O.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return false;
-        }
-        super.onRenderProcessGone(webView, detail);
-
-        if(detail.didCrash()){
-          Log.e(TAG, "The WebView rendering process crashed.");
-        }
-        else{
-          Log.w(TAG, "The WebView rendering process was killed by the system.");
-        }
-
-        // if webView is null, we cannot return any event
-        // since the view is already dead/disposed
-        // still prevent the app crash by returning true.
-        if(webView == null){
-          return true;
-        }
-
-        WritableMap event = createWebViewEvent(webView, webView.getUrl());
-        event.putBoolean("didCrash", detail.didCrash());
-
-      ((RNCWebView) webView).dispatchEvent(
-          webView,
-          new TopRenderProcessGoneEvent(webView.getId(), event)
-        );
-
-        // returning false would crash the app.
-        return true;
-    }
-
     protected void emitFinishEvent(WebView webView, String url) {
       ((RNCWebView) webView).dispatchEvent(
         webView,
@@ -1201,6 +1002,20 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
 
       final WebView newWebView = new WebView(view.getContext());
+      newWebView.setWebViewClient(new WebViewClient(){
+        @Override
+        public boolean shouldOverrideUrlLoading (WebView subview, String url) {
+        WritableMap event = Arguments.createMap();
+        event.putString("targetUrl", url);
+
+        ((RNCWebView) view).dispatchEvent(
+          view,
+          new TopOpenWindowEvent(view.getId(), event)
+        );
+
+        return true;
+        }
+      });
       final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
       transport.setWebView(newWebView);
       resultMsg.sendToTarget();
@@ -1241,7 +1056,79 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
     public void onPermissionRequest(final PermissionRequest request) {
-      request.deny();
+      grantedPermissions = new ArrayList<>();
+
+      ArrayList<String> requestedAndroidPermissions = new ArrayList<>();
+
+      for (String requestedResource : request.getResources()) {
+        String androidPermission = null;
+
+        if (cameraPermissionOriginWhitelist.contains(request.getOrigin().toString())) {
+          if (requestedResource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
+            androidPermission = Manifest.permission.CAMERA;
+          } else if (requestedResource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {
+            androidPermission = Manifest.permission.RECORD_AUDIO;
+          } else {
+            continue;
+          }
+        } else {
+          continue;
+        }
+
+        if (androidPermission != null) {
+          if (ContextCompat.checkSelfPermission(mReactContext,
+              androidPermission) == PackageManager.PERMISSION_GRANTED) {
+            grantedPermissions.add(requestedResource);
+          } else {
+            requestedAndroidPermissions.add(androidPermission);
+          }
+        }
+      }
+
+      // If all the permissions are already granted, send the response to the WebView
+      // synchronously
+      if (requestedAndroidPermissions.isEmpty()) {
+        if (grantedPermissions.isEmpty()) {
+          request.deny();
+        } else {
+          request.grant(grantedPermissions.toArray(new String[0]));
+        }
+        grantedPermissions = null;
+        return;
+      }
+
+      // Otherwise, ask to Android System for native permissions asynchronously
+      PermissionAwareActivity activity = getPermissionAwareActivity();
+      activity.requestPermissions(
+          requestedAndroidPermissions.toArray(new String[0]),
+          COMMON_PERMISSION_REQUEST,
+          new PermissionListener() {
+            @Override
+            public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+              if (requestCode != COMMON_PERMISSION_REQUEST) {
+                return false;
+              }
+
+              for (int i = 0; i < permissions.length; i++) {
+                if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
+                  if (permissions[i].equals(Manifest.permission.CAMERA)) {
+                    grantedPermissions.add(PermissionRequest.RESOURCE_VIDEO_CAPTURE);
+                  } else if (permissions[i].equals(Manifest.permission.RECORD_AUDIO)) {
+                    grantedPermissions.add(PermissionRequest.RESOURCE_AUDIO_CAPTURE);
+                  }
+                }
+              }
+
+              if (grantedPermissions.size() == requestedAndroidPermissions.size()) {
+                request.grant(grantedPermissions.toArray(new String[0]));
+              } else {
+                request.deny();
+              }
+
+              grantedPermissions = null;
+              return true;
+            }
+          });
     }
 
 
@@ -1285,7 +1172,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
     @Override
     public void onHostResume() {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && mVideoView != null && mVideoView.getSystemUiVisibility() != FULLSCREEN_SYSTEM_UI_VISIBILITY) {
+      if (mVideoView != null && mVideoView.getSystemUiVisibility() != FULLSCREEN_SYSTEM_UI_VISIBILITY) {
         mVideoView.setSystemUiVisibility(FULLSCREEN_SYSTEM_UI_VISIBILITY);
       }
     }
@@ -1324,13 +1211,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     protected @Nullable
     String injectedJSBeforeContentLoaded;
 
-    /**
-     * android.webkit.WebChromeClient fundamentally does not support JS injection into frames other
-     * than the main frame, so these two properties are mostly here just for parity with iOS & macOS.
-     */
-    protected boolean injectedJavaScriptForMainFrameOnly = true;
-    protected boolean injectedJavaScriptBeforeContentLoadedForMainFrameOnly = true;
-
     protected boolean messagingEnabled = false;
     protected @Nullable
     String messagingModuleName;
@@ -1447,14 +1327,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
       injectedJSBeforeContentLoaded = js;
     }
 
-    public void setInjectedJavaScriptForMainFrameOnly(boolean enabled) {
-      injectedJavaScriptForMainFrameOnly = enabled;
-    }
-
-    public void setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(boolean enabled) {
-      injectedJavaScriptBeforeContentLoadedForMainFrameOnly = enabled;
-    }
-
     protected RNCWebViewBridge createRNCWebViewBridge(RNCWebView webView) {
       return new RNCWebViewBridge(webView);
     }
@@ -1487,17 +1359,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
 
     protected void evaluateJavascriptWithFallback(String script) {
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        evaluateJavascript(script, null);
-        return;
-      }
-
-      try {
-        loadUrl("javascript:" + URLEncoder.encode(script, "UTF-8"));
-      } catch (UnsupportedEncodingException e) {
-        // UTF-8 should always be supported
-        throw new RuntimeException(e);
-      }
+      evaluateJavascript(script, null);
     }
 
     public void callInjectedJavaScript() {

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModule.java

@@ -108,13 +108,6 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
   @ReactMethod
   public void isFileUploadSupported(final Promise promise) {
     Boolean result = false;
-    int current = Build.VERSION.SDK_INT;
-    if (current >= Build.VERSION_CODES.LOLLIPOP) {
-      result = true;
-    }
-    if (current >= Build.VERSION_CODES.JELLY_BEAN && current <= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-      result = true;
-    }
     promise.resolve(result);
   }
 
@@ -212,7 +205,7 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
     }
 
     // we have one file selected
-    if (data.getData() != null && resultCode == RESULT_OK && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+    if (data.getData() != null && resultCode == RESULT_OK) {
       return WebChromeClient.FileChooserParams.parseResult(resultCode, data);
     }
 

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewPackage.java

@@ -0,0 +1,25 @@
+package com.reactnativecommunity.webview;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+public class RNCWebViewPackage implements ReactPackage {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(
+          new RNCWebViewModule(reactContext),
+          new RNCWebViewUtils(reactContext)
+        );
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Arrays.<ViewManager>asList(new RNCWebViewManager());
+    }
+}

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewUtils.java

@@ -0,0 +1,51 @@
+package com.reactnativecommunity.webview;
+
+import android.webkit.WebView;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.UiThreadUtil;
+
+public class RNCWebViewUtils extends ReactContextBaseJavaModule {
+  public static final String NAME = "RNCWebViewUtils";
+
+  ReactApplicationContext mCallerContext;
+
+  public RNCWebViewUtils(ReactApplicationContext reactContext) {
+    super(reactContext);
+    mCallerContext = reactContext;
+  }
+
+  @Override
+  public String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  public void getWebViewDefaultUserAgent(final Promise promise) {
+    UiThreadUtil.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          try {
+            WebView webView = new WebView(mCallerContext);
+
+            // in case we ever use our own UA we need to unset it first the get the original
+            String currentUA = webView.getSettings().getUserAgentString();
+            webView.getSettings().setUserAgentString(null);
+            String webViewUA = webView.getSettings().getUserAgentString();
+
+            // Revert to overriden UA string
+            webView.getSettings().setUserAgentString(currentUA);
+
+            promise.resolve(webViewUA);
+          }
+          catch (Exception e) {
+            promise.reject(NAME, e.getMessage());
+          }
+        }
+    });
+  }
+}