use none-deprecated archive functions when possible

RadarSDK.xcodeproj/project.pbxproj

@@ -376,7 +376,6 @@
 			children = (
 				9679F4A027CD8D0600800797 /* CLLocation+Radar.h */,
 				9679F4A227CD8DE200800797 /* CLLocation+Radar.m */,
-				53CCD782275E579800F79CC8 /* RadarLogBuffer.m */,
 			);
 			name = Util;
 			sourceTree = "<group>";
@@ -497,6 +496,7 @@
 				96A5A11527ADA02E007B960B /* RadarLog.h */,
 				96A5A11427ADA02E007B960B /* RadarLog.m */,
 				96A5A11627ADA02E007B960B /* RadarLogBuffer.h */,
+				53CCD782275E579800F79CC8 /* RadarLogBuffer.m */,
 				DD236D66230A0D6700EB88F9 /* RadarLogger.h */,
 				DD236D67230A0D6700EB88F9 /* RadarLogger.m */,
 				9683FD6127B36C26009EBB6B /* RadarMeta.h */,

RadarSDK/RadarLog.h

@@ -10,7 +10,7 @@
 /**
  Represents a debug log.
  */
-@interface RadarLog : NSObject <NSCoding>
+@interface RadarLog : NSObject <NSSecureCoding>
 
 /**
  The levels for debug logs.

RadarSDK/RadarLog.m

@@ -130,4 +130,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:_createdAt forKey:@"createdAt"];
 }
 
++ (BOOL)supportsSecureCoding  {
+    return YES;
+}
+
 @end

RadarSDK/RadarLogBuffer.m

@@ -111,7 +111,13 @@ - (void)persistLogs {
     for (NSString *file in files) {
         NSString *filePath = [self.logFileDir stringByAppendingPathComponent:file];
         NSData *fileData = [self.fileHandler readFileAtPath:filePath];
-        RadarLog *log = [NSKeyedUnarchiver unarchiveObjectWithData:fileData];
+        RadarLog *log;
+        if (@available(iOS 11.0, *)) {
+            log = [NSKeyedUnarchiver unarchivedObjectOfClasses:[NSSet setWithObjects:[NSString class], [RadarLog class], [NSDate class], nil] fromData:fileData error:nil];
+        } else {
+            log = [NSKeyedUnarchiver unarchiveObjectWithData:fileData];
+        }
+
         if (log && log.message) {
             [logs addObject:log];
         }
@@ -122,7 +128,14 @@ - (void)persistLogs {
 
  - (void)writeToFileStorage:(NSArray <RadarLog *> *)logs {
     for (RadarLog *log in logs) {
-        NSData *logData = [NSKeyedArchiver archivedDataWithRootObject:log];
+
+        NSData *logData;
+        if (@available(iOS 11.0, *)) {
+            logData = [NSKeyedArchiver archivedDataWithRootObject:log requiringSecureCoding:YES error:nil];
+        } else {
+            logData = [NSKeyedArchiver archivedDataWithRootObject:log];
+        }
+
         NSTimeInterval unixTimestamp = [log.createdAt timeIntervalSince1970];
         // logs may be created in the same millisecond, so we append a counter to the end of the timestamp to "tiebreak"
         NSString *unixTimestampString = [NSString stringWithFormat:@"%lld_%04d", (long long)unixTimestamp, fileCounter++];

RadarSDK/RadarReplay.h

@@ -7,7 +7,7 @@
 
 #import "Radar.h"
 
-@interface RadarReplay : NSObject <NSCoding>
+@interface RadarReplay : NSObject <NSSecureCoding>
 
 @property (nonnull, copy, nonatomic, readonly) NSDictionary *replayParams;
 

RadarSDK/RadarReplay.m

@@ -57,4 +57,8 @@ - (NSUInteger)hash {
     return [self.replayParams hash];
 }
 
++ (BOOL)supportsSecureCoding  {
+    return YES;
+}
+
 @end

RadarSDK/RadarReplayBuffer.m

@@ -59,9 +59,17 @@ - (void)writeNewReplayToBuffer:(NSMutableDictionary *)replayParams {
                     [prunedBuffer addObject:mutableReplayBuffer[i]];
                 }
             }
-            replaysData = [NSKeyedArchiver archivedDataWithRootObject:prunedBuffer];
+            if (@available(iOS 11.0, *)) {
+                replaysData = [NSKeyedArchiver archivedDataWithRootObject:prunedBuffer requiringSecureCoding:true error:nil];
+            } else {
+                replaysData = [NSKeyedArchiver archivedDataWithRootObject:prunedBuffer];
+            }
         } else {
-            replaysData = [NSKeyedArchiver archivedDataWithRootObject:mutableReplayBuffer];
+            if (@available(iOS 11.0, *)) {
+                replaysData = [NSKeyedArchiver archivedDataWithRootObject:mutableReplayBuffer requiringSecureCoding:true error:nil];
+            } else {
+                replaysData = [NSKeyedArchiver archivedDataWithRootObject:mutableReplayBuffer];
+            }
         }
 
         [[NSUserDefaults standardUserDefaults] setObject:replaysData forKey:@"radar-replays"];
@@ -150,14 +158,25 @@ - (void)removeReplaysFromBuffer:(NSArray<RadarReplay *> *)replays {
     [mutableReplayBuffer removeObjectsInArray:replays];
 
     // persist the updated buffer
-    NSData *replaysData = [NSKeyedArchiver archivedDataWithRootObject:mutableReplayBuffer];
+    NSData *replaysData;
+    if (@available(iOS 11.0, *)) {
+        replaysData = [NSKeyedArchiver archivedDataWithRootObject:mutableReplayBuffer requiringSecureCoding:true error:nil];
+    } else {
+        replaysData = [NSKeyedArchiver archivedDataWithRootObject:mutableReplayBuffer];
+    }
     [[NSUserDefaults standardUserDefaults] setObject:replaysData forKey:@"radar-replays"];
 }
 
 - (void)loadReplaysFromPersistentStore {
     NSData *replaysData = [[NSUserDefaults standardUserDefaults] objectForKey:@"radar-replays"];
     if (replaysData) {
-        NSArray *replays = [NSKeyedUnarchiver unarchiveObjectWithData:replaysData];
+        NSArray *replays;
+        if (@available(iOS 11.0, *)) {
+            NSSet *allowedClasses = [NSSet setWithObjects:[NSArray class], [RadarReplay class], [NSDictionary class], [NSString class], [NSNumber class], nil];
+            replays = [NSKeyedUnarchiver unarchivedObjectOfClasses:allowedClasses fromData:replaysData error:nil];
+        } else {
+            replays = [NSKeyedUnarchiver unarchiveObjectWithData:replaysData];
+        }
         [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Loaded replays | length = %lu", (unsigned long)[replays count]]];
         mutableReplayBuffer = [NSMutableArray arrayWithArray:replays];
     }

RadarSDKTests/RadarSDKTests.m

@@ -20,7 +20,7 @@
 #import "RadarTestUtils.h"
 #import "RadarTripOptions.h"
 #import "RadarFileStorage.h"
-
+#import "RadarReplayBuffer.h"
 
 @interface RadarSDKTests : XCTestCase
 
@@ -30,6 +30,7 @@ @interface RadarSDKTests : XCTestCase
 @property (nonatomic, strong) RadarFileStorage *fileSystem;
 @property (nonatomic, strong) NSString *testFilePath;
 @property (nonatomic, strong) RadarLogBuffer *logBuffer;
+@property (nonatomic, strong) RadarReplayBuffer *replayBuffer;
 @end
 
 @implementation RadarSDKTests
@@ -299,7 +300,7 @@ - (void)setUp {
     self.testFilePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"testfile"];
     [[RadarLogBuffer sharedInstance]clearBuffer];
     [[RadarLogBuffer sharedInstance]setPersistentLogFeatureFlag:YES];
-
+    [[RadarReplayBuffer sharedInstance]clearBuffer];
 }
 
 - (void)tearDown {
@@ -1489,6 +1490,22 @@ - (void)test_RadarLogBuffer_purge {
     [[RadarLogBuffer sharedInstance]clearBuffer];
 }
 
+- (void)test_RadarReplayBuffer_writeAndRead {
+    RadarSdkConfiguration *sdkConfiguration = [RadarSettings sdkConfiguration];
+    sdkConfiguration.usePersistence = true;
+    [RadarSettings setSdkConfiguration:sdkConfiguration];
+
+    CLLocation *location = [[CLLocation alloc] initWithLatitude:0.1 longitude:0.1];
+    NSMutableDictionary * params = [RadarTestUtils createTrackParamWithLocation:location stopped:YES foreground:YES source:RadarLocationSourceGeofenceEnter replayed:YES beacons:[NSArray arrayWithObject:[RadarBeacon alloc]] verified:YES attestationString:@"attestationString" keyId:@"keyID" attestationError:@"attestationError" encrypted:YES expectedCountryCode:@"CountryCode" expectedStateCode:@"StateCode"];
+
+    [[RadarReplayBuffer sharedInstance] writeNewReplayToBuffer:params];
+    [[RadarReplayBuffer sharedInstance] setValue:NULL forKey:@"mutableReplayBuffer"];
+    [[RadarReplayBuffer sharedInstance] loadReplaysFromPersistentStore];
+    NSMutableArray<RadarReplay *> *mutableReplayBuffer = [[RadarReplayBuffer sharedInstance] valueForKey:@"mutableReplayBuffer"];
+    XCTAssertEqual(mutableReplayBuffer.count, 1);
+    XCTAssertEqualObjects(mutableReplayBuffer.firstObject.replayParams, params);
+}
+
 - (void)test_RadarSdkConfiguration {
     RadarSdkConfiguration *sdkConfiguration = [[RadarSdkConfiguration alloc] initWithDict:@{
         @"logLevel": @"warning",

RadarSDKTests/RadarTestUtils.h

@@ -7,12 +7,38 @@
 
 #import <Foundation/Foundation.h>
 
+#import "CLLocation+Radar.h"
+#import "RadarLocationManager.h"
+#import "RadarSettings.h"
+#import "RadarState.h"
+#import "RadarUtils.h"
+#import "RadarTripOptions.h"
+#import "RadarVerificationManager.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RadarTestUtils : NSObject
 
 + (NSDictionary *)jsonDictionaryFromResource:(NSString *)resource;
 
+/**
+ Construct a track param dict which can be used to test replays from paramters of the track call.
+ uses the stored values from `RadarSettings`, `RadarUtils`, and `RadarState`
+ */
++ (NSMutableDictionary *)createTrackParamWithLocation:(CLLocation *_Nonnull)location
+                                              stopped:(BOOL)stopped
+                                           foreground:(BOOL)foreground
+                                               source:(RadarLocationSource)source
+                                             replayed:(BOOL)replayed
+                                              beacons:(NSArray<RadarBeacon *> *_Nullable)beacons
+                                             verified:(BOOL)verified
+                                    attestationString:(NSString *_Nullable)attestationString
+                                                keyId:(NSString *_Nullable)keyId
+                                     attestationError:(NSString *_Nullable)attestationError
+                                            encrypted:(BOOL)encrypted
+                                  expectedCountryCode:(NSString * _Nullable)expectedCountryCode
+                                    expectedStateCode:(NSString * _Nullable)expectedStateCode;
+
 @end
 
 NS_ASSUME_NONNULL_END