release: SDK 3.1.0

Author: ThomasMengelatte

Package.swift

@@ -18,8 +18,8 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "Batch",
-            url: "https://download.batch.com/sdk/ios/spm/BatchSDK-ios_spm-xcframework-3.0.3.zip",
-            checksum: "65ce974990ec245eb45f6e104affd8291b73bfcb530950f9d2f6d70d9d46d5e5"
+            url: "https://download.batch.com/sdk/ios/spm/BatchSDK-ios_spm-xcframework-3.1.0.zip",
+            checksum: "0d18a0de47124835eaee086380a1244eb18e99699d8affee18b3643357091345"
         )
     ]
 )

Sources/Batch.xcodeproj/project.pbxproj

@@ -386,6 +386,7 @@ - (id)copyWithZone:(nullable NSZone *)zone {
         copy.eventData = [self.eventData copy];
         copy.campaignIdentifier = self.campaignIdentifier;
         copy.campaignToken = self.campaignToken;
+        copy.isCEPMessage = self.isCEPMessage;
     }
 
     return copy;

Sources/Batch/BatchMessaging.m

@@ -36,12 +36,12 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)sharedInstance;
 
 /*!
- @method swizzleAppDelegate:
+ @method findAndSwizzleAppDelegate:
  @abstract Swizzle the current [UIApplication sharedApplication].delegate class. Note that calling this method multiple
  times is an error. Make sure to set a `batchDelegate` on this object to be informed of the calls.
  @return Whether the operation succeeded
  */
-- (BOOL)swizzleAppDelegate;
+- (BOOL)findAndSwizzleAppDelegate;
 
 @end
 

Sources/Batch/Kernel/Helpers/BADelegatedApplicationDelegate.h

@@ -11,7 +11,7 @@
 #import <Batch/BAPushCenter.h>
 #import <objc/runtime.h>
 
-#define DEBUG_SWIZZLE NO
+#define DEBUG_SWIZZLE 0
 
 @implementation BADelegatedApplicationDelegate
 
@@ -34,7 +34,7 @@ - (instancetype)init {
     return self;
 }
 
