Offline ramp up

.github/workflows/release-sdk.yml

@@ -23,10 +23,10 @@ jobs:
         run: xcodebuild clean build analyze test -workspace Example/Example.xcodeproj/project.xcworkspace -scheme RadarSDK -destination "platform=iOS Simulator,name=iPhone 15 Pro" | xcpretty
 
       - name: Build archive for iPhone simulator (RadarSDK)
-        run: xcodebuild archive -scheme RadarSDK -archivePath "RadarSDK-iphonesimulator.xcarchive" -sdk iphonesimulator SKIP_INSTALL=NO CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO
+        run: xcodebuild archive -scheme RadarSDK -archivePath "RadarSDK-iphonesimulator.xcarchive" -sdk iphonesimulator SKIP_INSTALL=NO CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
 
       - name: Build archive for iPhone device (RadarSDK)
-        run: xcodebuild archive -scheme RadarSDK -archivePath "RadarSDK-iphoneos.xcarchive" -sdk iphoneos SKIP_INSTALL=NO CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO
+        run: xcodebuild archive -scheme RadarSDK -archivePath "RadarSDK-iphoneos.xcarchive" -sdk iphoneos SKIP_INSTALL=NO CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
 
       - name: Build archive for iPhone simulator (RadarSDKMotion)
         run: cd RadarSDKMotion && xcodebuild archive -scheme RadarSDKMotion -archivePath "../RadarSDKMotion-iphonesimulator.xcarchive" -sdk iphonesimulator SKIP_INSTALL=NO CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO

RadarSDK.podspec

@@ -6,11 +6,12 @@ Pod::Spec.new do |s|
   s.author                = { 'Radar Labs, Inc.' => '[email protected]' }
   s.platform              = :ios
   s.source                = { :git => 'https://github.com/radarlabs/radar-sdk-ios.git', :tag => s.version.to_s }
-  s.source_files          = ["RadarSDK/*.{h,m}", "RadarSDK/Internal/*.{h,m}", "RadarSDK/Include/*.h"]
+  s.source_files          = ["RadarSDK/*.{h,m,swift}", "RadarSDK/Internal/*.{h,m}", "RadarSDK/Include/*.h"]
   s.module_name           = 'RadarSDK'
   s.ios.deployment_target = '12.0'
   s.frameworks            = 'CoreLocation'
   s.requires_arc          = true
   s.license               = { :type => 'Apache-2.0' }
   s.resource_bundles      = {'RadarSDK' => ['RadarSDK/PrivacyInfo.xcprivacy']}
+  s.swift_version         = '5.0'
 end

RadarSDK/Include/RadarTrackingOptions.h

