chagne to campaign name

radarlabs · Dec 5, 2024 · 6519ac2 · 6519ac2
1 parent d843c1e
commit 6519ac2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/RadarSDK/Radar.m b/RadarSDK/Radar.m
@@ -548,8 +548,8 @@ + (void)logConversionWithNotification:(UNNotificationRequest *)request
         if (deliveredAfter) {
             [metadata setObject:deliveredAfter forKey:@"deliveredAfter"];
         }
-        if (result[@"campaignId"]) {
-            [metadata setValue:result[@"campaignId"] forKey:@"campaignId"];
+        if (result[@"campaignName"]) {
+            [metadata setValue:result[@"campaignName"] forKey:@"campaignName"];
         }
     }
 

diff --git a/RadarSDK/RadarLocationManager.m b/RadarSDK/RadarLocationManager.m
@@ -558,7 +558,7 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
                 NSString *notificationTitle = [geofence.metadata objectForKey:@"radar:notificationTitle"];
                 NSString *notificationSubtitle = [geofence.metadata objectForKey:@"radar:notificationSubtitle"];
                 NSString *notificationURL = [geofence.metadata objectForKey:@"radar:notificationURL"];
-                NSString *campaignId = [geofence.metadata objectForKey:@"radar:campaignId"];
+                NSString *campaignName = [geofence.metadata objectForKey:@"radar:campaignName"];
                 if (notificationText) {
                     UNMutableNotificationContent *content = [UNMutableNotificationContent new];
                     if (notificationTitle) {
@@ -589,8 +589,8 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
                         [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:@"Notification does not repeat"];
                     }
 
-                    if (campaignId) {
-                        identifier = [RadarNotificationHelper getNotificationIdentifier:geofenceId campaignId:campaignId];
+                    if (campaignName) {
+                        identifier = [RadarNotificationHelper getNotificationIdentifier:geofenceId campaignName:campaignName];
                     }                   
 
                     UNLocationNotificationTrigger *trigger = [UNLocationNotificationTrigger triggerWithRegion:region repeats:repeats];

diff --git a/RadarSDK/RadarNotificationHelper.h b/RadarSDK/RadarNotificationHelper.h
@@ -28,11 +28,11 @@ typedef void (^NotificationPermissionCheckCompletion)(BOOL granted);
 
 + (void)openURLFromNotification:(UNNotification *)notification;
 
-+ (NSString *)getNotificationIdentifier:(NSString *)geofenceId campaignId:(NSString *)campaignId;
++ (NSString *)getNotificationIdentifier:(NSString *)geofenceId campaignName:(NSString *)campaignName;
 
 + (NSDictionary<NSString *, NSString *> *)extractMetadataFromNotificationIdentifier:(NSString *)identifier;
 
-// + (NSString *)getCampaignIdFromNotificationIdentifier:(NSString *)notificationIdentifier;
+// + (NSString *)getcampaignNameFromNotificationIdentifier:(NSString *)notificationIdentifier;
 
 @end
 

diff --git a/RadarSDK/RadarNotificationHelper.m b/RadarSDK/RadarNotificationHelper.m
@@ -218,14 +218,14 @@ + (void)checkNotificationPermissionsWithCompletionHandler:(NotificationPermissio
     } 
 }
 
-+ (NSString *)getNotificationIdentifier:(NSString *)geofenceId campaignId:(NSString *)campaignId {
++ (NSString *)getNotificationIdentifier:(NSString *)geofenceId campaignName:(NSString *)campaignName {
     NSString *identifier = [NSString stringWithFormat:@"%@%@", kSyncGeofenceIdentifierPrefix, geofenceId];
     NSDate *now = [NSDate new];
     NSTimeInterval lastSyncInterval = [now timeIntervalSince1970];
     identifier = [identifier stringByAppendingString:[NSString stringWithFormat:@"_%f", lastSyncInterval]];
-    if (campaignId) {
+    if (campaignName) {
         identifier = [identifier stringByAppendingString:@"_"];
-        identifier = [identifier stringByAppendingString:campaignId];
+        identifier = [identifier stringByAppendingString:campaignName];
     }
     return identifier;
 }
@@ -238,8 +238,8 @@ + (NSString *)getNotificationIdentifier:(NSString *)geofenceId campaignId:(NSStr
             NSString *geofenceId = components[2];
             NSString *registeredAt = components[3];
             if (components.count == 5) {
-                NSString *campaignId = components[4];
-                result = @{@"geofenceId": geofenceId, @"registeredAt": registeredAt, @"campaignId":campaignId};
+                NSString *campaignName = components[4];
+                result = @{@"geofenceId": geofenceId, @"registeredAt": registeredAt, @"campaignName":campaignName};
             } else {
 
                 result = @{@"geofenceId": geofenceId, @"registeredAt": registeredAt};
@@ -249,15 +249,15 @@ + (NSString *)getNotificationIdentifier:(NSString *)geofenceId campaignId:(NSStr
     return result;
 }
 
-+ (NSString *)getCampaignIdFromNotificationIdentifier:(NSString *)notificationIdentifier {
-    NSString *campaignId = nil;
++ (NSString *)getcampaignNameFromNotificationIdentifier:(NSString *)notificationIdentifier {
+    NSString *campaignName = nil;
     if ([notificationIdentifier hasPrefix:kSyncGeofenceIdentifierPrefix]) {
         NSArray *components = [notificationIdentifier componentsSeparatedByString:@"_"];
         if (components.count == 4) {
-            campaignId = components[3];
+            campaignName = components[3];
         }
     }
-    return campaignId;
+    return campaignName;
 }
 
 @end