[DO NOT MERGE] Kenny/consolidated/send up live activity and events based

.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

@@ -1,16 +1,17 @@
 Pod::Spec.new do |s|
   s.name                  = 'RadarSDK'
-  s.version               = '3.21.4'
+  s.version               = '3.21.5-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.' => 'support@radar.com' }
   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/Radar.h

@@ -93,7 +93,9 @@ typedef NS_ENUM(NSInteger, RadarLocationSource) {
     /// Beacon exit
     RadarLocationSourceBeaconExit,
     /// Unknown
-    RadarLocationSourceUnknown
+    RadarLocationSourceUnknown,
+    /// Offline
+    RadarLocationSourceOffline
 };
 
 /**

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];
                                             }
 
@@ -103,7 +103,7 @@ + (void)initializeWithPublishableKey:(NSString *)publishableKey options:(RadarIn
                                                 [Radar startTrackingWithOptions:[RadarSettings trackingOptions]];
                                             }
                                             if (sdkConfiguration.trackOnceOnAppOpen) {
-                                                [Radar trackOnceWithCompletionHandler:nil];
+                                                [Radar trackOnceWithDesiredAccuracy:RadarTrackingOptionsDesiredAccuracyMedium beacons:[Radar getTrackingOptions].beacons completionHandler:nil];
                                             }
 
                                             [self flushLogs];
@@ -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 {
@@ -1274,6 +1269,9 @@ + (NSString *)stringForLocationSource:(RadarLocationSource)source {
     case RadarLocationSourceBeaconExit:
         str = @"BEACON_EXIT";
         break;
+    case RadarLocationSourceOffline:
+        str = @"OFFLINE_DETECTION";
+        break;
     case RadarLocationSourceUnknown:
         str = @"UNKNOWN";
     }
@@ -1346,7 +1344,7 @@ - (void)applicationWillEnterForeground {
                                              if (status != RadarStatusSuccess || !config) {
                                                 return;
                                              }
-                                             [[RadarLocationManager sharedInstance] updateTrackingFromMeta:config.meta];
+                                             [[RadarLocationManager sharedInstance] updateTrackingFromConfig:config];
                                              [RadarSettings setSdkConfiguration:config.meta.sdkConfiguration];
                                          }];
     }
@@ -1355,7 +1353,7 @@ - (void)applicationWillEnterForeground {
 
     RadarSdkConfiguration *sdkConfiguration = [RadarSettings sdkConfiguration];
     if (sdkConfiguration.trackOnceOnAppOpen) {
-        [Radar trackOnceWithCompletionHandler:nil];
+        [Radar trackOnceWithDesiredAccuracy:RadarTrackingOptionsDesiredAccuracyMedium beacons:[Radar getTrackingOptions].beacons completionHandler:nil];
     }
 }
 

RadarSDK/RadarAPIClient.h

@@ -20,7 +20,7 @@
 #import "RadarRoutes.h"
 #import "RadarUser.h"
 #import "RadarVerifiedLocationToken.h"
-
+#import "RadarSwiftUtils.h"
 NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^_Nonnull RadarTrackAPICompletionHandler)(RadarStatus status,

RadarSDK/RadarAPIClient.m

@@ -11,6 +11,7 @@
 #import "Radar.h"
 #import "RadarAddress+Internal.h"
 #import "RadarBeacon+Internal.h"
+#import "RadarBeaconManager.h"
 #import "RadarConfig.h"
 #import "RadarContext+Internal.h"
 #import "RadarCoordinate+Internal.h"
@@ -35,6 +36,7 @@
 #import "RadarVerifiedLocationToken+Internal.h"
 #import "RadarNotificationHelper.h"
 #import <os/log.h>
+#import "RadarOfflineManager.h"
 
 @implementation RadarAPIClient
 
@@ -227,6 +229,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 +316,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];
@@ -326,6 +332,7 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
         params[@"locationAccuracyAuthorization"] = locationAccuracyAuthorization;
     }
     params[@"notificationAuthorization"] = @([RadarState notificationPermissionGranted]);
+    params[@"liveActivityAvailable"] = @([RadarSwiftUtils areActivitiesEnabled]);
 
     params[@"trackingOptions"] = [options dictionaryValue];
 
@@ -465,13 +472,25 @@ - (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) {
+                    NSArray<RadarGeofence *> *userGeofences = [RadarOfflineManager getUserGeofencesFromLocation:location];
+                    [RadarOfflineManager generateEventsFromOfflineLocations:location userGeofences:userGeofences completionHandler:^(NSArray<RadarEvent *> *events, RadarUser *user, CLLocation *location) {
+                        if (events && events.count) {
+                            [[RadarDelegateHolder sharedInstance] didReceiveEvents:events user:user];
+                        }
+
+                        [[RadarDelegateHolder sharedInstance] didUpdateLocation:location user:user];
+                    }];
+                    return [RadarOfflineManager updateTrackingOptionsFromOfflineLocation:userGeofences 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 +516,28 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
                                 }
 
                                 [[RadarDelegateHolder sharedInstance] didFailWithStatus:status];
+                                if ([RadarSettings sdkConfiguration].useOfflineRTOUpdates) {
+                                    NSArray<RadarGeofence *> *userGeofences = [RadarOfflineManager getUserGeofencesFromLocation:location];
+                                    [RadarOfflineManager generateEventsFromOfflineLocations:location userGeofences:userGeofences completionHandler:^(NSArray<RadarEvent *> *events, RadarUser *user, CLLocation *location) {
+                                        [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelInfo message:[NSString stringWithFormat:@"events from offline manager: %@", events]];
+                                        if (events && events.count) {
+                                            [[RadarDelegateHolder sharedInstance] didReceiveEvents:events user:user];
+                                        }
+                                        [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelInfo message:[NSString stringWithFormat:@"location from offline manager: %@", location]];
+
+                                        [[RadarDelegateHolder sharedInstance] didUpdateLocation:location user:user];
+
+                                    }];
+
+                                    return [RadarOfflineManager updateTrackingOptionsFromOfflineLocation:userGeofences 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];
@@ -510,6 +547,7 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
 
                             id eventsObj = res[@"events"];
                             id userObj = res[@"user"];
+
                             id nearbyGeofencesObj = res[@"nearbyGeofences"];
                             NSArray<RadarEvent *> *events = [RadarEvent eventsFromObject:eventsObj];
                             RadarUser *user = [[RadarUser alloc] initWithObject:userObj];
@@ -559,7 +597,6 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
                                 }
                                 [RadarState setBeaconIds:beaconIds];
                             }
-
                             if (events && user) {
                                 [RadarSettings setId:user._id];
 
@@ -583,6 +620,14 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
                                     [[RadarDelegateHolder sharedInstance] didUpdateToken:token];
                                 }
 
+                                [RadarState setRadarUser:user];
+
+                                id nearbyBeaconRegionsObj = res[@"nearbyBeaconRegions"];
+                                if (nearbyBeaconRegionsObj && [nearbyBeaconRegionsObj isKindOfClass:[NSArray class]]) {
+                                    NSArray<NSDictionary<NSString *, NSString *> *> *beaconRegions = (NSArray<NSDictionary<NSString *, NSString *> *> *)nearbyBeaconRegionsObj;
+                                    [[RadarBeaconManager sharedInstance] registerBeaconRegionNotificationsFromArray:beaconRegions];
+                                }
+
                                 return completionHandler(RadarStatusSuccess, res, events, user, nearbyGeofences, config, token);
                             } else {
                                 [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelInfo message:[NSString stringWithFormat:@"Setting %lu notifications remaining", (unsigned long)notificationsRemaining.count]];

RadarSDK/RadarBeaconManager.h

@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonnull, strong, nonatomic) RadarPermissionsHelper *permissionsHelper;
 
 + (instancetype)sharedInstance;
+- (void)registerBeaconRegionNotificationsFromArray:(NSArray<NSDictionary<NSString *, NSString*> *> *_Nonnull)beaconArray;
 - (void)rangeBeacons:(NSArray<RadarBeacon *> *_Nonnull)beacons completionHandler:(RadarBeaconCompletionHandler)completionHandler;
 - (void)rangeBeaconUUIDs:(NSArray<NSString *> *_Nonnull)beaconUUIDs completionHandler:(RadarBeaconCompletionHandler)completionHandler;
 - (void)handleBeaconEntryForRegion:(CLBeaconRegion *)region completionHandler:(RadarBeaconCompletionHandler)completionHandler;