@@ -182,6 +182,7 @@ typedef NS_ENUM(NSInteger, RadarTrackingOptionsSyncLocations) {
 + (NSString *)stringForSyncLocations:(RadarTrackingOptionsSyncLocations)syncLocations;
 + (RadarTrackingOptionsSyncLocations)syncLocationsForString:(NSString *)str;
 + (RadarTrackingOptions *_Nullable)trackingOptionsFromDictionary:(NSDictionary *_Nonnull)dictionary;
++ (RadarTrackingOptions *_Nullable)trackingOptionsFromObject:(NSObject *_Nonnull)object;
 - (NSDictionary *)dictionaryValue;
 
 @end

RadarSDK/Radar.m

@@ -94,7 +94,7 @@ + (void)initializeWithPublishableKey:(NSString *)publishableKey options:(RadarIn
                                                   verified:NO
                                          completionHandler:^(RadarStatus status, RadarConfig *config) {
                                             if (status == RadarStatusSuccess && config) {
-                                                [[RadarLocationManager sharedInstance] updateTrackingFromMeta:config.meta];
+                                                [[RadarLocationManager sharedInstance] updateTrackingFromConfig:config];
                                                 [RadarSettings setSdkConfiguration:config.meta.sdkConfiguration];
                                             }
 
@@ -214,20 +214,17 @@ + (void)trackOnceWithDesiredAccuracy:(RadarTrackingOptionsDesiredAccuracy)desire
                                            beacons:beacons
                                  completionHandler:^(RadarStatus status, NSDictionary *_Nullable res, NSArray<RadarEvent *> *_Nullable events, RadarUser *_Nullable user,
                                                      NSArray<RadarGeofence *> *_Nullable nearbyGeofences, RadarConfig *_Nullable config, RadarVerifiedLocationToken *_Nullable token) {
-                                     if (status == RadarStatusSuccess) {
-                                         [[RadarLocationManager sharedInstance] replaceSyncedGeofences:nearbyGeofences];
-                                         if (config != nil) {
-                                             [[RadarLocationManager sharedInstance] updateTrackingFromMeta:config.meta];
-                                         }
-
-                                     }
+                                    [[RadarLocationManager sharedInstance] updateTrackingFromConfig:config];
+                                    if (status == RadarStatusSuccess) {
+                                        [[RadarLocationManager sharedInstance] replaceSyncedGeofences:nearbyGeofences];
+                                    }
 
-                                     if (completionHandler) {
-                                         [RadarUtils runOnMainThread:^{
-                                             completionHandler(status, location, events, user);
-                                         }];
-                                     }
-                                 }];
+                                    if (completionHandler) {
+                                        [RadarUtils runOnMainThread:^{
+                                            completionHandler(status, location, events, user);
+                                        }];
+                                    }
+                                }];
                          };
 
                          if (beacons) {
@@ -287,15 +284,13 @@ + (void)trackOnceWithLocation:(CLLocation *)location completionHandler:(RadarTra
                                                beacons:nil
                                      completionHandler:^(RadarStatus status, NSDictionary *_Nullable res, NSArray<RadarEvent *> *_Nullable events, RadarUser *_Nullable user,
                                                          NSArray<RadarGeofence *> *_Nullable nearbyGeofences, RadarConfig *_Nullable config, RadarVerifiedLocationToken *_Nullable token) {
-                                        if (status == RadarStatusSuccess && config != nil) {                                    
-                                            [[RadarLocationManager sharedInstance] updateTrackingFromMeta:config.meta];                                            
+                                        [[RadarLocationManager sharedInstance] updateTrackingFromConfig:config];                                            
+                                        if (completionHandler) {
+                                            [RadarUtils runOnMainThread:^{
+                                                completionHandler(status, location, events, user);
+                                            }];
                                         }
-                                         if (completionHandler) {
-                                             [RadarUtils runOnMainThread:^{
-                                                 completionHandler(status, location, events, user);
-                                             }];
-                                         }
-                                     }];
+                                    }];
 }
 
 + (void)trackVerifiedWithCompletionHandler:(RadarTrackVerifiedCompletionHandler)completionHandler {
@@ -1346,7 +1341,7 @@ - (void)applicationWillEnterForeground {
                                              if (status != RadarStatusSuccess || !config) {
                                                 return;
                                              }
-                                             [[RadarLocationManager sharedInstance] updateTrackingFromMeta:config.meta];
+                                             [[RadarLocationManager sharedInstance] updateTrackingFromConfig:config];
                                              [RadarSettings setSdkConfiguration:config.meta.sdkConfiguration];
                                          }];
     }

RadarSDK/RadarAPIClient.m

@@ -35,6 +35,7 @@
 #import "RadarVerifiedLocationToken+Internal.h"
 #import "RadarNotificationHelper.h"
 #import <os/log.h>
+#import "RadarOfflineManager.h"
 
 @implementation RadarAPIClient
 
