@juspay-tech/react-native-hyperswitch 0.2.1 → 0.3.0

package/android/src/main/java/com/hyperswitchsdkreactnative/internal/ReactFragment.kt

@@ -30,12 +30,18 @@ import com.facebook.react.shell.MainReactPackage
 import com.hyperswitchsdkreactnative.BuildConfig
 import com.hyperswitchsdkreactnative.R
 import com.hyperswitchsdkreactnative.internal.DefaultReactHost.getDefaultReactHost
+import com.hyperswitchsdkreactnative.modules.HyperswitchSdkReactNativeModule
 import com.hyperswitchsdkreactnative.provider.HyperProvider
+import com.proyecto26.inappbrowser.ChromeTabsDismissedEvent
+import com.proyecto26.inappbrowser.ChromeTabsManagerActivity
 import `in`.juspay.hyperota.LazyDownloadCallback
 import `in`.juspay.hyperotareact.HyperOTAReact
 import io.hyperswitch.hyperota.HyperOtaLogger
 import io.hyperswitch.react.SDKEnvironment
 import io.hyperswitch.react.Utils.Companion.checkEnvironment
+import io.hyperswitch.redirect.RedirectEvent
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
 
 /**
  * Fragment for creating a React View. This allows the developer to "embed" a React Application
@@ -46,7 +52,6 @@ internal open class ReactFragment : Fragment(), PermissionAwareActivity {
 
   private var disableHostLifecycleEvents = false
   private var permissionListener: PermissionListener? = null
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     var mainComponentName: String? = null
@@ -73,6 +78,7 @@ internal open class ReactFragment : Fragment(), PermissionAwareActivity {
           fabricEnabled,
         ))
       }
+    registerEventBus()
   }
 
   /**
@@ -81,6 +87,33 @@ internal open class ReactFragment : Fragment(), PermissionAwareActivity {
    * method if your application class does not implement `ReactApplication` or you simply have a
    * different mechanism for storing a `ReactNativeHost`, e.g. as a static field somewhere.
    */
