react-native-webview-bootpay 11.18.1 → 11.18.13

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

@@ -10,7 +10,6 @@ import android.net.http.SslError;
 import android.os.Build;
 import android.os.SystemClock;
 import android.util.Log;
-import android.webkit.HttpAuthHandler;
 import android.webkit.RenderProcessGoneDetail;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
@@ -31,18 +30,15 @@ import com.facebook.react.bridge.WritableMap;
 import java.net.URISyntaxException;
 import java.util.concurrent.atomic.AtomicReference;
 
-
 import kr.co.bootpay.webview.events.TopHttpErrorEvent;
 import kr.co.bootpay.webview.events.TopLoadingErrorEvent;
 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 kr.co.bootpay.webview.BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState;
-
 
-class BPCWebViewClient extends WebViewClient {
-  private static final String TAG = "BPCWebViewManager";
+public class BPCWebViewClient extends WebViewClient {
+  private static final String TAG = "BPCWebViewClient";
   protected static final int SHOULD_OVERRIDE_URL_LOADING_TIMEOUT = 250;
 
   protected boolean mLastLoadFailed = false;
@@ -50,16 +46,11 @@ class BPCWebViewClient extends WebViewClient {
   ReadableArray mUrlPrefixesForDefaultIntent;
   protected BPCWebView.ProgressChangedFilter progressChangedFilter = null;
   protected @Nullable String ignoreErrFailedForThisURL = null;
-  protected @Nullable BasicAuthCredential basicAuthCredential = null;
 
   public void setIgnoreErrFailedForThisURL(@Nullable String url) {
     ignoreErrFailedForThisURL = url;
   }
 
-  public void setBasicAuthCredential(@Nullable BasicAuthCredential credential) {
-    basicAuthCredential = credential;
-  }
-
   @Override
   public void onPageFinished(WebView webView, String url) {
     super.onPageFinished(webView, url);
@@ -103,17 +94,20 @@ class BPCWebViewClient extends WebViewClient {
       if(isInstallApp(intent, context)) return startApp(intent, context);
       else return startGooglePlay(intent, context);
     }
+//      return url.contains("vguardend");
     return shouldOverrideUrlLoadingRN(view, url);
   }
 
-  public boolean shouldOverrideUrlLoadingRN(WebView view, String url) {
+
+  private 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<Integer, AtomicReference<ShouldOverrideCallbackState>> lock = BPCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
+      final Pair<Integer, AtomicReference<BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState>> lock = BPCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
       final int lockIdentifier = lock.first;
-      final AtomicReference<ShouldOverrideCallbackState> lockObject = lock.second;
+      final AtomicReference<BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = lock.second;
 
       final WritableMap event = createWebViewEvent(view, url);
       event.putInt("lockIdentifier", lockIdentifier);
@@ -123,7 +117,7 @@ class BPCWebViewClient extends WebViewClient {
         assert lockObject != null;
         synchronized (lockObject) {
           final long startTime = SystemClock.elapsedRealtime();
-          while (lockObject.get() == ShouldOverrideCallbackState.UNDECIDED) {
+          while (lockObject.get() == BPCWebViewModule.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.");
               BPCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
@@ -138,7 +132,7 @@ class BPCWebViewClient extends WebViewClient {
         return false;
       }
 
-      final boolean shouldOverride = lockObject.get() == ShouldOverrideCallbackState.SHOULD_OVERRIDE;
+      final boolean shouldOverride = lockObject.get() == BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE;
       BPCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
 
       return shouldOverride;
@@ -154,6 +148,112 @@ class BPCWebViewClient extends WebViewClient {
     }
   }
 
+
+  protected Boolean isSpecialCase(String url) {
+    return url.matches("^shinhan\\S+$")
+      || url.startsWith("kftc-bankpay://")
+      || url.startsWith("v3mobileplusweb://")
+      || url.startsWith("hdcardappcardansimclick://")
+      || url.startsWith("nidlogin://")
+      || url.startsWith("mpocket.online.ansimclick://")
+      || url.startsWith("wooripay://")
+      || url.startsWith("kakaotalk://");
+  }
+
+  protected Boolean isIntent(String url) {
+    return url.startsWith("intent:");
+  }
+  protected Boolean isMarket(String url) {
+    return url.startsWith("market://");
+  }
+
+
+  protected Intent getIntentWithPackage(String url) {
+    try {
+      Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
+      if(intent.getPackage() == null) {
+        if (url == null) return intent;
+        if (url.startsWith("shinhan-sr-ansimclick")) intent.setPackage("com.shcard.smartpay");
+        else if (url.startsWith("kftc-bankpay")) intent.setPackage("com.kftc.bankpay.android");
+        else if (url.startsWith("ispmobile")) intent.setPackage("kvp.jjy.MispAndroid320");
+        else if (url.startsWith("hdcardappcardansimclick")) intent.setPackage("com.hyundaicard.appcard");
+        else if (url.startsWith("kb-acp")) intent.setPackage("com.kbcard.kbkookmincard");
+        else if (url.startsWith("mpocket.online.ansimclick")) intent.setPackage("kr.co.samsungcard.mpocket");
+        else if (url.startsWith("lotteappcard")) intent.setPackage("com.lcacApp");
+        else if (url.startsWith("cloudpay")) intent.setPackage("com.hanaskcard.paycla");
+        else if (url.startsWith("nhappvardansimclick")) intent.setPackage("nh.smart.nhallonepay");
+        else if (url.startsWith("citispay")) intent.setPackage("kr.co.citibank.citimobile");
+        else if (url.startsWith("kakaotalk")) intent.setPackage("com.kakao.talk");
+      }
+      return intent;
+    } catch (URISyntaxException e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  protected boolean isInstallApp(Intent intent, Context context) {
+    return isExistPackageInfo(intent, context) || isExistLaunchedIntent(intent, context);
+  }
+
+
+  protected boolean isExistPackageInfo(Intent intent, Context context) {
+    try {
+      return intent != null && context.getPackageManager().getPackageInfo(intent.getPackage(), PackageManager.GET_ACTIVITIES) != null;
+    } catch (PackageManager.NameNotFoundException e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+  protected boolean isExistLaunchedIntent(Intent intent, Context context) {
+    return intent != null &&  intent.getPackage() != null && context.getPackageManager().getLaunchIntentForPackage(intent.getPackage()) != null;
+  }
+
+  protected boolean startApp(Intent intent, Context context) {
+    intent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
+    intent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+    return true;
+  }
+
+  protected boolean startGooglePlay(Intent intent, Context context) {
+    final String appPackageName = intent.getPackage();
+
+    if(appPackageName == null) {
+      Uri dataUri = intent.getData();
+
+      try {
+        Intent addIntent = new Intent(Intent.ACTION_VIEW, intent.getData());
+        addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
+        addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(addIntent);
+      } catch (Exception e) {
+        String packageName = "com.nhn.android.search"; //appPackageName이 비어있으면 네이버로 보내기(네이버 로그인)
+        if(dataUri != null && dataUri.toString().startsWith("wooripay://")) packageName = "com.wooricard.wpay"; //우리카드 예외처리
+
+        Intent addIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName));
+        addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
+        addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(addIntent);
+//                context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName)));
+      }
+      return true;
+    }
+    try {
+      Intent addIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName));
+      addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
+      addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
+      context.startActivity(addIntent);
+    } catch (android.content.ActivityNotFoundException anfe) {
+      Intent addIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName));
+      addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
+      addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
+      context.startActivity(addIntent);
+    }
+    return true;
+  }
+
   @TargetApi(Build.VERSION_CODES.N)
   @Override
   public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
@@ -161,15 +261,6 @@ class BPCWebViewClient extends WebViewClient {
     return this.shouldOverrideUrlLoading(view, url);
   }
 
-  @Override
-  public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
-    if (basicAuthCredential != null) {
-      handler.proceed(basicAuthCredential.username, basicAuthCredential.password);
-      return;
-    }
-    super.onReceivedHttpAuthRequest(view, handler, host, realm);
-  }
-
   @Override
   public void onReceivedSslError(final WebView webView, final SslErrorHandler handler, final SslError error) {
     // onReceivedSslError is called for most requests, per Android docs: https://developer.android.com/reference/android/webkit/WebViewClient#onReceivedSslError(android.webkit.WebView,%2520android.webkit.SslErrorHandler,%2520android.net.http.SslError)
@@ -186,7 +277,7 @@ class BPCWebViewClient extends WebViewClient {
 
     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);
+      Log.w("BPCWebViewManager", "Resource blocked from loading due to SSL error. Blocked URL: "+failingUrl);
       return;
     }
 
@@ -295,10 +386,10 @@ class BPCWebViewClient extends WebViewClient {
     super.onRenderProcessGone(webView, detail);
 
     if(detail.didCrash()){
-      Log.e(TAG, "The WebView rendering process crashed.");
+      Log.e("BPCWebViewManager", "The WebView rendering process crashed.");
     }
     else{
-      Log.w(TAG, "The WebView rendering process was killed by the system.");
+      Log.w("BPCWebViewManager", "The WebView rendering process was killed by the system.");
     }
 
     // if webView is null, we cannot return any event
@@ -348,110 +439,4 @@ class BPCWebViewClient extends WebViewClient {
   public void setProgressChangedFilter(BPCWebView.ProgressChangedFilter filter) {
     progressChangedFilter = filter;
   }
-
-
-  protected Boolean isSpecialCase(String url) {
-    return url.matches("^shinhan\\S+$")
-      || url.startsWith("kftc-bankpay://")
-      || url.startsWith("v3mobileplusweb://")
-      || url.startsWith("hdcardappcardansimclick://")
-      || url.startsWith("nidlogin://")
-      || url.startsWith("mpocket.online.ansimclick://")
-      || url.startsWith("wooripay://")
-      || url.startsWith("kakaotalk://");
-  }
-
-  protected Boolean isIntent(String url) {
-    return url.startsWith("intent:");
-  }
-  protected Boolean isMarket(String url) {
-    return url.startsWith("market://");
-  }
-
-
-  protected Intent getIntentWithPackage(String url) {
-    try {
-      Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-      if(intent.getPackage() == null) {
-        if (url == null) return intent;
-        if (url.startsWith("shinhan-sr-ansimclick")) intent.setPackage("com.shcard.smartpay");
-        else if (url.startsWith("kftc-bankpay")) intent.setPackage("com.kftc.bankpay.android");
-        else if (url.startsWith("ispmobile")) intent.setPackage("kvp.jjy.MispAndroid320");
-        else if (url.startsWith("hdcardappcardansimclick")) intent.setPackage("com.hyundaicard.appcard");
-        else if (url.startsWith("kb-acp")) intent.setPackage("com.kbcard.kbkookmincard");
-        else if (url.startsWith("mpocket.online.ansimclick")) intent.setPackage("kr.co.samsungcard.mpocket");
-        else if (url.startsWith("lotteappcard")) intent.setPackage("com.lcacApp");
-        else if (url.startsWith("cloudpay")) intent.setPackage("com.hanaskcard.paycla");
-        else if (url.startsWith("nhappvardansimclick")) intent.setPackage("nh.smart.nhallonepay");
-        else if (url.startsWith("citispay")) intent.setPackage("kr.co.citibank.citimobile");
-        else if (url.startsWith("kakaotalk")) intent.setPackage("com.kakao.talk");
-      }
-      return intent;
-    } catch (URISyntaxException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  protected boolean isInstallApp(Intent intent, Context context) {
-    return isExistPackageInfo(intent, context) || isExistLaunchedIntent(intent, context);
-  }
-
-
-  protected boolean isExistPackageInfo(Intent intent, Context context) {
-    try {
-      return intent != null && context.getPackageManager().getPackageInfo(intent.getPackage(), PackageManager.GET_ACTIVITIES) != null;
-    } catch (PackageManager.NameNotFoundException e) {
-      e.printStackTrace();
-      return false;
-    }
-  }
-
-  protected boolean isExistLaunchedIntent(Intent intent, Context context) {
-    return intent != null &&  intent.getPackage() != null && context.getPackageManager().getLaunchIntentForPackage(intent.getPackage()) != null;
-  }
-
-  protected boolean startApp(Intent intent, Context context) {
-    intent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
-    intent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
-    context.startActivity(intent);
-    return true;
-  }
-
-  protected boolean startGooglePlay(Intent intent, Context context) {
-    final String appPackageName = intent.getPackage();
-
-    if(appPackageName == null) {
-      Uri dataUri = intent.getData();
-
-      try {
-        Intent addIntent = new Intent(Intent.ACTION_VIEW, intent.getData());
-        addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
-        addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(addIntent);
-      } catch (Exception e) {
-        String packageName = "com.nhn.android.search"; //appPackageName이 비어있으면 네이버로 보내기(네이버 로그인)
-        if(dataUri != null && dataUri.toString().startsWith("wooripay://")) packageName = "com.wooricard.wpay"; //우리카드 예외처리
-
-        Intent addIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName));
-        addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
-        addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(addIntent);
-//                context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + packageName)));
-      }
-      return true;
-    }
-    try {
-      Intent addIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName));
-      addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
-      addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
-      context.startActivity(addIntent);
-    } catch (android.content.ActivityNotFoundException anfe) {
-      Intent addIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName));
-      addIntent.addFlags(intent.FLAG_ACTIVITY_CLEAR_TASK);
-      addIntent.addFlags(intent.FLAG_ACTIVITY_NEW_TASK);
-      context.startActivity(addIntent);
-    }
-    return true;
-  }
 }

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

@@ -1,5 +1,6 @@
 package kr.co.bootpay.webview;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.DownloadManager;
@@ -9,10 +10,13 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.Manifest;
+import android.net.http.SslError;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Message;
+import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -23,36 +27,51 @@ import android.webkit.ConsoleMessage;
 import android.webkit.CookieManager;
 import android.webkit.DownloadListener;
 import android.webkit.GeolocationPermissions;
+import android.webkit.JavascriptInterface;
+import android.webkit.RenderProcessGoneDetail;
+import android.webkit.SslErrorHandler;
 import android.webkit.PermissionRequest;
 import android.webkit.URLUtil;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
-import androidx.webkit.WebSettingsCompat;
-import androidx.webkit.WebViewFeature;
+import androidx.core.util.Pair;
 
+import com.facebook.common.logging.FLog;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
+import com.facebook.react.views.scroll.ScrollEvent;
 import com.facebook.react.views.scroll.ScrollEventType;
+import com.facebook.react.views.scroll.OnScrollDispatchHelper;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.ContentSizeChangeEvent;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import kr.co.bootpay.webview.BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState;
 import kr.co.bootpay.webview.events.TopLoadingErrorEvent;
 import kr.co.bootpay.webview.events.TopHttpErrorEvent;
@@ -67,15 +86,16 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.UnsupportedEncodingException;
-import java.lang.IllegalArgumentException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Manages instances of {@link WebView}
@@ -103,7 +123,6 @@ import java.util.Map;
  */
 @ReactModule(name = BPCWebViewManager.REACT_CLASS)
 public class BPCWebViewManager extends SimpleViewManager<WebView> {
-  private static final String TAG = "BPCWebViewManager";
 
   public static final int COMMAND_GO_BACK = 1;
   public static final int COMMAND_GO_FORWARD = 2;
@@ -122,12 +141,11 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
   protected static final String REACT_CLASS = "BPCWebView";
   protected static final String HTML_ENCODING = "UTF-8";
   protected static final String HTML_MIME_TYPE = "text/html";
-//  protected static final String JAVASCRIPT_INTERFACE = "ReactNativeWebView";
+  // protected static final String JAVASCRIPT_INTERFACE = "ReactNativeWebView";
   protected static final String HTTP_METHOD_POST = "POST";
   // Use `webView.loadUrl("about:blank")` to reliably reset the view
   // state and release page resources (including any running JavaScript).
   protected static final String BLANK_URL = "about:blank";
-
   protected WebViewConfig mWebViewConfig;
 
   protected BPCWebChromeClient mWebChromeClient = null;
@@ -191,13 +209,7 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
 
         BPCWebViewModule module = getModule(reactContext);
 
-        DownloadManager.Request request;
-        try {
-          request = new DownloadManager.Request(Uri.parse(url));
-        } catch (IllegalArgumentException e) {
-          Log.w(TAG, "Unsupported URI, aborting download", e);
-          return;
-        }
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
 
         String fileName = URLUtil.guessFileName(url, contentDisposition, mimetype);
         String downloadMessage = "Downloading " + fileName;
@@ -210,7 +222,8 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
           String cookie = CookieManager.getInstance().getCookie(baseUrl);
           request.addRequestHeader("Cookie", cookie);
         } catch (MalformedURLException e) {
-          Log.w(TAG, "Error getting cookie for DownloadManager", e);
+          System.out.println("Error getting cookie for DownloadManager: " + e.toString());
+          e.printStackTrace();
         }
 
         //Finish setting up request
@@ -237,16 +250,6 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
     view.getSettings().setJavaScriptEnabled(enabled);
   }
 
