react-native-webview-bootpay 11.18.1 → 11.18.13

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   if (project == rootProject) {
     repositories {
       mavenCentral()
-      google()
+      google() 
     }
 
     dependencies {
@@ -18,7 +18,7 @@ buildscript {
     }
   } else {
     repositories {
-      mavenCentral()
+      mavenCentral() 
     }
 
     dependencies {
@@ -28,14 +28,14 @@ buildscript {
 }
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNativeWebViewBootpayBootpay_' + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNativeWebViewBootpay_' + name]).toInteger()
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion') 
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault('minSdkVersion')
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
@@ -57,7 +57,7 @@ android {
 }
 
 repositories {
-  mavenCentral()
+  mavenCentral() 
   google()
 
   def found = false

package/android/gradle.properties

@@ -1,6 +1,6 @@
-ReactNativeWebView_kotlinVersion=1.3.50
-ReactNativeWebView_webkitVersion=1.4.0
-ReactNativeWebView_compileSdkVersion=29
-ReactNativeWebView_buildToolsVersion=29.0.3
-ReactNativeWebView_targetSdkVersion=28
-ReactNativeWebView_minSdkVersion=21
+ReactNativeWebViewBootpay_kotlinVersion=1.3.50
+ReactNativeWebViewBootpay_webkitVersion=1.4.0
+ReactNativeWebViewBootpay_compileSdkVersion=30
+ReactNativeWebViewBootpay_buildToolsVersion=30.0.3
+ReactNativeWebViewBootpay_targetSdkVersion=28
+ReactNativeWebViewBootpay_minSdkVersion=21

package/android/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Apr 20 09:36:10 KST 2022
+#Tue Apr 19 11:03:28 KST 2022
 sdk.dir=/Users/bootpay/Library/Android/sdk

package/android/src/main/AndroidManifest.xml

@@ -12,4 +12,79 @@
         android:resource="@xml/file_provider_paths" />
     </provider>
   </application>
+
+
+  <!-- android 11 모든 앱 접근 권한 사용  (Google Play 가이드라인 참고 - 2021-02-19 기준 못찾았음) -->
+  <!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />-->
+  <!-- android 11 Package Visibility 설정 (compileSdkVersion, targetSdkVersion 30 이상 설정시 필수) -->
+  <!-- 2021-02-19 -->
+  <queries>
+      <!--         다날[신한, BC(페이북), 국민, 현대, 삼성, 하나, 롯데, 농협, 우리, 씨티, 페이코, 삼성페이, 카카오페이, 뱅크페이, SSG페이, 스마일페이, 엘페이] -->
+      <!--         KCP [페이코, 현대, BC(페이북), 롯데, 국민, 농협, 삼성, 신한, 우리, 하나, 씨티] -->
+      <!--         이니시스 [카카오페이, 네이버페이, 신한, 하나, 현대, 삼성, 국민, BC(페이북), 농협, 롯데, 씨티, 페이코, 엘페이, SSG페이, 차이, 토스, 삼성페이] -->
+      <!--         나이스페이 [신한, 국민, 삼성, BC(페이북), 롯데, 현대, 하나 농협, 씨티, 우리] -->
+      <!--         토스페이먼츠 [현대, 신한, 페이북, 국민, 삼성, 롯데, 농협, 우리] -->
+      <!--         이지페이 [현대, 하나, 국민, 롯데, 삼성, BC(페이북) 신한, 하나, 농협, 씨티, 우리, 페이코] -->
+      <!--         티페이 [BC(페이북), 국민, 하나, 삼성, 신한, 현대, 롯데, 농협, 씨티, 우리] -->
+      <!--         페이레터 [BC(페이북), 국민, 하나, 삼성, 신한, 현대. 롯데, 농협, 씨티, ] -->
+      <!--         월컴페이먼츠 [카카오, 엘페이, 현대, BC(페이북), 국민, 삼성, 신한, 롯데, 농협, 하나, 씨티, 하나, 우리] -->
+
+      <!-- 간편결제 -->
+      <package android:name="com.nhnent.payapp" /> <!-- 페이코 -->
+      <package android:name="com.lottemembers.android" /> <!-- LPAY -->
+      <package android:name="com.ssg.serviceapp.android.egiftcertificate" /> <!-- SSG 페이 -->
+      <package android:name="com.inicis.kpay" /> <!-- 이니시스 KPAY -->
+      <package android:name="com.tmoney.tmpay" /> <!-- 티머니페이 -->
+      <package android:name="viva.republica.toss" /> <!-- 토스페이 -->
+      <package android:name="com.kakao.talk" /> <!-- 카카오페이 -->
+      <package android:name="com.mysmilepay.app" /> <!-- 스마일 페이 -->
+      <package android:name="com.lotte.lpay" /> <!-- 엘페이 -->
+      <package android:name="finance.chai.app" /> <!-- 차이 -->
+      <package android:name="com.nhn.android.search" /> <!-- 네이버 -->
+
+      <!-- 앱카드 -->
+      <package android:name="kvp.jjy.MispAndroid320" />  <!-- BC 페이북 -->
+      <package android:name="com.kbcard.kbkookmincard" /> <!-- 국민카드 -->
+      <package android:name="com.kbcard.cxh.appcard" /> <!-- 국민카드 -->
+      <package android:name="com.kbstar.liivbank" /> <!-- 국민 리브 -->
+      <package android:name="com.kbstar.reboot" /> <!-- 국민 new 리브 -->
+      <package android:name="com.samsung.android.spay" /> <!-- 삼성페이 -->
+      <package android:name="com.samsung.android.spaylite" /> <!-- 삼성페이 미니 -->
+      <package android:name="com.lge.lgpay" /> <!-- 엘지페이 -->
+      <package android:name="com.hanaskcard.paycla" /> <!-- 하나카드 -->
+      <package android:name="kr.co.hanamembers.hmscustomer" /> <!-- 하나카드(멤버스결제) -->
+      <package android:name="com.lcacApp" /> <!-- 롯데카드 -->
+      <package android:name="kr.co.samsungcard.mpocket" /> <!-- 삼성카드 -->
+      <package android:name="com.shcard.smartpay" /> <!-- 신한카드-->
+      <package android:name="com.shinhancard.smartshinhan" /> <!-- 신한카드 (ARS/일반결제/Smart결제) -->
+      <package android:name="com.hyundaicard.appcard" /> <!-- 현대카드 -->
+      <package android:name="nh.smart.nhallonepay" /> <!-- 농협카드 -->
+      <package android:name="com.wooricard.wpay" /> <!-- 우리카드 -->
+      <package android:name="com.wooricard.smartapp" /> <!-- 우리 WON 카드 -->
+      <package android:name="com.wooribank.smart.npib" /> <!-- 우리 WON 뱅킹 -->
+      <package android:name="kr.co.citibank.citimobile" /> <!-- 씨티카드 -->
+
+
+      <!-- 계좌이체 -->
+      <package android:name="com.kftc.bankpay.android" /> <!-- 뱅크페이 -->
+      <package android:name="com.kbankwith.smartbank" /> <!-- 케이뱅크 -->
+      <package android:name="com.knb.psb" /> <!-- BNK 경남은행 모바일뱅킹 -->
+      <package android:name="kr.co.kfcc.mobilebank" /> <!-- MG 새마을금고 -->
+      <package android:name="com.nh.cashcardapp" /> <!-- NH앱캐시 -->
+
+      <!-- 공인인증(신용카드) -->
+      <package android:name="com.hanaskcard.rocomo.potal" /> <!-- 하나카드 -->
+      <package android:name="com.lumensoft.touchenappfree" /> <!-- 현대카드  -->
+
+
+      <!-- 보안앱 -->
+      <package android:name="com.TouchEn.mVaccine.webs" /> <!-- 신한, 씨티 -->
+      <package android:name="kr.co.shiftworks.vguardweb" /> <!-- 삼성  -->
+      <package android:name="com.ahnlab.v3mobileplus" /> <!-- 하나, 농협, 우리, 국민 리브  -->
+
+      <!-- 휴대폰 결제 -->
+      <package android:name="com.kt.ktauth" /> <!-- KT 본인인증 -->
+      <package android:name="kr.danal.app.damoum" /> <!-- 다모음 -->
+      <package android:name="uplus.membership" /> <!-- U+ 멤버스 -->
+   </queries>
 </manifest>

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

@@ -3,6 +3,11 @@ package kr.co.bootpay.webview;
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
@@ -10,13 +15,18 @@ import android.os.Message;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.webkit.ConsoleMessage;
 import android.webkit.GeolocationPermissions;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
@@ -28,7 +38,9 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
+import com.facebook.react.uimanager.ThemedReactContext;
 
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -84,10 +96,114 @@ class BPCWebChromeClient extends WebChromeClient implements LifecycleEventListen
     this.mWebView = webView;
   }
 
+//  Dialog popupDialog;
+  @Override
+  public void onCloseWindow(WebView window) {
+    super.onCloseWindow(window);
+    ((BPCWebView) window).dissmissDialog();
+    window.setVisibility(View.GONE);
+  }
+
+  void setWebSettingCopy(WebView view, WebView newWebView) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+      newWebView.getSettings().setMediaPlaybackRequiresUserGesture( view.getSettings().getMediaPlaybackRequiresUserGesture() );
+    }
+
+    newWebView.getSettings().setBuiltInZoomControls(view.getSettings().getBuiltInZoomControls());
+    newWebView.getSettings().setDisplayZoomControls(view.getSettings().getDisplayZoomControls());
+    newWebView.getSettings().setAllowFileAccess(view.getSettings().getAllowFileAccess());
+    newWebView.getSettings().setAllowContentAccess(view.getSettings().getAllowContentAccess());
+    newWebView.getSettings().setLoadWithOverviewMode(view.getSettings().getLoadWithOverviewMode());
+//      newWebView.getSettings().setEnableSmoothTransition(view.getSettings().);
+    newWebView.getSettings().setSaveFormData(view.getSettings().getSaveFormData());
+    newWebView.getSettings().setSavePassword(view.getSettings().getSavePassword());
+    newWebView.getSettings().setTextZoom(view.getSettings().getTextZoom());
+
+    newWebView.getSettings().setUseWideViewPort(view.getSettings().getUseWideViewPort());
+    newWebView.getSettings().setSupportMultipleWindows(true);
+    newWebView.getSettings().setLayoutAlgorithm(view.getSettings().getLayoutAlgorithm());
+    newWebView.getSettings().setStandardFontFamily(view.getSettings().getStandardFontFamily());
+    newWebView.getSettings().setFixedFontFamily(view.getSettings().getFixedFontFamily());
+    newWebView.getSettings().setSansSerifFontFamily(view.getSettings().getSansSerifFontFamily());
+    newWebView.getSettings().setSerifFontFamily(view.getSettings().getSerifFontFamily());
+    newWebView.getSettings().setCursiveFontFamily(view.getSettings().getCursiveFontFamily());
+    newWebView.getSettings().setFantasyFontFamily(view.getSettings().getFantasyFontFamily());
+    newWebView.getSettings().setMinimumFontSize(view.getSettings().getMinimumFontSize());
+    newWebView.getSettings().setMinimumLogicalFontSize(view.getSettings().getMinimumLogicalFontSize());
+    newWebView.getSettings().setDefaultFontSize(view.getSettings().getDefaultFontSize());
+    newWebView.getSettings().setDefaultFixedFontSize(view.getSettings().getDefaultFixedFontSize());
+    newWebView.getSettings().setLoadsImagesAutomatically(view.getSettings().getLoadsImagesAutomatically());
+    newWebView.getSettings().setBlockNetworkImage(view.getSettings().getBlockNetworkImage());
+    newWebView.getSettings().setJavaScriptEnabled(view.getSettings().getJavaScriptEnabled());
+    newWebView.getSettings().setDatabaseEnabled(view.getSettings().getDatabaseEnabled());
+    newWebView.getSettings().setDomStorageEnabled(view.getSettings().getDomStorageEnabled());
+
+    newWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(view.getSettings().getJavaScriptCanOpenWindowsAutomatically());
+    newWebView.getSettings().setDefaultTextEncodingName(view.getSettings().getDefaultTextEncodingName());
+    newWebView.getSettings().setUserAgentString(view.getSettings().getUserAgentString());
+    newWebView.getSettings().setCacheMode(view.getSettings().getCacheMode());
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      newWebView.getSettings().setMixedContentMode(view.getSettings().getMixedContentMode());
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      newWebView.getSettings().setSafeBrowsingEnabled(view.getSettings().getSafeBrowsingEnabled());
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      newWebView.getSettings().setForceDark(view.getSettings().getForceDark());
+    }
+    
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      newWebView.getSettings().setDisabledActionModeMenuItems(view.getSettings().getDisabledActionModeMenuItems());
+    }
+  }
+
   @Override
   public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
 
