react-native-webview-bootpay 11.18.16 → 11.22.7

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Build;
 import android.text.TextUtils;
+import android.view.MotionEvent;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
@@ -32,14 +33,14 @@ import java.net.URLEncoder;
 
 import kr.co.bootpay.webview.events.TopMessageEvent;
 
-
-
 /**
  * Subclass of {@link WebView} that implements {@link LifecycleEventListener} interface in order
  * to call {@link WebView#destroy} on activity destroy event and also to clear the client
  */
-
 class BPCWebView extends WebView implements LifecycleEventListener {
+
+  /** bootpay added start ***/
+  protected static final String JAVASCRIPT_INTERFACE = "BootpayRNWebView";
   Dialog dialog; //popup dialog
   public void setDialog(Dialog dialog) {
     this.dialog = dialog;
@@ -49,6 +50,7 @@ class BPCWebView extends WebView implements LifecycleEventListener {
     if(this.dialog != null) this.dialog.dismiss();
     this.dialog = null;
   }
+  /** bootpay added end ***/
 
   protected @Nullable
   String injectedJS;
@@ -66,16 +68,15 @@ class BPCWebView extends WebView implements LifecycleEventListener {
   protected @Nullable
   String messagingModuleName;
   protected @Nullable
-  BPCWebViewClient mbpCWebViewlient;
+  BPCWebViewClient mBPCWebViewClient;
   protected @Nullable
   CatalystInstance mCatalystInstance;
   protected boolean sendContentSizeChangeEvents = false;
   private OnScrollDispatchHelper mOnScrollDispatchHelper;
   protected boolean hasScrollEvent = false;
+  protected boolean nestedScrollEnabled = false;
   protected ProgressChangedFilter progressChangedFilter;
 
-  protected static final String JAVASCRIPT_INTERFACE = "BootpayRNWebView";
-
   /**
    * WebView must be created with an context of the current activity
    * <p>
@@ -89,7 +90,11 @@ class BPCWebView extends WebView implements LifecycleEventListener {
   }
 
   public void setIgnoreErrFailedForThisURL(String url) {
-    mbpCWebViewlient.setIgnoreErrFailedForThisURL(url);
+    mBPCWebViewClient.setIgnoreErrFailedForThisURL(url);
+  }
+
+  public void setBasicAuthCredential(BasicAuthCredential credential) {
+    mBPCWebViewClient.setBasicAuthCredential(credential);
   }
 
   public void setSendContentSizeChangeEvents(boolean sendContentSizeChangeEvents) {
@@ -100,6 +105,10 @@ class BPCWebView extends WebView implements LifecycleEventListener {
     this.hasScrollEvent = hasScrollEvent;
   }
 
+  public void setNestedScrollEnabled(boolean nestedScrollEnabled) {
+    this.nestedScrollEnabled = nestedScrollEnabled;
+  }
+
   @Override
   public void onHostResume() {
     // do nothing
@@ -115,6 +124,14 @@ class BPCWebView extends WebView implements LifecycleEventListener {
     cleanupCallbacksAndDestroy();
   }
 
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    if (this.nestedScrollEnabled) {
+      requestDisallowInterceptTouchEvent(true);
+    }
+    return super.onTouchEvent(event);
+  }
+
   @Override
   protected void onSizeChanged(int w, int h, int ow, int oh) {
     super.onSizeChanged(w, h, ow, oh);
@@ -135,8 +152,8 @@ class BPCWebView extends WebView implements LifecycleEventListener {
   public void setWebViewClient(WebViewClient client) {
     super.setWebViewClient(client);
     if (client instanceof BPCWebViewClient) {
-      mbpCWebViewlient = (BPCWebViewClient) client;
-      mbpCWebViewlient.setProgressChangedFilter(progressChangedFilter);
+      mBPCWebViewClient = (BPCWebViewClient) client;
+      mBPCWebViewClient.setProgressChangedFilter(progressChangedFilter);
     }
   }
 
@@ -152,7 +169,7 @@ class BPCWebView extends WebView implements LifecycleEventListener {
 
   public @Nullable
   BPCWebViewClient getBPCWebViewClient() {
-    return mbpCWebViewlient;
+    return mBPCWebViewClient;
   }
 
   public void setInjectedJavaScript(@Nullable String js) {
@@ -236,15 +253,15 @@ class BPCWebView extends WebView implements LifecycleEventListener {
     ReactContext reactContext = (ReactContext) this.getContext();
     BPCWebView mContext = this;
 
-    if (mbpCWebViewlient != null) {
+    if (mBPCWebViewClient != null) {
       WebView webView = this;
       webView.post(new Runnable() {
         @Override
         public void run() {
-          if (mbpCWebViewlient == null) {
+          if (mBPCWebViewClient == null) {
             return;
           }
-          WritableMap data = mbpCWebViewlient.createWebViewEvent(webView, webView.getUrl());
+          WritableMap data = mBPCWebViewClient.createWebViewEvent(webView, webView.getUrl());
           data.putString("data", message);
 
           if (mCatalystInstance != null) {
@@ -352,4 +369,4 @@ class BPCWebView extends WebView implements LifecycleEventListener {
       return waitingForCommandLoadUrl;
     }
   }
-}
+}

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

@@ -10,6 +10,7 @@ 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;
@@ -37,127 +38,20 @@ import kr.co.bootpay.webview.events.TopLoadingStartEvent;
 import kr.co.bootpay.webview.events.TopRenderProcessGoneEvent;
 import kr.co.bootpay.webview.events.TopShouldStartLoadWithRequestEvent;
 
-public class BPCWebViewClient extends WebViewClient {
+class BPCWebViewClient extends WebViewClient {
+
+  /** bootpay added start ***/
   private static final String TAG = "BPCWebViewClient";
   protected static final int SHOULD_OVERRIDE_URL_LOADING_TIMEOUT = 250;
 
-  protected boolean mLastLoadFailed = false;
-  protected @Nullable
-  ReadableArray mUrlPrefixesForDefaultIntent;
-  protected BPCWebView.ProgressChangedFilter progressChangedFilter = null;
-  protected @Nullable String ignoreErrFailedForThisURL = null;
-
-  public void setIgnoreErrFailedForThisURL(@Nullable String url) {
-    ignoreErrFailedForThisURL = url;
-  }
-
-  @Override
-  public void onPageFinished(WebView webView, String url) {
-    super.onPageFinished(webView, url);
-    updateBlindViewIfNaverLogin(webView, url);
-
-    if (!mLastLoadFailed) {
-      BPCWebView reactWebView = (BPCWebView) webView;
-
-      reactWebView.callInjectedJavaScript();
-
-      emitFinishEvent(webView, url);
-    }
-  }
-
   private void updateBlindViewIfNaverLogin(WebView webView, String url) {
-      if(url.startsWith("https://nid.naver.com")) { //show
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-              webView.evaluateJavascript("document.getElementById('back').remove();", null);
-          }
-      }
-  }
-
-  @Override
-  public void onPageStarted(WebView webView, String url, Bitmap favicon) {
-    super.onPageStarted(webView, url, favicon);
-    mLastLoadFailed = false;
-
-    BPCWebView reactWebView = (BPCWebView) webView;
-    reactWebView.callInjectedJavaScriptBeforeContentLoaded();
-
-    ((BPCWebView) webView).dispatchEvent(
-      webView,
-      new TopLoadingStartEvent(
-        webView.getId(),
-        createWebViewEvent(webView, url)));
-  }
-
-  @Override
-  public boolean shouldOverrideUrlLoading(WebView view, String url) {
-    Intent intent = getIntentWithPackage(url);
-    Context context = view.getContext();
-
-    if(isIntent(url)) {
-      if(isInstallApp(intent, context)) return startApp(intent, context);
-      else return startGooglePlay(intent, context);
-    } else if(isMarket(url)) {
-      if(isInstallApp(intent, context)) return startApp(intent, context);
-      else return startGooglePlay(intent, context);
-    } else if(isSpecialCase(url)) {
-      if(isInstallApp(intent, context)) return startApp(intent, context);
-      else return startGooglePlay(intent, context);
-    }
-//      return url.contains("vguardend");
-    return shouldOverrideUrlLoadingRN(view, 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<BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState>> lock = BPCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
-      final int lockIdentifier = lock.first;
-      final AtomicReference<BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = lock.second;
-
-      final WritableMap event = createWebViewEvent(view, url);
-      event.putInt("lockIdentifier", lockIdentifier);
-      bpcWebView.sendDirectMessage("onShouldStartLoadWithRequest", event);
-
-      try {
-        assert lockObject != null;
-        synchronized (lockObject) {
-          final long startTime = SystemClock.elapsedRealtime();
-          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);
-              return false;
-            }
-            lockObject.wait(SHOULD_OVERRIDE_URL_LOADING_TIMEOUT);
-          }
-        }
-      } catch (InterruptedException e) {
-        FLog.e(TAG, "shouldOverrideUrlLoading was interrupted while waiting for result.", e);
-        BPCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
-        return false;
+    if(url.startsWith("https://nid.naver.com")) { //show
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        webView.evaluateJavascript("document.getElementById('back').remove();", null);
       }
-
-      final boolean shouldOverride = lockObject.get() == BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE;
-      BPCWebViewModule.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);
-      ((BPCWebView) view).dispatchEvent(
-        view,
-        new TopShouldStartLoadWithRequestEvent(
-          view.getId(),
-          createWebViewEvent(view, url)));
-      return true;
     }
   }
 
