release: SDK 3.0.2

Author: arnaud-roland

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.1.zip",
-            checksum: "944de4c24f776923c69b848a67452fb81000ddd53415330cf94a708a6e1ebd3e"
+            url: "https://download.batch.com/sdk/ios/spm/BatchSDK-ios_spm-xcframework-3.0.2.zip",
+            checksum: "bf0601aef2b15a3771d3e8d1f2cdeeba311a255f0283f6b61530dfa1c8be9bdb"
         )
     ]
 )

Sources/Batch/Modules/Local Campaigns/BALocalCampaignsCenter.m

@@ -405,7 +405,7 @@ - (void)loadCampaignCache {
                                message:@"Loaded %lu campaigns from disk", (unsigned long)campaigns.count];
           }
       }
-      [self->_campaignManager loadCampaigns:campaigns];
+      [self->_campaignManager loadCampaigns:campaigns fromCache:true];
       [self->_campaignManager setCappings:cappings];
       [self campaignCacheReady];
     });
@@ -495,7 +495,7 @@ - (void)handleWebserviceResponsePayload:(nonnull NSDictionary *)payload {
         [_campaignManager setNextAvailableJITTimestampWithDefaultDelay];
     }
 
-    [_campaignManager loadCampaigns:campaigns];
+    [_campaignManager loadCampaigns:campaigns fromCache:false];
     [_campaignManager setCappings:cappings];
 }
 

Sources/Batch/Modules/Local Campaigns/BALocalCampaignsManager.h

@@ -44,7 +44,7 @@ typedef NS_ENUM(NSInteger, BATSyncedJITCampaignState) {
 
  Also triggers the campaign loaded signal
  */
-- (void)loadCampaigns:(NSArray<BALocalCampaign *> *)updatedCampaignList;
+- (void)loadCampaigns:(NSArray<BALocalCampaign *> *)updatedCampaignList fromCache:(BOOL)fromCache;
 
 /**
  Checks if an event name will trigger at least one campaign, allowing for a fast pre-filter to check if it is worth

Sources/Batch/Modules/Local Campaigns/BALocalCampaignsManager.m

@@ -103,11 +103,25 @@ - (NSArray *)campaignList {
     return [NSArray arrayWithArray:_campaignList];
 }
 
-- (void)loadCampaigns:(NSArray<BALocalCampaign *> *)updatedCampaignList {
+/**
+ * Loads campaigns with customer user ID support.
+ * Clears existing campaigns, filters the new list based on user-specific criteria,
+ * and updates the watched event names cache.
+ * @param updatedCampaignList Array of campaigns to load
+ */
+- (void)loadCampaigns:(NSArray<BALocalCampaign *> *)updatedCampaignList fromCache:(BOOL)fromCache {
     @synchronized(_campaignList) {
         [_campaignList removeAllObjects];
         if (updatedCampaignList != nil) {
             [_campaignList addObjectsFromArray:[self cleanCampaignList:updatedCampaignList]];
+
+            if (!fromCache) {
+                NSMutableArray *ids = [NSMutableArray array];
+                for (BALocalCampaign *item in updatedCampaignList) {
+                    [ids addObject:item.campaignID];
+                }
+                [self updateSyncedJITCampaigns:_campaignList eligibleCampaignIds:ids];
+            }
         }
 
         [self updateWatchedEventNames];
@@ -204,17 +218,8 @@ - (void)verifyCampaignsEligibilityFromServer:(NSArray<BALocalCampaign *> *)eligi
               [self setNextAvailableJITTimestampWithDefaultDelay];
 
               if ([eligibleCampaignIds count] > 0) {
-                  for (BALocalCampaign *campaign in [NSArray arrayWithArray:eligibleCampaignsSynced]) {
-                      BATSyncedJITResult *syncedJITResult = [[BATSyncedJITResult alloc]
-                          initWithTimestamp:[[self->_dateProvider currentDate] timeIntervalSince1970]];
-                      if (![eligibleCampaignIds containsObject:campaign.campaignID]) {
-                          [eligibleCampaignsSynced removeObject:campaign];
-                          syncedJITResult.eligible = false;
-                      } else {
-                          syncedJITResult.eligible = true;
-                      }
-                      self->_syncedJITCampaigns[campaign.campaignID] = syncedJITResult;
-                  }
+                  [self updateSyncedJITCampaigns:eligibleCampaignsSynced eligibleCampaignIds:eligibleCampaignIds];
+
                   if ([eligibleCampaignsSynced count] > 0) {
                       completionHandler(eligibleCampaigns[0]);
                   } else {
@@ -231,6 +236,25 @@ - (void)verifyCampaignsEligibilityFromServer:(NSArray<BALocalCampaign *> *)eligi
     [BAWebserviceClientExecutor.sharedInstance addClient:wsClient];
 }
 
+- (void)updateSyncedJITCampaigns:(NSMutableArray<BALocalCampaign *> *)eligibleCampaignsSynced
+             eligibleCampaignIds:(NSArray *)eligibleCampaignIds {
+    @synchronized(_syncedJITCampaigns) {
+        for (BALocalCampaign *campaign in [NSArray arrayWithArray:eligibleCampaignsSynced]) {
+            if (campaign.requiresJustInTimeSync) {
+                BATSyncedJITResult *syncedJITResult = [[BATSyncedJITResult alloc]
+                    initWithTimestamp:[[self->_dateProvider currentDate] timeIntervalSince1970]];
+                if (![eligibleCampaignIds containsObject:campaign.campaignID]) {
+                    [eligibleCampaignsSynced removeObject:campaign];
+                    syncedJITResult.eligible = false;
+                } else {
+                    syncedJITResult.eligible = true;
+                }
+                self->_syncedJITCampaigns[campaign.campaignID] = syncedJITResult;
+            }
+        }
+    }
+}
+
 - (BOOL)isJITServiceAvailable {
     @synchronized(_nextAvailableJITTimestampLock) {
         return ([[_dateProvider currentDate] timeIntervalSince1970] >= _nextAvailableJITTimestamp);

Sources/Batch/Modules/Messaging/Widgets/BAMSGActivityIndicatorView.h

@@ -24,7 +24,7 @@ typedef NS_ENUM(NSUInteger, BAMSGActivityIndicatorViewColor) {
 
 - (instancetype)initWithPreferredSize:(BAMSGActivityIndicatorViewSize)size NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithActivityIndicatorStyle:(UIActivityIndicatorViewStyle)style
-    __attribute__((deprecated("Use initWithPreferredSize:")))NS_DESIGNATED_INITIALIZER;
+    __attribute__((deprecated("Use initWithPreferredSize:"))) NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithFrame:(CGRect)frame NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;
 

Sources/Batch/Versions.h

@@ -11,6 +11,6 @@
  Comments should not use the // form, as the plist preprocessor will include them
  */
 
-#define BASDKVersion 3.0.1
-#define BAAPILevel 301
+#define BASDKVersion 3.0.2
+#define BAAPILevel 302
 #define BAMessagingAPILevel 30

Sources/batchTests/Modules/Local Campaigns/localCampaignsManagerTests.swift

@@ -20,7 +20,7 @@ class localCampaignsManagerTests: XCTestCase {
             createFakeCampaignWith(priority: 50, jit: false),
             createFakeCampaignWith(priority: 10, jit: false),
         ]
-        manager.load(campaigns)
+        manager.load(campaigns, fromCache: false)
 
         let sortedCampaigns: [BALocalCampaign] = manager.eligibleCampaignsSorted(byPriority: BANewSessionSignal())
         XCTAssertEqual(sortedCampaigns[0], campaigns[1])