Release 1.43.0

Author: nsingh-branch

Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"1.42.0";
+NSString * const BNC_SDK_VERSION     = @"1.43.0";

Branch-SDK/BNCQRCodeCache.h

@@ -0,0 +1,21 @@
+//
+//  BNCQRCodeCache.h
+//  Branch
+//
+//  Created by Nipun Singh on 5/5/22.
+//  Copyright © 2022 Branch, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BNCQRCodeCache : NSObject
+
++ (BNCQRCodeCache *) sharedInstance;
+- (void)addQRCodeToCache:(NSData *)qrCodeData withParams:(NSMutableDictionary *)parameters;
+- (NSData *)checkQRCodeCache:(NSMutableDictionary *)parameters;
+
+@end
+
+NS_ASSUME_NONNULL_END

Branch-SDK/BNCQRCodeCache.m

@@ -0,0 +1,53 @@
+//
+//  BNCQRCodeCache.m
+//  Branch
+//
+//  Created by Nipun Singh on 5/5/22.
+//  Copyright © 2022 Branch, Inc. All rights reserved.
+//
+
+#import "BNCQRCodeCache.h"
+
+@interface BNCQRCodeCache()
+@property (nonatomic, strong) NSMutableDictionary *cache;
+@end
+
+@implementation BNCQRCodeCache
+
+//Can only hold one QR code in cache. Just used to debounce.
++ (BNCQRCodeCache *) sharedInstance {
+    static BNCQRCodeCache *singleton;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        singleton = [BNCQRCodeCache new];
+    });
+    return singleton;
+}
+
+- (instancetype)init {
+    if ((self = [super init])) {
+        self.cache = [[NSMutableDictionary alloc] init];
+    }
+    return self;
+}
+
+- (void)addQRCodeToCache:(NSData *)qrCodeData withParams:(NSMutableDictionary *)parameters {
+    @synchronized (self) {
+        [self.cache removeAllObjects];
+        NSMutableDictionary *tempParams = [parameters mutableCopy];
+        [tempParams[@"data"] removeObjectForKey:@"$creation_timestamp"];
+        self.cache[tempParams] = qrCodeData;
+    }
+}
+
+- (NSData *)checkQRCodeCache:(NSMutableDictionary *)parameters {
+    NSData *qrCode;
+    @synchronized (self) {
+        NSMutableDictionary *tempParams = [parameters mutableCopy];
+        [tempParams[@"data"] removeObjectForKey:@"$creation_timestamp"];
+        qrCode = self.cache[tempParams];
+    }
+    return qrCode;
+}
+
+@end

Branch-SDK/BNCSKAdNetwork.h

@@ -20,6 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)updateConversionValue:(NSInteger)conversionValue;
 
+- (void)updatePostbackConversionValue:(NSInteger)conversionValue
+                    completionHandler:(void (^)(NSError *error))completion;
+
 @end
 
 NS_ASSUME_NONNULL_END

Branch-SDK/BNCSKAdNetwork.m

@@ -16,6 +16,7 @@ @interface BNCSKAdNetwork()
 @property (nonatomic, strong, readwrite) Class skAdNetworkClass;
 @property (nonatomic, assign, readwrite) SEL skAdNetworkRegisterAppForAdNetworkAttribution;
 @property (nonatomic, assign, readwrite) SEL skAdNetworkUpdateConversionValue;
+@property (nonatomic, assign, readwrite) SEL skAdNetworkUpdatePostbackConversionValue;
 
 @end
 
@@ -40,6 +41,7 @@ - (instancetype)init {
         self.skAdNetworkClass = NSClassFromString(@"SKAdNetwork");
         self.skAdNetworkRegisterAppForAdNetworkAttribution = NSSelectorFromString(@"registerAppForAdNetworkAttribution");
         self.skAdNetworkUpdateConversionValue = NSSelectorFromString(@"updateConversionValue:");
+        self.skAdNetworkUpdatePostbackConversionValue = NSSelectorFromString(@"updatePostbackConversionValue:completionHandler:");
     }
     return self;
 }
@@ -77,4 +79,16 @@ - (void)updateConversionValue:(NSInteger)conversionValue {
     }
 }
 
+- (void)updatePostbackConversionValue:(NSInteger)conversionValue
+                    completionHandler:(void (^)(NSError *error))completion {
+    if (@available(iOS 15.4, *)) {
+        if ([self shouldAttemptSKAdNetworkCallout]) {
+            
+            // Equivalent call [SKAdNetwork updatePostbackConversionValue:completionHandler:];
+            ((id (*)(id, SEL, NSInteger,void (^)(NSError *error)))[self.skAdNetworkClass methodForSelector:self.skAdNetworkUpdatePostbackConversionValue])(self.skAdNetworkClass, self.skAdNetworkUpdatePostbackConversionValue, conversionValue, completion);
+        }
+    }
+    
+}
+
 @end

Branch-SDK/Branch+Validator.m