-
   protected Boolean isSpecialCase(String url) {
     return url.matches("^shinhan\\S+$")
       || url.startsWith("kftc-bankpay://")
@@ -193,6 +87,10 @@ public class BPCWebViewClient extends WebViewClient {
         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");
+        else if (url.startsWith("newliiv")) intent.setPackage("com.kbstar.reboot");
+        else if (url.startsWith("kbbank")) intent.setPackage("com.kbstar.kbbank");
+
+
       }
       return intent;
     } catch (URISyntaxException e) {
@@ -262,6 +160,124 @@ public class BPCWebViewClient extends WebViewClient {
     }
     return true;
   }
+  /** bootpay added end ***/
+
+  protected boolean mLastLoadFailed = false;
+  protected @Nullable
+  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;
+  }
+
+  /** bootpay changed  **/
+  @Override
+  public void onPageFinished(WebView webView, String url) {
+    super.onPageFinished(webView, url);
+    updateBlindViewIfNaverLogin(webView, url);
+
+    if (!mLastLoadFailed) {
+      BPCWebView reactWebView = (BPCWebView) webView;
+
+      reactWebView.callInjectedJavaScript();
+
+      emitFinishEvent(webView, url);
+    }
+  }
+
+  @Override
+  public void onPageStarted(WebView webView, String url, Bitmap favicon) {
+    super.onPageStarted(webView, url, favicon);
+    mLastLoadFailed = false;
+
+    BPCWebView reactWebView = (BPCWebView) webView;
+    reactWebView.callInjectedJavaScriptBeforeContentLoaded();
+
+    ((BPCWebView) webView).dispatchEvent(
+      webView,
+      new TopLoadingStartEvent(
+        webView.getId(),
+        createWebViewEvent(webView, url)));
+  }
+
+  /** bootpay changed  **/
+
+  @Override
+  public boolean shouldOverrideUrlLoading(WebView view, String url) {
+    Intent intent = getIntentWithPackage(url);
+    Context context = view.getContext();
+
+    Log.d("bootpay", "shouldOverrideUrlLoading : " + url);
+
+    if(isIntent(url)) {
+      if(isInstallApp(intent, context)) return startApp(intent, context);
+      else return startGooglePlay(intent, context);
+    } else if(isMarket(url)) {
+      if(isInstallApp(intent, context)) return startApp(intent, context);
+      else return startGooglePlay(intent, context);
+    } else if(isSpecialCase(url)) {
+      if(isInstallApp(intent, context)) return startApp(intent, context);
+      else return startGooglePlay(intent, context);
+    }
+//      return url.contains("vguardend");
+    return shouldOverrideUrlLoadingRN(view, 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<BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState>> lock = BPCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
+      final int lockIdentifier = lock.first;
+      final AtomicReference<BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = lock.second;
+
+      final WritableMap event = createWebViewEvent(view, url);
+      event.putInt("lockIdentifier", lockIdentifier);
+      bpcWebView.sendDirectMessage("onShouldStartLoadWithRequest", event);
+
+      try {
+        assert lockObject != null;
+        synchronized (lockObject) {
+          final long startTime = SystemClock.elapsedRealtime();
+          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);
+              return false;
+            }
+            lockObject.wait(SHOULD_OVERRIDE_URL_LOADING_TIMEOUT);
+          }
+        }
+      } catch (InterruptedException e) {
+        FLog.e(TAG, "shouldOverrideUrlLoading was interrupted while waiting for result.", e);
+        BPCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
+        return false;
+      }
+
+      final boolean shouldOverride = lockObject.get() == BPCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE;
+      BPCWebViewModule.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);
+      ((BPCWebView) view).dispatchEvent(
+        view,
+        new TopShouldStartLoadWithRequestEvent(
+          view.getId(),
+          createWebViewEvent(view, url)));
+      return true;
+    }
+  }
 
   @TargetApi(Build.VERSION_CODES.N)
   @Override