@@ -227,6 +228,7 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
     params[@"anonymous"] = @(anonymous);
     if (anonymous) {
         params[@"deviceId"] = @"anonymous";
+        // this can be updated by offline event detection, which feels correct, not going to address right now for simplicity
         params[@"geofenceIds"] = [RadarState geofenceIds];
         params[@"placeId"] = [RadarState placeId];
         params[@"regionIds"] = [RadarState regionIds];
@@ -313,6 +315,9 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
     RadarTrackingOptions *options = [Radar getTrackingOptions];
     if (options.syncGeofences) {
         params[@"nearbyGeofences"] = @(YES);
+        if (sdkConfiguration.useOfflineRTOUpdates) {
+            params[@"nearbyGeofencesLimit"] = @(100);
+        }
     }
     if (beacons) {
         params[@"beacons"] = [RadarBeacon arrayForBeacons:beacons];
@@ -465,13 +470,17 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
             if (status != RadarStatusSuccess) {
                 [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Failed to flush replays"]];
                 [[RadarDelegateHolder sharedInstance] didFailWithStatus:status];
+                if ([RadarSettings sdkConfiguration].useOfflineRTOUpdates) { 
+                    return [RadarOfflineManager updateTrackingOptionsFromOfflineLocation:location completionHandler:^(RadarConfig * _Nullable config) {
+                        return completionHandler(status, nil, nil, nil, nil, config, nil);
+                    }];
+                }
             } else {
                 [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Successfully flushed replays"]];
                 [RadarState setLastFailedStoppedLocation:nil];
                 [RadarSettings updateLastTrackedTime];
             }
-
-            completionHandler(status, nil, nil, nil, nil, nil, nil);
+            return completionHandler(status, nil, nil, nil, nil, nil, nil);
         }];
     } else {
         [self.apiHelper requestWithMethod:@"POST"
@@ -497,10 +506,16 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
                                 }
 
                                 [[RadarDelegateHolder sharedInstance] didFailWithStatus:status];
+                                if ([RadarSettings sdkConfiguration].useOfflineRTOUpdates) { 
+                                    return [RadarOfflineManager updateTrackingOptionsFromOfflineLocation:location completionHandler:^(RadarConfig * _Nullable config) {
+                                        return completionHandler(status, nil, nil, nil, nil, config, nil);
+                                    }];
+                                } else {
+                                    return completionHandler(status, nil, nil, nil, nil, nil, nil);
+                                }
+
 
-                                return completionHandler(status, nil, nil, nil, nil, nil, nil);
                             }
-
                             [[RadarReplayBuffer sharedInstance] clearBuffer];
                             [RadarState setLastFailedStoppedLocation:nil];
                             [Radar flushLogs];

RadarSDK/RadarGeofence.m

@@ -131,7 +131,7 @@ - (instancetype _Nullable)initWithObject:(id)object {
             radius = [((NSNumber *)radiusObj) floatValue];
         }
 
-        if ([type isEqualToString:@"circle"]) {
+        if ([type isEqualToString:@"circle"] || [type isEqualToString:@"Circle"]) {
             geometry = [[RadarCircleGeometry alloc] initWithCenter:center radius:radius];
         } else if ([type isEqualToString:@"polygon"] || [type isEqualToString:@"Polygon"] || [type isEqualToString:@"isochrone"]) {
             NSMutableArray<RadarCoordinate *> *mutablePolygonCoordinates = [self getPolygonCoordinates:dict]; 

RadarSDK/RadarLocationManager.h

@@ -11,6 +11,7 @@
 #import "Radar.h"
 #import "RadarDelegate.h"
 #import "RadarMeta.h"
+#import "RadarConfig.h"
 #import "RadarPermissionsHelper.h"
 #import "RadarActivityManager.h"
 
@@ -32,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)replaceSyncedBeacons:(NSArray<RadarBeacon *> *)beacons;
 - (void)replaceSyncedBeaconUUIDs:(NSArray<NSString *> *)uuids;
 - (void)updateTracking;
-- (void)updateTrackingFromMeta:(RadarMeta *_Nullable)meta;
+- (void)updateTrackingFromConfig:(RadarConfig *_Nullable)config;
 - (void)updateTrackingFromInitialize;
 
 /**

RadarSDK/RadarLocationManager.m

@@ -462,12 +462,15 @@ - (void)updateTracking:(CLLocation *)location fromInitialize:(BOOL)fromInitializ
     });
 }
 
-- (void)updateTrackingFromMeta:(RadarMeta *_Nullable)meta {
-    if (meta) {
-        if ([meta trackingOptions]) {
+- (void)updateTrackingFromConfig:(RadarConfig *_Nullable)config {
+    if (config == nil) {
+        return;
+    }
+    if (config.meta) {
+        if ([config.meta trackingOptions]) {
             [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug
-                                               message:[NSString stringWithFormat:@"Setting remote tracking options | trackingOptions = %@", meta.trackingOptions]];
-            [RadarSettings setRemoteTrackingOptions:[meta trackingOptions]];
+                                               message:[NSString stringWithFormat:@"Setting remote tracking options | trackingOptions = %@", config.meta.trackingOptions]];
+            [RadarSettings setRemoteTrackingOptions:[config.meta trackingOptions]];
         } else {
             [RadarSettings removeRemoteTrackingOptions];
             [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug
@@ -523,10 +526,11 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
         return;
     }
 
+    [RadarState setNearbyGeofences:geofences];
     [self removeSyncedGeofences];
 
     RadarTrackingOptions *options = [Radar getTrackingOptions];
-    NSUInteger numGeofences = MIN(geofences.count, options.beacons ? 9 : 19);
+    NSUInteger numGeofences = MIN(MIN(geofences.count,19), options.beacons ? 9 : 19);
     NSMutableArray *requests = [NSMutableArray array]; 
 
     for (int i = 0; i < numGeofences; i++) {
@@ -580,10 +584,11 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
             }
         }
     }
-
-    [RadarNotificationHelper removePendingNotificationsWithCompletionHandler: ^{
-        [RadarNotificationHelper addOnPremiseNotificationRequests:requests];
-    }];
+    if (NSClassFromString(@"XCTestCase") == nil) {
+        [RadarNotificationHelper removePendingNotificationsWithCompletionHandler: ^{
+            [RadarNotificationHelper addOnPremiseNotificationRequests:requests];
+        }];
+    }
 }
 
 - (void)removeSyncedGeofences {
@@ -884,8 +889,13 @@ - (void)sendLocation:(CLLocation *)location stopped:(BOOL)stopped source:(RadarL
                                              completionHandler:^(RadarStatus status, NSDictionary *_Nullable res, NSArray<RadarEvent *> *_Nullable events, RadarUser *_Nullable user,
                                                                  NSArray<RadarGeofence *> *_Nullable nearbyGeofences, RadarConfig *_Nullable config, RadarVerifiedLocationToken *_Nullable token) {
                 self.sending = NO;
-
-                [self updateTrackingFromMeta:config.meta];
+
+                [self updateTrackingFromConfig:config];
+
+                if (status != RadarStatusSuccess || !config) {
+                    return;
+                }
+
                 [self replaceSyncedGeofences:nearbyGeofences];
             }];
         };
@@ -965,13 +975,15 @@ - (void)sendLocation:(CLLocation *)location stopped:(BOOL)stopped source:(RadarL
                                                    beacons:beacons
                                          completionHandler:^(RadarStatus status, NSDictionary *_Nullable res, NSArray<RadarEvent *> *_Nullable events, RadarUser *_Nullable user,
                                                              NSArray<RadarGeofence *> *_Nullable nearbyGeofences, RadarConfig *_Nullable config, RadarVerifiedLocationToken *_Nullable token) {
-                                             self.sending = NO;
-                                             if (status != RadarStatusSuccess || !config) {
-                                                 return;
-                                             }
+                                            self.sending = NO;
+
+                                            [self updateTrackingFromConfig:config];
+
+                                            if (status != RadarStatusSuccess || !config) {
+                                                return;
+                                            }
 
-                                             [self updateTrackingFromMeta:config.meta];
-                                             [self replaceSyncedGeofences:nearbyGeofences];
+                                            [self replaceSyncedGeofences:nearbyGeofences];
                                          }];
     }
 }

RadarSDK/RadarLogger.h

@@ -16,8 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSDateFormatter *dateFormatter;
 @property (strong, nonatomic) UIDevice *device;
 
-+ (instancetype)sharedInstance;
-- (void)logWithLevel:(RadarLogLevel)level message:(NSString *)message;
++ (instancetype)sharedInstance NS_SWIFT_NAME(sharedInstance());
+- (void)logWithLevel:(RadarLogLevel)level message:(NSString *)message NS_SWIFT_NAME(log(level:message:));
 - (void)logWithLevel:(RadarLogLevel)level type:(RadarLogType)type message:(NSString *)message;
 - (void)logWithLevel:(RadarLogLevel)level type:(RadarLogType)type message:(NSString *)message includeDate:(BOOL)includeDate includeBattery:(BOOL)includeBattery;
 - (void)logWithLevel:(RadarLogLevel)level type:(RadarLogType)type message:(NSString *)message includeDate:(BOOL)includeDate includeBattery:(BOOL)includeBattery append:(BOOL)append;

RadarSDK/RadarOfflineManager.h

@@ -0,0 +1,20 @@
+//
+//  Header.h
+//  RadarSDK
+//
+//  Created by Kenny Hu on 10/16/24.
+//  Copyright © 2024 Radar Labs, Inc. All rights reserved.
+//
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+#import "RadarConfig.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RadarOfflineManager : NSObject
+
++ (void)updateTrackingOptionsFromOfflineLocation:(CLLocation *)location completionHandler:(void (^)(RadarConfig *))completionHandler;
+
+@end
+
+NS_ASSUME_NONNULL_END