@@ -190,12 +190,12 @@ - (void) showNextStep {
          "https://<yourapp>.app.link/NdJ6nFzRbK\n\n"
          "click on:\n"
          "https://<yourapp>.app.link/NdJ6nFzRbK?bnc_validate=true";
-    NSLog(
-        @"\n----------------------------------------------------------------------------"
-         "\nBranch Integration Next Steps\n"
-         "\n"
-         "%@"
-         "\n----------------------------------------------------------------------------", message);
+    
+    NSLog(@"----------------------------------------------------------------------------");
+    NSLog(@"Branch Integration Next Steps:");
+    NSLog(@"%@", message);
+    NSLog(@"----------------------------------------------------------------------------");
+
     [self showAlertWithTitle:@"Next Step" message:message];
 }
 

Branch-SDK/Branch.h

@@ -34,6 +34,7 @@
 #import "UIViewController+Branch.h"
 #import "BranchScene.h"
 #import "BranchPluginSupport.h"
+#import "BranchQRCode.h"
 
 #if !TARGET_OS_TV
 // tvOS does not support these features

Branch-SDK/BranchEvent.m

@@ -80,7 +80,22 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
     if (dictionary && [dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE] isKindOfClass:NSNumber.class]) {
         NSNumber *conversionValue = (NSNumber *)dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE];
         if (conversionValue) {
-            [[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue];
+            if (@available(iOS 15.4, *)) {
+                [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:conversionValue.intValue completionHandler: ^(NSError *error){
+                    if (self.completion) {
+                        self.completion(nil, error);
+                    }
+                    if (error) {
+                        BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
+                    } else {
+                        BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful. Conversion Value - %@", conversionValue]);
+                    }
+                    return;
+                }];
+                return;
+            } else {
+                [[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue];
+            }
         }
     }
 
@@ -270,7 +285,7 @@ - (BranchEventRequest *)buildRequestWithEventDictionary:(NSDictionary *)eventDic
     ([self.class.standardEvents containsObject:self.eventName])
     ? [NSString stringWithFormat:@"%@/%@", preferenceHelper.branchAPIURL, @"v2/event/standard"]
     : [NSString stringWithFormat:@"%@/%@", preferenceHelper.branchAPIURL, @"v2/event/custom"];
-    
+
     BranchEventRequest *request =
     [[BranchEventRequest alloc]
      initWithServerURL:[NSURL URLWithString:serverURL]

Branch-SDK/BranchQRCode.h

@@ -0,0 +1,78 @@
+//
+//  BranchQRCode.h
+//  Branch
+//
+//  Created by Nipun Singh on 3/22/22.
+//  Copyright © 2022 Branch, Inc. All rights reserved.
+//
+
+#import "BranchUniversalObject.h"
+#import "BranchLinkProperties.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, BranchQRCodeImageFormat){
+    BranchQRCodeImageFormatPNG,
+    BranchQRCodeImageFormatJPEG
+};
+
+@interface BranchQRCode : NSObject
+
+/// Primary color of the generated QR code itself.
+@property (nonatomic, strong, readwrite) UIColor *codeColor;
+/// Secondary color used as the QR Code background.
+@property (nonatomic, strong, readwrite) UIColor *backgroundColor;
+/// A URL of an image that will be added to the center of the QR code. Must be a PNG or JPEG.
+@property (nonatomic, copy, readwrite) NSString *centerLogo;
+/// Output size of QR Code image. Min 300px. Max 2000px.
+@property (nonatomic, copy, readwrite) NSNumber *width;
+/// The number of pixels for the QR code's border.  Min 1px. Max 20px.
+@property (nonatomic, copy, readwrite) NSNumber *margin;
+/// Format of the returned QR code. Can be a JPEG or PNG.
+@property (nonatomic, assign, readwrite) BranchQRCodeImageFormat imageFormat;
+
+/**
+Creates a Branch QR Code image. Returns the QR code as NSData.
+
+@param buo  The Branch Universal Object the will be shared.
+@param lp   The link properties that the link will have.
+@param completion   Completion handler containing the QR code image and error.
+
+*/
+- (void)getQRCodeAsData:(nullable BranchUniversalObject *)buo
+         linkProperties:(nullable BranchLinkProperties *)lp
+             completion:(void(^)(NSData * _Nullable qrCode, NSError * _Nullable error))completion;
+
+/**
+Creates a Branch QR Code image. Returns the QR code as a UIImage.
+
+@param buo  The Branch Universal Object the will be shared.
+@param lp   The link properties that the link will have.
+@param completion   Completion handler containing the QR code image and error.
+
+*/
+- (void)getQRCodeAsImage:(nullable BranchUniversalObject *)buo
+          linkProperties:(nullable BranchLinkProperties *)lp
+              completion:(void(^)(UIImage * _Nullable qrCode, NSError * _Nullable error))completion;
+
+
+/**
+Creates a Branch QR Code image and displays it in a share sheet.
+
+@param buo  The Branch Universal Object the will be shared.
+@param lp   The link properties that the link will have.
+@param completion   Completion handler containing any potential error.
+ 
+ */
+#if !TARGET_OS_TV
+- (void)showShareSheetWithQRCodeFromViewController:(nullable UIViewController *)viewController
+                                            anchor:(nullable id)anchorViewOrButtonItem
+                                   universalObject:(nullable BranchUniversalObject *)buo
+                                    linkProperties:(nullable BranchLinkProperties *)lp
+                                        completion:(void(^)(NSError * _Nullable error))completion;
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END
+