@@ -270,6 +286,15 @@ public 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)
@@ -286,7 +311,7 @@ public class BPCWebViewClient extends WebViewClient {
 
     if (!topWindowUrl.equalsIgnoreCase(failingUrl)) {
       // If error is not due to top-level navigation, then do not call onReceivedError()
-      Log.w("BPCWebViewManager", "Resource blocked from loading due to SSL error. Blocked URL: "+failingUrl);
+      Log.w(TAG, "Resource blocked from loading due to SSL error. Blocked URL: "+failingUrl);
       return;
     }
 
@@ -395,10 +420,10 @@ public class BPCWebViewClient extends WebViewClient {
     super.onRenderProcessGone(webView, detail);
 
     if(detail.didCrash()){
-      Log.e("BPCWebViewManager", "The WebView rendering process crashed.");
+      Log.e(TAG, "The WebView rendering process crashed.");
     }
     else{
-      Log.w("BPCWebViewManager", "The WebView rendering process was killed by the system.");
+      Log.w(TAG, "The WebView rendering process was killed by the system.");
     }
 
     // if webView is null, we cannot return any event
@@ -448,4 +473,4 @@ public class BPCWebViewClient extends WebViewClient {
   public void setProgressChangedFilter(BPCWebView.ProgressChangedFilter filter) {
     progressChangedFilter = filter;
   }
-}
+}