-    final WebView newWebView = new WebView(view.getContext());
+    final BPCWebView newWebView = new BPCWebView((ThemedReactContext) view.getContext());
+    BPCWebChromeClient client = new BPCWebChromeClient(this.mReactContext, view);
+//    client.onCloseWindow();
+    client.setProgressChangedFilter(progressChangedFilter);
+
+    newWebView.setWebChromeClient(client);
+
+    setWebSettingCopy(view, newWebView);
+
+    newWebView.setWebViewClient(new BPCWebViewClient() {
+
+      @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");
+      }
+    });
+
+    Dialog popupDialog = new Dialog(view.getContext(), android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+    popupDialog.setContentView(newWebView);
+    ViewGroup.LayoutParams params = popupDialog.getWindow().getAttributes();
+    params.width = ViewGroup.LayoutParams.MATCH_PARENT;
+    params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+    popupDialog.getWindow().setAttributes((WindowManager.LayoutParams) params);
+    popupDialog.setOnDismissListener(dialog -> {
+//      Toast.makeText(view.getContext(), "팝업취소", Toast.LENGTH_SHORT).show();
+      onCloseWindow(view); //rn에선 딱히 동작하지 않음 
+    });
+    newWebView.setDialog(popupDialog);
+    popupDialog.show();
+
     final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
     transport.setWebView(newWebView);
     resultMsg.sendToTarget();
@@ -118,6 +234,8 @@ class BPCWebChromeClient extends WebChromeClient implements LifecycleEventListen
     event.putBoolean("canGoBack", webView.canGoBack());
     event.putBoolean("canGoForward", webView.canGoForward());
     event.putDouble("progress", (float) newProgress / 100);
+
+
     ((BPCWebView) webView).dispatchEvent(
       webView,
       new TopLoadingProgressEvent(
@@ -332,4 +450,4 @@ class BPCWebChromeClient extends WebChromeClient implements LifecycleEventListen
   public void setProgressChangedFilter(BPCWebView.ProgressChangedFilter filter) {
     progressChangedFilter = filter;
   }
-}
+}

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

@@ -4,7 +4,6 @@ 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;
@@ -33,10 +32,13 @@ 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 {
   Dialog dialog; //popup dialog
   public void setDialog(Dialog dialog) {
@@ -64,13 +66,12 @@ class BPCWebView extends WebView implements LifecycleEventListener {
   protected @Nullable
   String messagingModuleName;
   protected @Nullable
-  BPCWebViewClient mbpCWebViewClient;
+  BPCWebViewClient mbpCWebViewlient;
   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";
@@ -88,11 +89,7 @@ class BPCWebView extends WebView implements LifecycleEventListener {
   }
 
   public void setIgnoreErrFailedForThisURL(String url) {
-    mbpCWebViewClient.setIgnoreErrFailedForThisURL(url);
-  }
-
-  public void setBasicAuthCredential(BasicAuthCredential credential) {
-    mbpCWebViewClient.setBasicAuthCredential(credential);
+    mbpCWebViewlient.setIgnoreErrFailedForThisURL(url);
   }
 
   public void setSendContentSizeChangeEvents(boolean sendContentSizeChangeEvents) {
@@ -103,10 +100,6 @@ class BPCWebView extends WebView implements LifecycleEventListener {
     this.hasScrollEvent = hasScrollEvent;
   }
 
-  public void setNestedScrollEnabled(boolean nestedScrollEnabled) {
-    this.nestedScrollEnabled = nestedScrollEnabled;
-  }
-
   @Override
   public void onHostResume() {
     // do nothing
@@ -122,14 +115,6 @@ 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);
@@ -150,8 +135,8 @@ class BPCWebView extends WebView implements LifecycleEventListener {
   public void setWebViewClient(WebViewClient client) {
     super.setWebViewClient(client);
     if (client instanceof BPCWebViewClient) {
-      mbpCWebViewClient = (BPCWebViewClient) client;
-      mbpCWebViewClient.setProgressChangedFilter(progressChangedFilter);
+      mbpCWebViewlient = (BPCWebViewClient) client;
+      mbpCWebViewlient.setProgressChangedFilter(progressChangedFilter);
     }
   }
 
@@ -167,7 +152,7 @@ class BPCWebView extends WebView implements LifecycleEventListener {
 
   public @Nullable
   BPCWebViewClient getBPCWebViewClient() {
-    return mbpCWebViewClient;
+    return mbpCWebViewlient;
   }
 
   public void setInjectedJavaScript(@Nullable String js) {
@@ -251,15 +236,15 @@ class BPCWebView extends WebView implements LifecycleEventListener {
     ReactContext reactContext = (ReactContext) this.getContext();
     BPCWebView mContext = this;
 
-    if (mbpCWebViewClient != null) {
+    if (mbpCWebViewlient != null) {
       WebView webView = this;
       webView.post(new Runnable() {
         @Override
         public void run() {
-          if (mbpCWebViewClient == null) {
+          if (mbpCWebViewlient == null) {
             return;
           }
-          WritableMap data = mbpCWebViewClient.createWebViewEvent(webView, webView.getUrl());
+          WritableMap data = mbpCWebViewlient.createWebViewEvent(webView, webView.getUrl());
           data.putString("data", message);
 
           if (mCatalystInstance != null) {