Merge pull request #443 from qonversion/release/10.8.0

Release 10.8.0

Author: suriksarkisyan

android/build.gradle

@@ -80,7 +80,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "io.qonversion:sandwich:7.8.0"
+  implementation "io.qonversion:sandwich:7.9.0"
 }
 
 if (isNewArchitectureEnabled()) {

android/src/main/java/com/qonversion/reactnativesdk/NoCodesModule.kt

@@ -62,9 +62,18 @@ class NoCodesModule(private val reactContext: ReactApplicationContext) : NativeN
     }
 
     @ReactMethod
-    override fun showScreen(contextKey: String, promise: Promise) {
+    override fun showScreen(contextKey: String, customVariables: ReadableMap?, promise: Promise) {
         try {
-            noCodesSandwich.showScreen(contextKey)
+            val variablesMap: Map<String, String>? = customVariables?.let { map ->
+                buildMap {
+                    val iterator = map.keySetIterator()
+                    while (iterator.hasNextKey()) {
+                        val key = iterator.nextKey()
+                        map.getString(key)?.let { put(key, it) }
+                    }
+                }
+            }
+            noCodesSandwich.showScreen(contextKey, variablesMap)
             promise.resolve(true)
         } catch (e: Exception) {
             promise.reject(e)

android/src/main/java/com/qonversion/reactnativesdk/QonversionModule.kt

@@ -153,6 +153,13 @@ class QonversionModule(reactContext: ReactApplicationContext) : NativeQonversion
         qonversionSandwich.userProperties(getResultListener(promise))
     }
 
+    @ReactMethod
+    override fun forceSendProperties(promise: Promise) {
+        qonversionSandwich.forceSendProperties {
+            promise.resolve(null)
+        }
+    }
+
     @ReactMethod
     override fun addAttributionData(map: ReadableMap?, provider: String) {
         try {

example/src/screens/EntitlementsScreen/index.tsx

@@ -7,7 +7,7 @@ import {
   ScrollView,
   Platform,
 } from 'react-native';
-import Qonversion, { Entitlement } from '@qonversion/react-native-sdk';
+import Qonversion, { PurchaseResult } from '@qonversion/react-native-sdk';
 import Snackbar from 'react-native-snackbar';
 import { AppContext } from '../../store/AppStore';
 import SkeletonLoader from '../../components/SkeletonLoader';
@@ -37,22 +37,27 @@ const EntitlementsScreen: React.FC = () => {
     }
   };
 
-  const setEntitlementsListener = () => {
-    console.log('🔄 [Qonversion] Setting entitlements update listener...');
-    Qonversion.getSharedInstance().setEntitlementsUpdateListener({
-      onEntitlementsUpdated(entitlements: Map<string, Entitlement>) {
+  const setDeferredPurchasesListener = () => {
+    console.log('🔄 [Qonversion] Setting deferred purchases listener...');
+    Qonversion.getSharedInstance().setDeferredPurchasesListener({
+      onDeferredPurchaseCompleted(purchaseResult: PurchaseResult) {
         console.log(
-          '📡 [Qonversion] Entitlements updated via listener:',
-          Object.fromEntries(entitlements)
+          '📡 [Qonversion] Deferred purchase completed via listener:',
+          purchaseResult
         );
-        dispatch({ type: 'SET_ENTITLEMENTS', payload: entitlements });
+        if (purchaseResult.entitlements) {
+          dispatch({
+            type: 'SET_ENTITLEMENTS',
+            payload: purchaseResult.entitlements,
+          });
+        }
       },
     });
     console.log(
-      '✅ [Qonversion] Entitlements update listener set successfully'
+      '✅ [Qonversion] Deferred purchases listener set successfully'
     );
     Snackbar.show({
-      text: 'Entitlements listener set successfully!',
+      text: 'Deferred purchases listener set successfully!',
       duration: Snackbar.LENGTH_SHORT,
     });
   };
@@ -148,10 +153,10 @@ const EntitlementsScreen: React.FC = () => {
 
         <TouchableOpacity
           style={styles.button}
-          onPress={setEntitlementsListener}
+          onPress={setDeferredPurchasesListener}
         >
           <Text style={styles.buttonText}>
-            Set Entitlements Updated Listener
+            Set Deferred Purchases Listener
           </Text>
         </TouchableOpacity>
 

ios/RNNoCodes.mm

@@ -52,11 +52,23 @@ - (void)setScreenPresentationConfig:(NSDictionary *)configData
 }
 
 - (void)showScreen:(NSString *)contextKey
+   customVariables:(NSDictionary *)customVariables
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject {
+    NSDictionary<NSString *, NSString *> *typedVariables = nil;
+    if ([customVariables isKindOfClass:[NSDictionary class]]) {
+        NSMutableDictionary<NSString *, NSString *> *typed = [NSMutableDictionary dictionaryWithCapacity:customVariables.count];
+        for (NSString *key in customVariables) {
+            id value = customVariables[key];
+            if ([key isKindOfClass:[NSString class]] && [value isKindOfClass:[NSString class]]) {
+                typed[key] = value;
+            }
+        }
+        typedVariables = typed;
+    }
     dispatch_async(dispatch_get_main_queue(), ^{
         @try {
-            [self.impl showScreenWithContextKey:contextKey];
+            [self.impl showScreenWithContextKey:contextKey customVariables:typedVariables];
         } @catch (NSException *exception) {
             QNR_LOG_EXCEPTION("showScreen", exception);
         }

ios/RNNoCodesImpl.swift

@@ -76,8 +76,8 @@ public class RNNoCodesImpl: NSObject {
     }
 
     @MainActor @objc
-    public func showScreen(contextKey: String) {
-        noCodesSandwich?.showScreen(contextKey)
+    public func showScreen(contextKey: String, customVariables: [String: String]?) {
+        noCodesSandwich?.showScreen(contextKey, customVariables: customVariables)
     }
 
     @MainActor @objc

ios/RNQonversion.mm

@@ -159,6 +159,15 @@ - (void)userProperties:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectB
     }
 }
 
+- (void)forceSendProperties:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+    @try {
+        [self.impl forceSendProperties:resolve reject:reject];
+    } @catch (NSException *exception) {
+        QNR_LOG_EXCEPTION("forceSendProperties", exception);
+        reject(@"QONBridgeException", exception.reason, nil);
+    }
+}
+
 - (void)checkEntitlements:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
     @try {
         [self.impl checkEntitlements:resolve reject:reject];

ios/RNQonversionImpl.swift

@@ -109,6 +109,13 @@ public class RNQonversionImpl: NSObject {
     }
   }
 
+  @objc
+  public func forceSendProperties(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    qonversionSandwich?.forceSendProperties {
+      resolve(nil)
+    }
+  }
+
   @objc
   public func addAttributionData(_ data: [String: Any], provider: String) {
     qonversionSandwich?.attribution(providerKey: provider, value: data)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qonversion/react-native-sdk",
   "title": "React Native Qonversion",
-  "version": "10.7.0",
+  "version": "10.8.0",
   "description": "Qonversion provides full in-app purchases infrastructure, so you do not need to build your own server for receipt validation. Implement in-app subscriptions, validate user receipts, check subscription status, and provide access to your app features and content using our StoreKit wrapper and Google Play Billing wrapper.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

qonversion-react-native-sdk.podspec

@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "QonversionSandwich", "7.8.0"
+  s.dependency "QonversionSandwich", "7.9.0"
   install_modules_dependencies(s)
 end