Merge pull request #313 from qonversion/release/9.6.0

Release 9.6.0

Author: suriksarkisyan

Editor/QonversionDependencies.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dependencies>
     <androidPackages>
-        <androidPackage spec="io.qonversion:sandwich:7.8.2" />
+        <androidPackage spec="io.qonversion:sandwich:7.9.0" />
         <androidPackage spec="com.fasterxml.jackson.core:jackson-databind:2.11.1" />
         <androidPackage spec="org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.61" />
     </androidPackages>
     <iosPods>
-      <iosPod name="QonversionSandwich" version="7.8.2" />
+      <iosPod name="QonversionSandwich" version="7.9.0" />
     </iosPods>
 </dependencies>

Runtime/Android/Plugins/com/qonversion/unitywrapper/MessageSender.java

@@ -18,4 +18,8 @@ void sendMessageToUnity(@NotNull Object objectToConvert, @NotNull String methodN
         final String json = mapper.writeValueAsString(objectToConvert);
         UnityPlayer.UnitySendMessage(unityListenerName, methodName, json);
     }
+
+    public String getListenerName() {
+        return unityListenerName;
+    }
 }

Runtime/Android/Plugins/com/qonversion/unitywrapper/NoCodesWrapper.java

@@ -92,13 +92,24 @@ public static synchronized void setScreenPresentationConfig(String configJson, S
         }
     }
 
