Merge pull request #1254 from BranchMetrics/SDK-1932

[SDK-1932][minor] Remove auto-logging for in-app purchases as Branch Events

Author: echo-branch

Branch-TestBed/Branch-TestBed/AppDelegate.m

@@ -58,9 +58,7 @@ - (BOOL)application:(UIApplication *)application
 
     [self setLogFile:@"OpenNInstall"];
     // [branch setIdentity:@"Bobby Branch"];
-    
-    [Branch setLogInAppPurchasesAsEventsEnabled:true];
-    
+        
     [branch initSessionWithLaunchOptions:launchOptions
         andRegisterDeepLinkHandlerUsingBranchUniversalObject:
         ^ (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error) {

BranchSDK/BNCPreferenceHelper.h

@@ -77,7 +77,6 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 @property (assign, nonatomic) NSInteger highestConversionValueSent;
 @property (strong, nonatomic) NSDate   *firstAppLaunchTime;
 @property (assign, nonatomic) BOOL invokeRegisterApp;
-@property (assign, nonatomic) BOOL logInAppPurchasesAsBranchEvents;
 
 - (void) clearTrackingInformation;
 

BranchSDK/BNCPreferenceHelper.m

@@ -109,7 +109,6 @@ @implementation BNCPreferenceHelper
     skanCurrentWindow = _skanCurrentWindow,
     firstAppLaunchTime = _firstAppLaunchTime,
     highestConversionValueSent = _highestConversionValueSent,
-    logInAppPurchasesAsBranchEvents = _logInAppPurchasesAsBranchEvents,
     referringURLQueryParameters = _referringURLQueryParameters,
     anonID = _anonID,
     patternListURL = _patternListURL;
@@ -815,16 +814,6 @@ - (void) setInvokeRegisterApp:(BOOL)invoke {
     }
 }
 
-- (BOOL) logInAppPurchasesAsBranchEvents {
-    _logInAppPurchasesAsBranchEvents = [self readBoolFromDefaults:BRANCH_PREFS_KEY_LOG_IAP_AS_EVENTS];
-    return _logInAppPurchasesAsBranchEvents;
-}
-
-- (void) setLogInAppPurchasesAsBranchEvents:(BOOL)logInAppPurchasesAsBranchEvents {
-    _logInAppPurchasesAsBranchEvents = logInAppPurchasesAsBranchEvents;
-    [self writeBoolToDefaults:BRANCH_PREFS_KEY_LOG_IAP_AS_EVENTS value:logInAppPurchasesAsBranchEvents];
-}
-
 - (void) clearTrackingInformation {
     @synchronized(self) {
         /*

BranchSDK/Branch.h

@@ -1856,9 +1856,6 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 - (void)passPasteItemProviders:(NSArray<NSItemProvider *> *)itemProviders API_AVAILABLE(ios(16));
 #endif
 
-+ (void)setLogInAppPurchasesAsEventsEnabled:(BOOL)enabled;
-+ (BOOL)logInAppPurchasesBranchEventsEnabled;
-
 @end
 
 NS_ASSUME_NONNULL_END

BranchSDK/Branch.m

@@ -46,7 +46,6 @@
 #import "NSError+Branch.h"
 #import "BNCLog.h"
 #import "UIViewController+Branch.h"
-#import <StoreKit/StoreKit.h>
 #import "BNCReferringURLUtility.h"
 
 #if !TARGET_OS_TV
@@ -125,7 +124,7 @@ typedef NS_ENUM(NSInteger, BNCInitStatus) {
     BNCInitStatusInitialized
 };
 
-@interface Branch() <BranchDeepLinkingControllerCompletionDelegate, SKPaymentTransactionObserver> {
+@interface Branch() <BranchDeepLinkingControllerCompletionDelegate> {
     NSInteger _networkCount;
     BNCURLFilter *_userURLFilter;
 }
@@ -1641,10 +1640,6 @@ + (Branch *)getInstanceInternal:(NSString *)key {
                     cache:[[BNCLinkCache alloc] init]
                     preferenceHelper:preferenceHelper
                     key:key];
-            
-            if ([BNCPreferenceHelper sharedInstance].logInAppPurchasesAsBranchEvents == YES) {
-                [[SKPaymentQueue defaultQueue] addTransactionObserver:branch];
-            }
         });
         return branch;
     }
@@ -2566,51 +2561,4 @@ + (void) clearAll {
     [BNCPreferenceHelper clearAll];
 }
 
-#pragma mark - SKPaymentTransactionObserver Methods
-+ (void)setLogInAppPurchasesAsEventsEnabled:(BOOL)enabled {
-    @synchronized(self) {
-        if (enabled) {
-            [BNCPreferenceHelper sharedInstance].logInAppPurchasesAsBranchEvents = YES;
-        } else {
-            [BNCPreferenceHelper sharedInstance].logInAppPurchasesAsBranchEvents = NO;
-        }
-    }
-}
-
-+ (BOOL)logInAppPurchasesBranchEventsEnabled {
-    @synchronized(self) {
-        return [BNCPreferenceHelper sharedInstance].logInAppPurchasesAsBranchEvents;
-    }
-}
-
-//Logs incoming in-app purchases as events
-- (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray<SKPaymentTransaction *> *)transactions {
-    for (SKPaymentTransaction *transaction in transactions) {
-        switch (transaction.transactionState) {
-            case SKPaymentTransactionStatePurchased: {
-                
-                [[SKPaymentQueue defaultQueue] finishTransaction:(SKPaymentTransaction *)transaction];
-                
-                if ([BNCPreferenceHelper sharedInstance].logInAppPurchasesAsBranchEvents == YES) {
-                    BNCLogDebug([NSString stringWithFormat:@"Automatically logging transaction as Branch event."]);
-                    
-                    BranchEvent *event = [BranchEvent standardEvent:BranchStandardEventPurchase];
-                    [event logEventWithTransaction:transaction];
-                }
-                break;
-            }
-            case SKPaymentTransactionStateFailed: {
-                [[SKPaymentQueue defaultQueue] finishTransaction:(SKPaymentTransaction *)transaction];
-                break;
-            }
-            case SKPaymentTransactionStateRestored: {
-                [[SKPaymentQueue defaultQueue] finishTransaction:(SKPaymentTransaction *)transaction];
-                break;
-            }
-            default:
-                break;
-        }
-    }
-}
-
 @end

BranchSDK/BranchEvent.m

@@ -372,10 +372,9 @@ - (NSString*_Nonnull) description {
 #pragma mark - IAP Methods
 
 - (void) logEventWithTransaction:(SKPaymentTransaction *)transaction {
-    
     self.transactionID = transaction.transactionIdentifier;
     [[BNCEventUtils shared] storeEvent:self];
-
+    
     NSString *productId = transaction.payment.productIdentifier;
     SKProductsRequest *productsRequest = [[SKProductsRequest alloc] initWithProductIdentifiers:[NSSet setWithObject:productId]];