+
+  @Subscribe
+  fun onEvent(event: RedirectEvent) {
+    unRegisterEventBus()
+    EventBus.getDefault().post(
+      ChromeTabsDismissedEvent(
+        event.message,
+        event.resultType,
+        event.isError
+      )
+    )
+    startActivity(ChromeTabsManagerActivity.createDismissIntent(context))
+  }
+  private fun registerEventBus() {try{
+    if (!EventBus.getDefault().isRegistered(this)) {
+      EventBus.getDefault().register(this)
+    }
+  }catch(_: Exception){}
+  }
+
+  fun unRegisterEventBus() {
+    try {
+      if (EventBus.getDefault().isRegistered(this)) {
+        EventBus.getDefault().unregister(this)
+      }
+    }catch(_: Exception){}
+  }
   @Suppress("DEPRECATION")
   @Deprecated(
     "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
@@ -159,6 +192,7 @@ internal open class ReactFragment : Fragment(), PermissionAwareActivity {
 
   override fun onDestroy() {
     super.onDestroy()
+    unRegisterEventBus()
     if (!disableHostLifecycleEvents) {
       reactDelegate.onHostDestroy()
     } else {

package/android/src/main/java/com/hyperswitchsdkreactnative/modules/HyperswitchSdkNativeModule.kt

@@ -38,7 +38,6 @@ class HyperswitchSdkNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   override fun launchGPay(requestObj: String, callback: Callback) {
-    Log.i("Manideep", "called gpay here")
     currentActivity?.let {
       GooglePayCallbackManager.setCallback(
         it,
@@ -61,8 +60,8 @@ class HyperswitchSdkNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   override fun exitPaymentsheet(rootTag: Double, result: String, reset: Boolean) {
     try {
-      resetView()
       resolvePromise(result)
+      resetView()
     } catch (e: JSONException) {
       // Log.e(NAME, "Failed to parse JSON result: $result", e)
       resolvePromise(result)
@@ -73,7 +72,13 @@ class HyperswitchSdkNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   override fun exitPaymentMethodManagement(rootTag: Double, result: String, reset: Boolean) {
 //    Log.d(NAME, "exitPaymentMethodManagement called $result")
-    resolvePromise(result)
+    try {
+      resolvePromise(result)
+      resetView()
+    } catch (e: JSONException) {
+      // Log.e(NAME, "Failed to parse JSON result: $result", e)
+      resolvePromise(result)
+    }
 
     // Implementation for exiting payment method management
   }
@@ -81,7 +86,14 @@ class HyperswitchSdkNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   override fun exitWidget(result: String, widgetType: String) {
 //    Log.d(NAME, "exitWidget called with result: $result, widgetType: $widgetType")
-    resolvePromise(result)
+    try {
+      resolvePromise(result)
+      resetView()
+    } catch (e: JSONException) {
+      // Log.e(NAME, "Failed to parse JSON result: $result", e)
+      resolvePromise(result)
+    }
+
 
     // Implementation for exiting widget
   }
@@ -89,7 +101,13 @@ class HyperswitchSdkNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   override fun exitCardForm(result: String) {
 //    Log.d(NAME, "exitCardForm called with result: $result")
-    resolvePromise(result)
+    try {
+      resolvePromise(result)
+      resetView()
+    } catch (e: JSONException) {
+      // Log.e(NAME, "Failed to parse JSON result: $result", e)
+      resolvePromise(result)
+    }
 
     // Implementation for exiting card form
   }
@@ -97,7 +115,13 @@ class HyperswitchSdkNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   override fun exitWidgetPaymentsheet(rootTag: Double, result: String, reset: Boolean) {
 //    Log.d(NAME, "exitWidgetPaymentsheet called")
-    resolvePromise(result)
+    try {
+      resolvePromise(result)
+      resetView()
+    } catch (e: JSONException) {
+      // Log.e(NAME, "Failed to parse JSON result: $result", e)
+      resolvePromise(result)
+    }
 
     // Implementation for exiting widget payment sheet
   }

package/android/src/main/java/com/hyperswitchsdkreactnative/provider/HyperProvider.kt

@@ -91,6 +91,7 @@ internal class HyperProvider internal constructor(private val activity: Activity
     activity?.let {
       try {
         if (reactFragment != null) {
+          reactFragment!!.unRegisterEventBus()
           it.supportFragmentManager.beginTransaction().remove(reactFragment!!).commitAllowingStateLoss()
         }
         if (reset) {
@@ -103,7 +104,7 @@ internal class HyperProvider internal constructor(private val activity: Activity
 
   companion object {
     @JvmStatic
-    var reactFragment: Fragment? = null
+    var reactFragment: ReactFragment? = null
 
     @JvmStatic
     private var publishableKey: String? = null
@@ -205,7 +206,7 @@ internal class HyperProvider internal constructor(private val activity: Activity
 
     private fun getHyperParams(context: Activity, configuration: Bundle): Bundle = Bundle().apply {
       putString("appId", context.packageName)
-      putString("country", context.resources?.configuration?.locale?.country)
+      putString("country", context.resources?.configuration?.locales?.get(0)?.country)
       putString("user-agent", getUserAgent(context))
       putDouble("launchTime", getCurrentTime())
       putString("sdkVersion", BuildConfig.VERSION_NAME)

package/ios/hyperswitchSDK/Core/NativeModule/OTAServices.swift

@@ -102,7 +102,7 @@ public final class OTAServices {
                 "forceUpdate": true,
                 "localAssets": (getHyperOTAPlist(configKey) ?? "releaseConfigURL") == "releaseConfigURL",
                 "fileName": getHyperOTAPlist("fileName") ?? "" ,
-                "releaseConfigURL": (getHyperOTAPlist(configKey) ?? "") +  "/mobile-ota/ios/" + SDKVersion.current + "/config.json",
+                "releaseConfigURL": (getHyperOTAPlist(configKey) ?? "") +  "/mobile-ota/rn/ios/" + SDKVersion.current + "/config.json",
             ] as [String: Any]
             self.otaServices = HyperOTAServices(payload: payload, loggerDelegate: logger, baseBundle: Bundle(for: OTAServices.self))
         }