-- (BOOL)swizzleAppDelegate {
+- (BOOL)findAndSwizzleAppDelegate {
     if (!_batchDelegate) {
         return false;
     }
@@ -50,6 +50,43 @@ - (BOOL)swizzleAppDelegate {
         return false;
     }
 
+    if ([[NSString stringWithFormat:@"SwiftUI.%@", @"AppDelegate"]
+            isEqualToString:NSStringFromClass(appDelegate.class)]) {
+        [BALogger debugForDomain:nil message:@"SwiftUI AppDelegate detected, adjusting swizzling"];
+        // On a SwiftUI lifecycle app, SwiftUI.AppDelegate is always the application delegate
+        // The SwiftUI class does not respond to the selectors, but implements
+        // "forwardingTargetForSelector"
+        // https://developer.apple.com/documentation/objectivec/nsobject-swift.class/forwardingtarget(for:) and returns
+        // the instance set using @UIApplicationDelegateAdaptor In theory, this is never nil, but you never know how
+        // Batch is implemented. So, the plan is:
+        //   - If it is nil, swizzle SwiftUI.AppDelegate
+        //   - If it is not nil, swizzle the developer's implementation
+        if ([appDelegate respondsToSelector:@selector(forwardingTargetForSelector:)]) {
+            id developerDelegate = [(NSObject *)appDelegate
+                forwardingTargetForSelector:@selector(application:didRegisterForRemoteNotificationsWithDeviceToken:)];
+            if (developerDelegate != nil) {
+                [BALogger
+                    debugForDomain:nil
+                           message:
+                               @"SwiftUI AppDelegate has a UIApplicationDelegateAdaptor, switching swizzling target"];
+                appDelegate = developerDelegate;
+            }
+        } else {
+            [BALogger debugForDomain:nil
+                             message:@"SwiftUI AppDelegate does not respond to forwardingTargetForSelector. Swizzling "
+                                     @"system delegate"];
+        }
+    }
+
+    if ([self swizzleAppDelegate:appDelegate]) {
+        _didSwizzle = true;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+- (BOOL)swizzleAppDelegate:(nonnull id<UIApplicationDelegate>)appDelegate {
     Class appDelegateClass = [appDelegate class];
 
     if (appDelegateClass == [_batchDelegate class]) {
@@ -70,8 +107,6 @@ - (BOOL)swizzleAppDelegate {
     }
 
     [self swizzleMethodsOfDelegate:appDelegate];
-
-    _didSwizzle = true;
     return true;
 }
 
@@ -92,6 +127,8 @@ - (nullable IMP)swizzleMethod:(nonnull SEL)selector
 
 #if DEBUG_SWIZZLE
     NSLog(@"Swizzling %@", selectorString);
+    NSLog(@"Swizzled class responds to selector %@ ? %@", NSStringFromSelector(selector),
+          [targetClass instancesRespondToSelector:selector] ? @"YES" : @"NO");
 #endif
 
     // If the class instance doesn't implement a selector and

Sources/Batch/Kernel/Helpers/BADelegatedApplicationDelegate.m

@@ -0,0 +1,15 @@
+//
+//  Batch
+//
+//  Copyright © Batch.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface BADictionaryHelper : NSObject
+
++ (BOOL)dictionary:(NSDictionary *)actual containsValuesFromDictionary:(NSDictionary *)expected;
+
++ (BOOL)array:(NSArray *)actual containsValuesFromArray:(NSArray *)expected;
+
+@end

Sources/Batch/Kernel/Helpers/BADictionaryHelper.h

@@ -0,0 +1,92 @@
+//
+//  Batch
+//
+//  Copyright © Batch.com. All rights reserved.
+//
+#import <Batch/BADictionaryHelper.h>
+#import <Foundation/Foundation.h>
+
+@implementation BADictionaryHelper
+
++ (BOOL)dictionary:(NSDictionary *)actual containsValuesFromDictionary:(NSDictionary *)expected {
+    if (expected == nil) {
+        return actual == nil;
+    }
+
+    if (actual == expected) {
+        return YES;
+    }
+
+    if (actual == nil) {
+        return NO;
+    }
+
+    for (NSString *key in expected.allKeys) {
+        if (!actual[key]) {
+            return NO;
+        }
+
+        id expectedValue = expected[key];
+        id actualValue = actual[key];
+
+        if ([expectedValue isKindOfClass:[NSDictionary class]] && [actualValue isKindOfClass:[NSDictionary class]]) {
+            if (![self dictionary:actualValue containsValuesFromDictionary:expectedValue]) {
+                return NO;
+            }
+        } else if ([expectedValue isKindOfClass:[NSArray class]] && [actualValue isKindOfClass:[NSArray class]]) {
+            if (![self array:actualValue containsValuesFromArray:expectedValue]) {
+                return NO;
+            }
+        } else if (![expectedValue isEqual:actualValue]) {
+            return NO;
+        }
+    }
+    return YES;
+}
+
++ (BOOL)array:(NSArray *)actual containsValuesFromArray:(NSArray *)expected {
+    if (expected == nil) {
+        return actual == nil;
+    }
+
+    if (actual == nil) {
+        return NO;
+    }
+
+    if (expected.count > actual.count) {
+        return NO;
+    }
+
+    NSMutableArray *actualList = [actual mutableCopy];
+
+    for (id expectedValue in expected) {
+        BOOL found = NO;
+        for (int j = 0; j < actualList.count; j++) {
+            id actualValue = actualList[j];
+            if ([expectedValue isKindOfClass:[NSDictionary class]] &&
+                [actualValue isKindOfClass:[NSDictionary class]]) {
+                if ([self dictionary:actualValue containsValuesFromDictionary:expectedValue]) {
+                    [actualList removeObjectAtIndex:j];
+                    found = YES;
+                    break;
+                }
+            } else if ([expectedValue isKindOfClass:[NSArray class]] && [actualValue isKindOfClass:[NSArray class]]) {
+                if ([self array:actualValue containsValuesFromArray:expectedValue]) {
+                    [actualList removeObjectAtIndex:j];
+                    found = YES;
+                    break;
+                }
+            } else if ([expectedValue isEqual:actualValue]) {
+                [actualList removeObjectAtIndex:j];
+                found = YES;
+                break;
+            }
+        }
+        if (!found) {
+            return NO;
+        }
+    }
+    return YES;
+}
+
+@end