-  @ReactProp(name = "setBuiltInZoomControls")
-  public void setBuiltInZoomControls(WebView view, boolean enabled) {
-    view.getSettings().setBuiltInZoomControls(enabled);
-  }
-
-  @ReactProp(name = "setDisplayZoomControls")
-  public void setDisplayZoomControls(WebView view, boolean enabled) {
-    view.getSettings().setDisplayZoomControls(enabled);
-  }
-
   @ReactProp(name = "setSupportMultipleWindows")
   public void setSupportMultipleWindows(WebView view, boolean enabled){
     view.getSettings().setSupportMultipleWindows(enabled);
@@ -338,11 +341,6 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
     view.setOverScrollMode(overScrollMode);
   }
 
-  @ReactProp(name = "nestedScrollEnabled")
-  public void setNestedScrollEnabled(WebView view, boolean enabled) {
-    ((BPCWebView) view).setNestedScrollEnabled(enabled);
-  }
-
   @ReactProp(name = "thirdPartyCookiesEnabled")
   public void setThirdPartyCookiesEnabled(WebView view, boolean enabled) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -538,19 +536,6 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
     view.loadUrl(BLANK_URL);
   }
 
-  @ReactProp(name = "basicAuthCredential")
-  public void setBasicAuthCredential(WebView view, @Nullable ReadableMap credential) {
-    @Nullable BasicAuthCredential basicAuthCredential = null;
-    if (credential != null) {
-      if (credential.hasKey("username") && credential.hasKey("password")) {
-        String username = credential.getString("username");
-        String password = credential.getString("password");
-        basicAuthCredential = new BasicAuthCredential(username, password);
-      }
-    }
-    ((BPCWebView) view).setBasicAuthCredential(basicAuthCredential);
-  }
-
   @ReactProp(name = "onContentSizeChange")
   public void setOnContentSizeChange(WebView view, boolean sendContentSizeChangeEvents) {
     ((BPCWebView) view).setSendContentSizeChangeEvents(sendContentSizeChangeEvents);
@@ -606,32 +591,6 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
     ((BPCWebView) view).setHasScrollEvent(hasScrollEvent);
   }
 
