Merge pull request #62 from singular-labs/SDKDEV-59-SKAN4-Update

Sdkdev 59 skan4 update

Author: shefdanny

Singular-React-Native.podspec

@@ -12,6 +12,7 @@ Pod::Spec.new do |spec|
   spec.source_files      = "ios/*.{h,m}"
   spec.platform         = :ios, "8.0"
   spec.static_framework = true
-  spec.dependency 'Singular-SDK'
+  spec.dependency 'Singular-SDK', '12.0.1'
+
   spec.dependency 'React'
 end

Singular.js

@@ -14,7 +14,8 @@ export class Singular {
     static init(singularConfig) {
         this._singularLinkHandler = singularConfig.singularLinkHandler;
         this._conversionValueUpdatedHandler = singularConfig.conversionValueUpdatedHandler;
-
+        this._conversionValuesUpdatedHandler = singularConfig.conversionValuesUpdatedHandler;
+        
         this._singularNativeEmitter.addListener(
             'SingularLinkHandler',
             singularLinkParams => {
@@ -31,6 +32,14 @@ export class Singular {
                 }
             });
 
+        this._singularNativeEmitter.addListener(
+            'ConversionValuesUpdatedHandler',
+            updatedConversionValues => {
+                if (this._conversionValuesUpdatedHandler) {
+                    this._conversionValuesUpdatedHandler(updatedConversionValues);
+                }
+            });
+
         SingularBridge.init(JSON.stringify(singularConfig));
         SingularBridge.setReactSDKVersion(SDK_NAME, SDK_VERSION);
     }
@@ -139,6 +148,12 @@ export class Singular {
         }
         return true
     }
+    
+    static skanUpdateConversionValue(conversionValue, coarse, lock) {
+        if (Platform.OS === 'ios') {
+            SingularBridge.skanUpdateConversionValue(conversionValue, coarse, lock);
+        }
+    }
 
     static skanGetConversionValue() {
         if (Platform.OS === 'ios') {

SingularConfig.js

@@ -11,6 +11,7 @@ export class SingularConfig {
     clipboardAttribution;
     manualSkanConversionManagement;
     conversionValueUpdatedHandler;
+    conversionValuesUpdatedHandler;
     waitForTrackingAuthorizationWithTimeoutInterval;
 
     // Limit Data Sharing
@@ -72,6 +73,11 @@ export class SingularConfig {
         return this;
     }
 
+    withConversionValuesUpdatedHandler(conversionValuesUpdatedHandler) {
+        this.conversionValuesUpdatedHandler = conversionValuesUpdatedHandler;
+        return this;
+    }
+    
     withWaitForTrackingAuthorizationWithTimeoutInterval(waitForTrackingAuthorizationWithTimeoutInterval) {
         this.waitForTrackingAuthorizationWithTimeoutInterval = waitForTrackingAuthorizationWithTimeoutInterval;
         return this;

android/build.gradle

@@ -41,6 +41,6 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.singular.sdk:singular_sdk:12.0.8'
+    implementation 'com.singular.sdk:singular_sdk:12.0.9'
     implementation 'com.android.support:support-annotations:28.0.0'
 }

ios/SingularBridge.m

@@ -45,7 +45,7 @@ +(void)startSessionWithUserActivity:(NSUserActivity*)userActivity{
 RCT_EXPORT_MODULE();
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"SingularLinkHandler", @"ConversionValueUpdatedHandler", @"ShortLinkHandler"];
+    return @[@"SingularLinkHandler", @"ConversionValueUpdatedHandler", @"ShortLinkHandler", @"ConversionValuesUpdatedHandler"];
 }
 
 // Init method using a json string representing the config
@@ -83,6 +83,10 @@ +(void)startSessionWithUserActivity:(NSUserActivity*)userActivity{
     singularConfig.conversionValueUpdatedCallback = ^(NSInteger conversionValue) {
         [SingularBridge handleConversionValueUpdated:conversionValue];
     };
+    singularConfig.conversionValuesUpdatedCallback = ^(NSNumber *fineValue, NSNumber *coarseValue, BOOL lockWindow) {
+        [SingularBridge handleConversionValuesUpdated:fineValue andCoarseValue:coarseValue andLockWindow:lockWindow];
+    };
+    
     singularConfig.waitForTrackingAuthorizationWithTimeoutInterval =
         [[singularConfigDict objectForKey:@"waitForTrackingAuthorizationWithTimeoutInterval"] intValue];
 
@@ -202,6 +206,10 @@ +(void)startSessionWithUserActivity:(NSUserActivity*)userActivity{
     return [Singular skanUpdateConversionValue:conversionValue] ? @YES : @NO;
 }
 
+RCT_EXPORT_METHOD(skanUpdateConversionValue:(NSInteger)conversionValue coarse:(NSInteger)coarse lock:(BOOL)lock){
+    [Singular skanUpdateConversionValue:conversionValue coarse:coarse lock:lock];
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(skanGetConversionValue){
     return [Singular skanGetConversionValue];
 }
@@ -246,10 +254,6 @@ +(NSDictionary*)jsonToDictionary:(NSString*)json{
     return data;
 }
 
-
-
-
-
 +(void)handleSingularLink:(SingularLinkParams*)params {
     // Raising the Singular Link handler in the react-native code
     [eventEmitter sendEventWithName:@"SingularLinkHandler" body:@{
@@ -260,12 +264,27 @@ +(void)handleSingularLink:(SingularLinkParams*)params {
 
 }
 
-
-
-
 +(void)handleConversionValueUpdated:(NSInteger)conversionValue {
     // Raising the Conversion Value handler in the react-native code
     [eventEmitter sendEventWithName:@"ConversionValueUpdatedHandler" body:@(conversionValue)];
 }
 
++(void)handleConversionValuesUpdated:(NSNumber *)fineValue andCoarseValue:(NSNumber *)coarseValue andLockWindow:(BOOL)lockWindow {
+    NSInteger fine = -1;
+    NSInteger coarse = -1;
+    
+    if (fineValue != nil) {
+        fine = [fineValue intValue];
+    }
+    if (coarseValue != nil) {
+        coarse = [coarseValue intValue];
+    }
+
+    [eventEmitter sendEventWithName:@"ConversionValuesUpdatedHandler" body:@{
+        @"conversionValue": @(fine),
+        @"coarse": @(coarse),
+        @"lock": @(lockWindow)
+    }];
+}
+
 @end