feat: Android VAL2

Author: al-af

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerConstants.java

@@ -30,6 +30,7 @@ public class RNAppsFlyerConstants {
     final static String afOnInstallConversionFailure = "onInstallConversionFailure";
     final static String afOnInstallConversionDataLoaded = "onInstallConversionDataLoaded";
     final static String afOnDeepLinking = "onDeepLinking";
+    final static String afOnValidationResult = "onValidationResult";
 
     final static String INVITE_FAIL = "Could not create invite link";
     final static String INVITE_CHANNEL = "channel";

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerModule.java

@@ -782,48 +782,78 @@ public void onValidateInAppFailure(String error) {
     @ReactMethod
     public void validateAndLogInAppPurchaseV2(ReadableMap purchaseDetails, ReadableMap additionalParameters) {
         try {
+            // Extract and validate required fields
             String purchaseType = purchaseDetails.getString("purchaseType");
             String purchaseToken = purchaseDetails.getString("transactionId");
             String productId = purchaseDetails.getString("productId");
 
-            // Convert purchaseType string to AFPurchaseType enum
-            AFPurchaseType afPurchaseType;
-            if ("subscription".equals(purchaseType)) {
-                afPurchaseType = AFPurchaseType.SUBSCRIPTION;
-            } else {
-                afPurchaseType = AFPurchaseType.ONE_TIME_PURCHASE;
+            if (purchaseType == null || purchaseToken == null || productId == null) {
+                sendValidationError("Missing required fields: purchaseType, transactionId, or productId");
+                return;
             }
 
-            // Create AFPurchaseDetails object
+            // Convert purchase type
+            AFPurchaseType afPurchaseType = "subscription".equals(purchaseType) 
+                ? AFPurchaseType.SUBSCRIPTION 
+                : AFPurchaseType.ONE_TIME_PURCHASE;
+
+            // Create purchase details
             AFPurchaseDetails afPurchaseDetails = new AFPurchaseDetails(afPurchaseType, purchaseToken, productId);
 
-            // Convert additionalParameters to Map
-            Map<String, String> additionalParamsMap = null;
-            if (additionalParameters != null) {
-                additionalParamsMap = RNUtil.toMap(additionalParameters);
-            }
+            // Convert additional parameters to string map
+            Map<String, String> additionalParams = convertReadableMapToStringMap(additionalParameters);
 
+            // Validate purchase
             AppsFlyerLib.getInstance().validateAndLogInAppPurchase(
-                    afPurchaseDetails,
-                    additionalParamsMap,
-                    new AppsFlyerInAppPurchaseValidationCallback() {
-                        @Override
-                        public void onInAppPurchaseValidationFinished(Map<String, Object> validationResult) {
-                            sendEvent(reactContext, "onValidationResult", validationResult.toString());
-                        }
-
-                        @Override
-                        public void onInAppPurchaseValidationError(Map<String, Object> validationError) {
-                            sendEvent(reactContext, "onValidationResult", validationError.toString());
-                        }
-                    });
+                afPurchaseDetails,
+                additionalParams,
+                new AppsFlyerInAppPurchaseValidationCallback() {
+                    @Override
+                    public void onInAppPurchaseValidationFinished(@NonNull Map<String, ?> result) {
+                        sendValidationResult(result);
+                    }
+
+                    @Override
+                    public void onInAppPurchaseValidationError(@NonNull Map<String, ?> error) {
+                        sendValidationResult(error);
+                    }
+                }
+            );
+        } catch (Exception e) {
+            sendValidationError("Validation failed: " + e.getMessage());
+        }
+    }
+
+    private Map<String, String> convertReadableMapToStringMap(ReadableMap readableMap) {
+        Map<String, String> result = new HashMap<>();
+        if (readableMap == null) {
+            return result;
+        }
+
+        ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+        while (iterator.hasNextKey()) {
+            String key = iterator.nextKey();
+            Object value = readableMap.getDynamic(key);
+            result.put(key, value != null ? value.toString() : null);
+        }
+        return result;
+    }
+
+    private void sendValidationResult(Map<String, ?> data) {
+        try {
+            JSONObject json = new JSONObject(data);
+            sendEvent(reactContext, afOnValidationResult, json.toString());
         } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("error", e.getMessage());
-            sendEvent(reactContext, "onValidationResult", error.toString());
+            sendEvent(reactContext, afOnValidationResult, data.toString());
         }
     }
 
+    private void sendValidationError(String errorMessage) {
+        Map<String, Object> error = new HashMap<>();
+        error.put("error", errorMessage);
+        sendValidationResult(error);
+    }
+
     @ReactMethod
     public void sendPushNotificationData(ReadableMap pushPayload, Callback errorCallback) {
         JSONObject payload = RNUtil.readableMapToJson(pushPayload);

ios/RNAppsFlyer.m

@@ -631,7 +631,7 @@ - (BOOL)isExpoApp {
 
     AFSDKPurchaseDetails* details = [[AFSDKPurchaseDetails alloc] initWithProductId:productId transactionId:transactionId purchaseType:afPurchaseType];
 
-    [[AppsFlyerLib shared] validateAndLogInAppPurchase:details purchaseAdditionalDetails:additionalParameters completion:^(NSDictionary * _Nullable response, NSError * _Nullable error) {
+    [[AppsFlyerLib shared] validateAndLogInAppPurchaseWithPurchaseDetails:details purchaseAdditionalDetails:additionalParameters completion:^(NSDictionary * _Nullable response, NSError * _Nullable error) {
             if (error == nil) {
                 BOOL valid = [response[@"result"] boolValue];
                 if (valid) {