-  @ReactProp(name = "forceDarkOn")
-  public void setForceDarkOn(WebView view, boolean enabled) {
-    // Only Android 10+ support dark mode
-    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-      // Switch WebView dark mode
-      if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
-        int forceDarkMode = enabled ? WebSettingsCompat.FORCE_DARK_ON : WebSettingsCompat.FORCE_DARK_OFF;
-        WebSettingsCompat.setForceDark(view.getSettings(), forceDarkMode);
-      }
-
-      // Set how WebView content should be darkened.
-      // PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING:  checks for the "color-scheme" <meta> tag.
-      // If present, it uses media queries. If absent, it applies user-agent (automatic)
-      // More information about Force Dark Strategy can be found here:
-      // https://developer.android.com/reference/androidx/webkit/WebSettingsCompat#setForceDarkStrategy(android.webkit.WebSettings)
-      if (enabled && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
-        WebSettingsCompat.setForceDarkStrategy(view.getSettings(), WebSettingsCompat.DARK_STRATEGY_PREFER_WEB_THEME_OVER_USER_AGENT_DARKENING);
-      }
-    }
-  }
-
-  @ReactProp(name = "minimumFontSize")
-  public void setMinimumFontSize(WebView view, int fontSize) {
-    view.getSettings().setMinimumFontSize(fontSize);
-  }
-
   @Override
   protected void addEventEmitters(ThemedReactContext reactContext, WebView view) {
     // Do not register default touch emitter and let WebView implementation handle touches
@@ -745,11 +704,8 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
   }
 
   protected void setupWebChromeClient(ReactContext reactContext, WebView webView) {
-    Activity activity = reactContext.getCurrentActivity();
-
-    if (mAllowsFullscreenVideo && activity != null) {
-      int initialRequestedOrientation = activity.getRequestedOrientation();
-
+    if (mAllowsFullscreenVideo) {
+      int initialRequestedOrientation = reactContext.getCurrentActivity().getRequestedOrientation();
       mWebChromeClient = new BPCWebChromeClient(reactContext, webView) {
         @Override
         public Bitmap getDefaultVideoPoster() {
@@ -766,32 +722,31 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
           mVideoView = view;
           mCustomViewCallback = callback;
 
-          activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+          mReactContext.getCurrentActivity().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
-            );
+            mReactContext.getCurrentActivity().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()`
+          // 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
+          // 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()) {
+          if(rootView.getRootView() != mWebView.getRootView()){
             mWebView.getRootView().setVisibility(View.GONE);
-          } else {
-            // Same view hierarchy (no Modal), just hide the WebView then
+          }
+
+          // Same view hierarchy (no Modal), just hide the webview then
+          else{
             mWebView.setVisibility(View.GONE);
           }
 
@@ -804,18 +759,20 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
             return;
           }
 
-          // Same logic as above
+          // same logic as above
           ViewGroup rootView = getRootView();
 
-          if (rootView.getRootView() != mWebView.getRootView()) {
+          if(rootView.getRootView() !=  mWebView.getRootView()){
             mWebView.getRootView().setVisibility(View.VISIBLE);
-          } else {
-            // Same view hierarchy (no Modal)
+          }
+
+          // Same view hierarchy (no Modal)
+          else{
             mWebView.setVisibility(View.VISIBLE);
           }
 
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+            mReactContext.getCurrentActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
           }
 
           rootView.removeView(mVideoView);
@@ -824,25 +781,22 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
           mVideoView = null;
           mCustomViewCallback = null;
 
-          activity.setRequestedOrientation(initialRequestedOrientation);
+          mReactContext.getCurrentActivity().setRequestedOrientation(initialRequestedOrientation);
 
           mReactContext.removeLifecycleEventListener(this);
         }
       };
-
       webView.setWebChromeClient(mWebChromeClient);
     } else {
       if (mWebChromeClient != null) {
         mWebChromeClient.onHideCustomView();
       }
-
       mWebChromeClient = new BPCWebChromeClient(reactContext, webView) {
         @Override
         public Bitmap getDefaultVideoPoster() {
           return Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
         }
       };
-
       webView.setWebChromeClient(mWebChromeClient);
     }
   }