-    public static synchronized void showScreen(String contextKey) {
+    public static synchronized void showScreen(String contextKey, String customVariablesJson) {
         if (noCodesSandwich == null) {
             Log.e(TAG, "NoCodesSandwich is not initialized");
             return;
         }
 
-        noCodesSandwich.showScreen(contextKey);
+        Map<String, String> customVariables = null;
+        if (customVariablesJson != null && !customVariablesJson.isEmpty()) {
+            try {
+                ObjectMapper mapper = new ObjectMapper();
+                TypeReference<HashMap<String, String>> typeRef = new TypeReference<HashMap<String, String>>() {};
+                customVariables = mapper.readValue(customVariablesJson, typeRef);
+            } catch (JsonProcessingException e) {
+                Log.e(TAG, "Failed to parse custom variables: " + e.getLocalizedMessage());
+            }
+        }
+
+        noCodesSandwich.showScreen(contextKey, customVariables);
     }
 
     public static synchronized void close() {

Runtime/Android/Plugins/com/qonversion/unitywrapper/QonversionWrapper.java

@@ -98,6 +98,13 @@ public static synchronized void userProperties(String unityCallbackName) {
         qonversionSandwich.userProperties(getResultListener(unityCallbackName));
     }
 
+    public static synchronized void forceSendProperties(String unityCallbackName) {
+        qonversionSandwich.forceSendProperties(() -> {
+            UnityPlayer.UnitySendMessage(messageSender.getListenerName(), unityCallbackName, "");
+            return null;
+        });
+    }
+
     public static synchronized void attribution(String conversionData, String attributionProvider) {
         try {
             ObjectMapper mapper = new ObjectMapper();

Runtime/Android/QonversionWrapperAndroid.cs

@@ -55,6 +55,11 @@ public void UserProperties(string callbackName)
             CallQonversion("userProperties", callbackName);
         }
 
+        public void ForceSendProperties(string callbackName)
+        {
+            CallQonversion("forceSendProperties", callbackName);
+        }
+
         public void SyncPurchases()
         {
             using (var purchases = new AndroidJavaClass("com.qonversion.unitywrapper.QonversionWrapper"))

Runtime/Scripts/IQonversion.cs

@@ -283,6 +283,14 @@ AttributionProvider attributionProvider
         /// <param name="callback">Callback that will be called when response is received</param>
         public void UserProperties(Qonversion.OnUserPropertiesReceived callback);
 
+        /// <summary>
+        /// Force-flushes any pending user property updates to the server immediately.
+        /// Use this when you need to ensure all previously set properties have been sent
+        /// before performing an operation that depends on them.
+        /// </summary>
+        /// <param name="callback">Callback that will be called when the flush is complete.</param>
+        public void ForceSendProperties(Qonversion.OnForceSendPropertiesCompleted callback);
+
         /// <summary>
         /// iOS only.
         /// On iOS 14.5+, after requesting the app tracking entitlement using ATT, you need to notify Qonversion if tracking

Runtime/Scripts/Internal/QonversionInternal.cs

@@ -22,12 +22,13 @@ internal class QonversionInternal : MonoBehaviour, IQonversion
         private const string OnIdentityMethodName = "OnIdentity";
         private const string OnUserInfoMethodName = "OnUserInfo";
         private const string OnUserPropertiesMethodName = "OnUserProperties";
+        private const string OnForceSendPropertiesMethodName = "OnForceSendProperties";
         private const string OnAttachUserMethodName = "OnAttachUser";
         private const string OnDetachUserMethodName = "OnDetachUser";
         private const string OnIsFallbackFileAccessibleMethodName = "OnIsFallbackFileAccessible";
         private const string OnPromotionalOfferMethodName = "OnPromotionalOffer";
 
-        private const string SdkVersion = "9.5.1";
+        private const string SdkVersion = "9.6.0";
         private const string SdkSource = "unity";
 
         private const string DefaultRemoteConfigContextKey = "";
@@ -52,6 +53,7 @@ internal class QonversionInternal : MonoBehaviour, IQonversion
         private Qonversion.OnUserInfoReceived IdentityCallback { get; set; }
         private Qonversion.OnUserInfoReceived UserInfoCallback { get; set; }
         private Qonversion.OnUserPropertiesReceived UserPropertiesCallback { get; set; }
+        private Qonversion.OnForceSendPropertiesCompleted ForceSendPropertiesCallback { get; set; }
         private Qonversion.OnAttachUserResponseReceived AttachUserCallback { get; set; }
         private Qonversion.OnAttachUserResponseReceived DetachUserCallback { get; set; }
         private Qonversion.OnFallbackFileAccessibilityResponseReceived FallbackFileCallback { get; set; }
@@ -340,6 +342,13 @@ public void UserProperties(Qonversion.OnUserPropertiesReceived callback)
             instance.UserProperties(OnUserPropertiesMethodName);
         }
 
+        public void ForceSendProperties(Qonversion.OnForceSendPropertiesCompleted callback)
+        {
+            ForceSendPropertiesCallback = callback;
+            IQonversionWrapper instance = GetNativeWrapper();
+            instance.ForceSendProperties(OnForceSendPropertiesMethodName);
+        }
+
         public void CollectAdvertisingId()
         {
             IQonversionWrapper instance = GetNativeWrapper();
@@ -666,6 +675,13 @@ private void OnUserProperties(string jsonString)
             UserPropertiesCallback = null;
         }
 
+        // Called from the native SDK - Called when forceSendProperties completes
+        private void OnForceSendProperties(string _)
+        {
+            ForceSendPropertiesCallback?.Invoke();
+            ForceSendPropertiesCallback = null;
+        }
+
         // Called from the native SDK - Called when entitlements update. For example, when pending purchases like SCA, Ask to buy, etc., happen.
         private void OnReceivedUpdatedEntitlements(string jsonString)
         {

Runtime/Scripts/Internal/wrappers/qonversion/IQonversionWrapper.cs

@@ -14,6 +14,7 @@ internal interface IQonversionWrapper
         void SetUserProperty(UserPropertyKey key, string value);
         void SetCustomUserProperty(string key, string value);
         void UserProperties(string callbackName);
+        void ForceSendProperties(string callbackName);
         void SyncPurchases();
         void AddAttributionData(string conversionData, string providerName);
         void CheckEntitlements(string callbackName);

Runtime/Scripts/Internal/wrappers/qonversion/QonversionWrapperNoop.cs

@@ -31,6 +31,10 @@ public void UserProperties(string callbackName)
         {
         }
 
+        public void ForceSendProperties(string callbackName)
+        {
+        }
+
         public void AddAttributionData(string conversionData, string providerName)
         {
         }

Runtime/Scripts/NoCodes/Android/NoCodesWrapperAndroid.cs

@@ -21,9 +21,9 @@ public void SetScreenPresentationConfig(string configJson, string contextKey)
             CallNoCodes("setScreenPresentationConfig", configJson, contextKey ?? "");
         }
 
-        public void ShowScreen(string contextKey)
+        public void ShowScreen(string contextKey, string customVariablesJson)
         {
-            CallNoCodes("showScreen", contextKey);
+            CallNoCodes("showScreen", contextKey, customVariablesJson ?? "");
         }
 
         public void Close()