react-native-webview-bootpay 13.8.42 → 13.13.4-6.alpha.1

package/android/src/main/java/kr/co/bootpay/webview/BPCWebViewManagerImpl.kt

@@ -27,11 +27,11 @@ import org.json.JSONObject
 import java.io.UnsupportedEncodingException
 import java.net.MalformedURLException
 import java.net.URL
-import java.util.*
+import java.util.Locale
 
 val invalidCharRegex = "[\\\\/%\"]".toRegex()
 
-class BPCWebViewManagerImpl {
+class BPCWebViewManagerImpl(private val newArch: Boolean = false) {
     companion object {
         const val NAME = "BPCWebView"
     }
@@ -43,6 +43,7 @@ class BPCWebViewManagerImpl {
     private var mDownloadingMessage: String? = null
     private var mLackPermissionToDownloadMessage: String? = null
     private var mHasOnOpenWindowEvent = false
+    private var mPendingSource: ReadableMap? = null
 
     private var mUserAgent: String? = null
     private var mUserAgentWithApplicationName: String? = null
@@ -62,12 +63,12 @@ class BPCWebViewManagerImpl {
         return BPCWebView(context)
     }
 
-    fun createViewInstance(context: ThemedReactContext): BPCWebView {
+    fun createViewInstance(context: ThemedReactContext): BPCWebViewWrapper {
       val webView = createBPCWebViewInstance(context)
       return createViewInstance(context, webView);
     }
 
-    fun createViewInstance(context: ThemedReactContext, webView: BPCWebView): BPCWebView {
+    fun createViewInstance(context: ThemedReactContext, webView: BPCWebView): BPCWebViewWrapper {
         setupWebChromeClient(webView)
         context.addLifecycleEventListener(webView)
         mWebViewConfig.configWebView(webView)
@@ -79,8 +80,8 @@ class BPCWebViewManagerImpl {
         settings.allowFileAccess = false
         settings.allowContentAccess = false
         settings.allowFileAccessFromFileURLs = false
-        setAllowUniversalAccessFromFileURLs(webView, false)
-        setMixedContentMode(webView, "never")
+        settings.allowUniversalAccessFromFileURLs = false
+        settings.mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW
 
         // Fixes broken full-screen modals/galleries due to body height being 0.
         webView.layoutParams = ViewGroup.LayoutParams(
@@ -92,7 +93,7 @@ class BPCWebViewManagerImpl {
         }
         webView.setDownloadListener(DownloadListener { url, userAgent, contentDisposition, mimetype, contentLength ->
             webView.setIgnoreErrFailedForThisURL(url)
-            val module = webView.themedReactContext.getNativeModule(BPCWebViewModule::class.java) ?: return@DownloadListener
+            val module = webView.reactApplicationContext.getNativeModule(BPCWebViewModule::class.java) ?: return@DownloadListener
             val request: DownloadManager.Request = try {
                 DownloadManager.Request(Uri.parse(url))
             } catch (e: IllegalArgumentException) {
@@ -135,7 +136,7 @@ class BPCWebViewManagerImpl {
                 )
             }
         })
-        return webView
+        return BPCWebViewWrapper(context, webView)
     }
 
     private fun setupWebChromeClient(
@@ -223,25 +224,26 @@ class BPCWebViewManagerImpl {
         }
     }
 
-    fun setUserAgent(view: WebView, userAgent: String?) {
+    fun setUserAgent(viewWrapper: BPCWebViewWrapper, userAgent: String?) {
         mUserAgent = userAgent
-        setUserAgentString(view)
+        setUserAgentString(viewWrapper)
     }
 
-    fun setApplicationNameForUserAgent(view: WebView, applicationName: String?) {
+    fun setApplicationNameForUserAgent(viewWrapper: BPCWebViewWrapper, applicationName: String?) {
         when {
             applicationName != null -> {
-                val defaultUserAgent = WebSettings.getDefaultUserAgent(view.context)
+                val defaultUserAgent = WebSettings.getDefaultUserAgent(viewWrapper.webView.context)
                 mUserAgentWithApplicationName = "$defaultUserAgent $applicationName"
             }
             else -> {
                 mUserAgentWithApplicationName = null
             }
         }
-        setUserAgentString(view)
+        setUserAgentString(viewWrapper)
     }
 
-    private fun setUserAgentString(view: WebView) {
+    private fun setUserAgentString(viewWrapper: BPCWebViewWrapper) {
+        val view = viewWrapper.webView
         when {
             mUserAgent != null -> {
                 view.settings.userAgentString = mUserAgent
@@ -255,7 +257,7 @@ class BPCWebViewManagerImpl {
         }
     }
 
-    fun setBasicAuthCredential(view: WebView, credential: ReadableMap?) {
+    fun setBasicAuthCredential(viewWrapper: BPCWebViewWrapper, credential: ReadableMap?) {
         var basicAuthCredential: BPCBasicAuthCredential? = null
         if (credential != null) {
             if (credential.hasKey("username") && credential.hasKey("password")) {
@@ -264,10 +266,18 @@ class BPCWebViewManagerImpl {
                 basicAuthCredential = BPCBasicAuthCredential(username, password)
             }
         }
-        (view as BPCWebView).setBasicAuthCredential(basicAuthCredential)
+        viewWrapper.webView.setBasicAuthCredential(basicAuthCredential)
     }
 
-    fun onDropViewInstance(webView: BPCWebView) {
+    fun onAfterUpdateTransaction(viewWrapper: BPCWebViewWrapper) {
+        mPendingSource?.let { source ->
+            loadSource(viewWrapper, source)
+        }
+        mPendingSource = null
+    }
+
+    fun onDropViewInstance(viewWrapper: BPCWebViewWrapper) {
+        val webView = viewWrapper.webView
         webView.themedReactContext.removeLifecycleEventListener(webView)
         webView.cleanupCallbacksAndDestroy()
         webView.mWebChromeClient = null
@@ -303,7 +313,8 @@ class BPCWebViewManagerImpl {
         .build()
     }
 
-    fun receiveCommand(webView: BPCWebView, commandId: String, args: ReadableArray) {
+    fun receiveCommand(viewWrapper: BPCWebViewWrapper, commandId: String, args: ReadableArray) {
+      val webView = viewWrapper.webView
       when (commandId) {
         "goBack" -> webView.goBack()
         "goForward" -> webView.goForward()
@@ -330,11 +341,9 @@ class BPCWebViewManagerImpl {
         }
         "injectJavaScript" -> webView.evaluateJavascriptWithFallback(args.getString(0))
         "loadUrl" -> {
-          if (args == null) {
-            throw RuntimeException("Arguments for loading an url are null!")
-          }
+          val url = args?.getString(0) ?: throw RuntimeException("Arguments for loading an url are null!")
           webView.progressChangedFilter.setWaitingForCommandLoadUrl(false)
-          webView.loadUrl(args.getString(0))
+          webView.loadUrl(url)
         }
         "requestFocus" -> webView.requestFocus()
         "clearFormData" -> webView.clearFormData()
@@ -346,7 +355,8 @@ class BPCWebViewManagerImpl {
       }
     }
 
-    fun setMixedContentMode(view: WebView, mixedContentMode: String?) {
+    fun setMixedContentMode(viewWrapper: BPCWebViewWrapper, mixedContentMode: String?) {
+        val view = viewWrapper.webView
         if (mixedContentMode == null || "never" == mixedContentMode) {
             view.settings.mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW
         } else if ("always" == mixedContentMode) {
@@ -356,8 +366,8 @@ class BPCWebViewManagerImpl {
         }
     }
 
-    fun setAllowUniversalAccessFromFileURLs(view: WebView, allow: Boolean) {
-        view.settings.allowUniversalAccessFromFileURLs = allow
+    fun setAllowUniversalAccessFromFileURLs(viewWrapper: BPCWebViewWrapper, allow: Boolean) {
+        viewWrapper.webView.settings.allowUniversalAccessFromFileURLs = allow
     }
 
     private fun getDownloadingMessageOrDefault(): String? {
@@ -369,7 +379,12 @@ class BPCWebViewManagerImpl {
             ?: DEFAULT_LACK_PERMISSION_TO_DOWNLOAD_MESSAGE
     }
 
-    fun setSource(view: BPCWebView, source: ReadableMap?, newArch: Boolean = true) {
+    fun setSource(viewWrapper: BPCWebViewWrapper, source: ReadableMap?) {
+        mPendingSource = source
+    }
+
+    private fun loadSource(viewWrapper: BPCWebViewWrapper, source: ReadableMap?) {
+        val view = viewWrapper.webView
         if (source != null) {
             if (source.hasKey("html")) {
                 val html = source.getString("html")
@@ -442,15 +457,18 @@ class BPCWebViewManagerImpl {
         view.loadUrl(BLANK_URL)
     }
 
-    fun setMessagingModuleName(view: BPCWebView, value: String?) {
+    fun setMessagingModuleName(viewWrapper: BPCWebViewWrapper, value: String?) {
+        val view = viewWrapper.webView
         view.messagingModuleName = value
     }
 
-    fun setCacheEnabled(view: BPCWebView, enabled: Boolean) {
+    fun setCacheEnabled(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
+      val view = viewWrapper.webView
       view.settings.cacheMode = if (enabled) WebSettings.LOAD_DEFAULT else WebSettings.LOAD_NO_CACHE
     }
 
-    fun setIncognito(view: BPCWebView, enabled: Boolean) {
+    fun setIncognito(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
+        val view = viewWrapper.webView
         // Don't do anything when incognito is disabled
         if (!enabled) {
             return;
@@ -470,68 +488,84 @@ class BPCWebViewManagerImpl {
         view.settings.saveFormData = false;
     }
 
-    fun setInjectedJavaScript(view: BPCWebView, injectedJavaScript: String?) {
+    fun setInjectedJavaScript(viewWrapper: BPCWebViewWrapper, injectedJavaScript: String?) {
+        val view = viewWrapper.webView
         view.injectedJS = injectedJavaScript
     }
 
-    fun setInjectedJavaScriptBeforeContentLoaded(view: BPCWebView, value: String?) {
+    fun setInjectedJavaScriptBeforeContentLoaded(viewWrapper: BPCWebViewWrapper, value: String?) {
+        val view = viewWrapper.webView
         view.injectedJSBeforeContentLoaded = value
     }
 
-    fun setInjectedJavaScriptForMainFrameOnly(view: BPCWebView, value: Boolean) {
+    fun setInjectedJavaScriptForMainFrameOnly(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.injectedJavaScriptForMainFrameOnly = value
     }
 
-    fun setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(view: BPCWebView, value: Boolean) {
+    fun setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.injectedJavaScriptBeforeContentLoadedForMainFrameOnly = value
     }
 
-    fun setInjectedJavaScriptObject(view: BPCWebView, value: String?) {
+    fun setInjectedJavaScriptObject(viewWrapper: BPCWebViewWrapper, value: String?) {
+        val view = viewWrapper.webView
         view.setInjectedJavaScriptObject(value)
     }
 
-    fun setJavaScriptCanOpenWindowsAutomatically(view: BPCWebView, value: Boolean) {
+    fun setJavaScriptCanOpenWindowsAutomatically(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.javaScriptCanOpenWindowsAutomatically = value
     }
 
-    fun setShowsVerticalScrollIndicator(view: BPCWebView, value: Boolean) {
+    fun setShowsVerticalScrollIndicator(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.isVerticalScrollBarEnabled = value
     }
 
-    fun setShowsHorizontalScrollIndicator(view: BPCWebView, value: Boolean) {
+    fun setShowsHorizontalScrollIndicator(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.isHorizontalScrollBarEnabled = value
     }
 
-    fun setMessagingEnabled(view: BPCWebView, value: Boolean) {
+    fun setMessagingEnabled(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.setMessagingEnabled(value)
     }
 
-    fun setMediaPlaybackRequiresUserAction(view: BPCWebView, value: Boolean) {
+    fun setMediaPlaybackRequiresUserAction(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.mediaPlaybackRequiresUserGesture = value
     }
 
-    fun setHasOnScroll(view: BPCWebView, value: Boolean) {
+    fun setHasOnScroll(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.setHasScrollEvent(value)
     }
 
-    fun setJavaScriptEnabled(view: BPCWebView, enabled: Boolean) {
+    fun setJavaScriptEnabled(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
+        val view = viewWrapper.webView
         view.settings.javaScriptEnabled = enabled
     }
 
-    fun setAllowFileAccess(view: BPCWebView, allowFileAccess: Boolean) {
+    fun setAllowFileAccess(viewWrapper: BPCWebViewWrapper, allowFileAccess: Boolean) {
+        val view = viewWrapper.webView
         view.settings.allowFileAccess = allowFileAccess;
     }
 
-    fun setAllowFileAccessFromFileURLs(view: BPCWebView, value: Boolean) {
+    fun setAllowFileAccessFromFileURLs(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.allowFileAccessFromFileURLs = value;
     }
 
-    fun setAllowsFullscreenVideo(view: BPCWebView, value: Boolean) {
+    fun setAllowsFullscreenVideo(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         mAllowsFullscreenVideo = value
         setupWebChromeClient(view)
     }
 
-    fun setAndroidLayerType(view: BPCWebView, layerTypeString: String?) {
+    fun setAndroidLayerType(viewWrapper: BPCWebViewWrapper, layerTypeString: String?) {
+        val view = viewWrapper.webView
         val layerType = when (layerTypeString) {
             "hardware" -> View.LAYER_TYPE_HARDWARE
             "software" -> View.LAYER_TYPE_SOFTWARE
@@ -540,7 +574,8 @@ class BPCWebViewManagerImpl {
         view.setLayerType(layerType, null)
     }
 
-    fun setCacheMode(view: BPCWebView, cacheModeString: String?) {
+    fun setCacheMode(viewWrapper: BPCWebViewWrapper, cacheModeString: String?) {
+        val view = viewWrapper.webView
         view.settings.cacheMode = when (cacheModeString) {
             "LOAD_CACHE_ONLY" -> WebSettings.LOAD_CACHE_ONLY
             "LOAD_CACHE_ELSE_NETWORK" -> WebSettings.LOAD_CACHE_ELSE_NETWORK
@@ -550,7 +585,8 @@ class BPCWebViewManagerImpl {
         }
     }
 
-    fun setDomStorageEnabled(view: BPCWebView, value: Boolean) {
+    fun setDomStorageEnabled(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.domStorageEnabled = value
     }
 
@@ -558,7 +594,8 @@ class BPCWebViewManagerImpl {
         mDownloadingMessage = value
     }
 
-    fun setForceDarkOn(view: BPCWebView, enabled: Boolean) {
+    fun setForceDarkOn(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
+        val view = viewWrapper.webView
         // Only Android 10+ support dark mode
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
             if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
@@ -581,7 +618,8 @@ class BPCWebViewManagerImpl {
         }
     }
 
-    fun setGeolocationEnabled(view: BPCWebView, value: Boolean) {
+    fun setGeolocationEnabled(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.setGeolocationEnabled(value)
     }
 
@@ -589,16 +627,19 @@ class BPCWebViewManagerImpl {
         mLackPermissionToDownloadMessage = value
     }
 
-    fun setHasOnOpenWindowEvent(view: BPCWebView, value: Boolean) {
+    fun setHasOnOpenWindowEvent(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         mHasOnOpenWindowEvent = value
         setupWebChromeClient(view)
     }
 
-    fun setMinimumFontSize(view: BPCWebView, value: Int) {
+    fun setMinimumFontSize(viewWrapper: BPCWebViewWrapper, value: Int) {
+        val view = viewWrapper.webView
         view.settings.minimumFontSize = value
     }
 
-    fun setAllowsProtectedMedia(view: BPCWebView, enabled: Boolean) {
+    fun setAllowsProtectedMedia(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
+      val view = viewWrapper.webView
       // This variable is used to keep consistency
       // in case a new WebChromeClient is created
       // (eg. when mAllowsFullScreenVideo changes)
@@ -611,15 +652,21 @@ class BPCWebViewManagerImpl {
       }
     }
 
-    fun setMenuCustomItems(view: BPCWebView, value: ReadableArray) {
-        view.setMenuCustomItems(value.toArrayList() as List<Map<String, String>>)
+    fun setMenuCustomItems(viewWrapper: BPCWebViewWrapper, value: ReadableArray?) {
+        val view = viewWrapper.webView
+        when (value) {
+            null -> view.setMenuCustomItems(null)
+            else -> view.setMenuCustomItems(value.toArrayList() as List<Map<String, String>>)
+        }
     }
 
-    fun setNestedScrollEnabled(view: BPCWebView, value: Boolean) {
+    fun setNestedScrollEnabled(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.nestedScrollEnabled = value
     }
 
-    fun setOverScrollMode(view: BPCWebView, overScrollModeString: String?) {
+    fun setOverScrollMode(viewWrapper: BPCWebViewWrapper, overScrollModeString: String?) {
+        val view = viewWrapper.webView
         view.overScrollMode = when (overScrollModeString) {
             "never" -> View.OVER_SCROLL_NEVER
             "content" -> View.OVER_SCROLL_IF_CONTENT_SCROLLS
@@ -628,37 +675,44 @@ class BPCWebViewManagerImpl {
         }
     }
 
-    fun setSaveFormDataDisabled(view: BPCWebView, disabled: Boolean) {
+    fun setSaveFormDataDisabled(viewWrapper: BPCWebViewWrapper, disabled: Boolean) {
+        val view = viewWrapper.webView
         view.settings.saveFormData = !disabled
     }
 
-    fun setScalesPageToFit(view: BPCWebView, value: Boolean) {
+    fun setScalesPageToFit(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.loadWithOverviewMode = value
         view.settings.useWideViewPort = value
     }
 
-    fun setSetBuiltInZoomControls(view: BPCWebView, value: Boolean) {
+    fun setSetBuiltInZoomControls(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.builtInZoomControls = value
     }
 
-    fun setSetDisplayZoomControls(view: BPCWebView, value: Boolean) {
+    fun setSetDisplayZoomControls(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.displayZoomControls = value
 
     }
 
-    fun setSetSupportMultipleWindows(view: BPCWebView, value: Boolean) {
+    fun setSetSupportMultipleWindows(viewWrapper: BPCWebViewWrapper, value: Boolean) {
+        val view = viewWrapper.webView
         view.settings.setSupportMultipleWindows(value)
     }
 
-    fun setTextZoom(view: BPCWebView, value: Int) {
+    fun setTextZoom(viewWrapper: BPCWebViewWrapper, value: Int) {
+        val view = viewWrapper.webView
         view.settings.textZoom = value
     }
 
-    fun setThirdPartyCookiesEnabled(view: BPCWebView, enabled: Boolean) {
+    fun setThirdPartyCookiesEnabled(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
+        val view = viewWrapper.webView
         CookieManager.getInstance().setAcceptThirdPartyCookies(view, enabled)
     }
 
-    fun setWebviewDebuggingEnabled(view: BPCWebView, enabled: Boolean) {
+    fun setWebviewDebuggingEnabled(viewWrapper: BPCWebViewWrapper, enabled: Boolean) {
         BPCWebView.setWebContentsDebuggingEnabled(enabled)
     }
-}
+}

package/android/src/main/java/kr/co/bootpay/webview/BPCWebViewMessagingModule.kt

@@ -0,0 +1,9 @@
+package kr.co.bootpay.webview
+
+import com.facebook.react.bridge.JavaScriptModule
+import com.facebook.react.bridge.WritableMap
+
+internal interface BPCWebViewMessagingModule : JavaScriptModule {
+  fun onShouldStartLoadWithRequest(event: WritableMap)
+  fun onMessage(event: WritableMap)
+}

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

@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import static android.app.Activity.RESULT_OK;
 
 public class BPCWebViewModuleImpl implements ActivityEventListener {
-    public static final String NAME = "BPCWebView";
+    public static final String NAME = "BPCWebViewModule";
 
     public static final int PICKER = 1;
     public static final int PICKER_LEGACY = 3;

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

@@ -15,10 +15,10 @@ public class BootpayUrlHelper {
       Intent intent = getIntentWithPackage(url);
       Context context = view.getContext();
 
-      Log.d("bootpay", "doDeepLinkIfPayUrl: " + url);
+      Log.i("bootpay", "doDeepLinkIfPayUrl: " + url);
 
       if(isIntent(url)) {
-        Log.d("isIntent", "isInstallApp called");
+        Log.i("isIntent", "isInstallApp called");
         if(isInstallApp(intent, context)) return startApp(intent, context);
         else return startGooglePlay(intent, context);
       } else if(isMarket(url)) {
@@ -84,26 +84,18 @@ public class BootpayUrlHelper {
       }
     }
 
-    public static boolean isInstallApp(Intent intent, Context context) {
-//        return isExistPackageInfo(intent, context) || isExistLaunchedIntent(intent, context);
-//      return intent != null &&  intent.getPackage() != null && context.getPackageManager().getLaunchIntentForPackage(intent.getPackage()) != null;
-
-      Log.d("isInstallApp", "isInstallApp called");
-
+    public static boolean isInstallApp(Intent intent, Context context) { 
       if (intent == null) {
-        Log.d("isInstallApp", "Intent is null");
         return false;
       }
       String packageName = intent.getPackage();
       if (packageName == null) {
-        Log.d("isInstallApp", "Package name is null");
         return false;
       }
-      Log.d("isInstallApp", "Package name: " + packageName);
+      
       PackageManager packageManager = context.getPackageManager();
       Intent launchIntent = packageManager.getLaunchIntentForPackage(packageName);
       boolean isInstalled = launchIntent != null;
-      Log.d("isInstallApp", "Is installed: " + isInstalled);
       return isInstalled;
     }