Replay time ordering

RadarSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'RadarSDK'
-  s.version               = '3.18.4'
+  s.version               = '3.18.4-beta.2'
   s.summary               = 'iOS SDK for Radar, the leading geofencing and location tracking platform'
   s.homepage              = 'https://radar.com'
   s.author                = { 'Radar Labs, Inc.' => '[email protected]' }

RadarSDK/RadarAPIClient.m

@@ -251,10 +251,13 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
         params[@"floorLevel"] = @(location.floor.level);
     }
     long nowMs = (long)([NSDate date].timeIntervalSince1970 * 1000);
-    if (!foreground) {
-        long timeInMs = (long)(location.timestamp.timeIntervalSince1970 * 1000);
-        params[@"updatedAtMsDiff"] = @(nowMs - timeInMs);
+    long locationMs = (long)(location.timestamp.timeIntervalSince1970 * 1000);
+    RadarTrackingOptions *options = [Radar getTrackingOptions];
+    // if not verified
+    if (!verified) {
+        params[@"updatedAtMsDiff"] = @(nowMs - locationMs);
     }
+    params[@"locationMs"] = @(locationMs);
     params[@"foreground"] = @(foreground);
     params[@"stopped"] = @(stopped);
     params[@"replayed"] = @(replayed);
@@ -299,7 +302,6 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
         params[@"tripOptions"] = tripParams;
     }
 
-    RadarTrackingOptions *options = [Radar getTrackingOptions];
     if (options.syncGeofences) {
         params[@"nearbyGeofences"] = @(YES);
     }
@@ -415,9 +417,6 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
                                     // create a copy of params that we can use to write to the buffer in case of request failure
                                     NSMutableDictionary *bufferParams = [params mutableCopy];
                                     bufferParams[@"replayed"] = @(YES);
-                                    bufferParams[@"updatedAtMs"] = @(nowMs);
-                                    // remove the updatedAtMsDiff key because for replays we want to rely on the updatedAtMs key for the time instead
-                                    [bufferParams removeObjectForKey:@"updatedAtMsDiff"];
 
                                     [[RadarReplayBuffer sharedInstance] writeNewReplayToBuffer:bufferParams];
                                 } else if (options.replay == RadarTrackingOptionsReplayStops && stopped &&

RadarSDK/RadarAPIHelper.m

@@ -67,9 +67,38 @@ - (void)requestWithMethod:(NSString *)method
             }
 
             if (params) {
-                [req setHTTPBody:[NSJSONSerialization dataWithJSONObject:params options:0 error:NULL]];
+                if (!params[@"updatedAtMsDiff"] && !params[@"replays"]) {
+                    [req setHTTPBody:[NSJSONSerialization dataWithJSONObject:params options:0 error:NULL]];
+                } else {
+                    NSMutableDictionary *requestParams = [params mutableCopy];
+                    NSNumber *locationMs = params[@"locationMs"];
+                    long nowMs = (long)([NSDate date].timeIntervalSince1970 * 1000);
+
+                    if (locationMs) {
+                        long updatedAtMsDiff = nowMs - [locationMs longValue];
+                        requestParams[@"updatedAtMsDiff"] = @(updatedAtMsDiff);
+                    }
+
+                    NSArray *replays = params[@"replays"];
+                    if (replays) {
+                        NSMutableArray *updatedReplays = [NSMutableArray arrayWithCapacity:replays.count];
+                        for (NSDictionary *replay in replays) {
+                            NSMutableDictionary *updatedReplay = [replay mutableCopy];
+                            NSNumber *replayLocationMs = replay[@"locationMs"];
+                            if (replayLocationMs) {
+                                long replayUpdatedAtMsDiff = nowMs - [replayLocationMs longValue];
+                                updatedReplay[@"updatedAtMsDiff"] = @(replayUpdatedAtMsDiff);
+                            }
+                            [updatedReplays addObject:updatedReplay];
+                        }
+                        requestParams[@"replays"] = updatedReplays;
+                    }
+
+                    [req setHTTPBody:[NSJSONSerialization dataWithJSONObject:requestParams options:0 error:NULL]];
+                }
             }
 
+
             NSURLSessionConfiguration *configuration;
             if (extendedTimeout) {
                 configuration = [NSURLSessionConfiguration defaultSessionConfiguration];

RadarSDK/RadarLocationManager.m

@@ -1123,6 +1123,10 @@ - (void)locationManager:(CLLocationManager *)manager didVisit:(CLVisit *)visit {
         return;
     }
 
+    [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug
+                                   message:[NSString stringWithFormat:@"Visit detected | arrival = %@; departure = %@; horizontalAccuracy = %f; visit.coordinate = (%f, %f); manager.location = %@",
+                                                                      visit.arrivalDate, visit.departureDate, visit.horizontalAccuracy, visit.coordinate.latitude, visit.coordinate.longitude, manager.location]];
+
     BOOL tracking = [RadarSettings tracking];
     if (!tracking) {
         [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:@"Ignoring visit: not tracking"];

RadarSDK/RadarNotificationHelper.m

@@ -136,7 +136,6 @@ + (void)removePendingNotificationsWithCompletionHandler:(void (^)(void))completi
         NSMutableArray *identifiers = [NSMutableArray new];
         for (UNNotificationRequest *request in requests) {
             if ([request.identifier hasPrefix:kSyncGeofenceIdentifierPrefix]) {
-                [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Found pending notification to remove | identifier = %@", request.identifier]];
                 [identifiers addObject:request.identifier];
             }
         }

RadarSDK/RadarUtils.m

@@ -45,7 +45,7 @@ + (NSNumber *)timeZoneOffset {
 }
 
 + (NSString *)sdkVersion {
-    return @"3.18.4";
+    return @"3.18.4-beta.2";
 }
 
 + (NSString *)deviceId {

RadarSDKMotion.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name                  = 'RadarSDKMotion'
-    s.version               = '3.18.3'
+    s.version               = '3.18.4-beta.2'
     s.summary               = 'Motion detection plugin for RadarSDK, the leading geofencing and location tracking platform'
     s.homepage              = 'https://radar.com'
     s.author                = { 'Radar Labs, Inc.' => '[email protected]' }