Check new beacons against currently monitored beacons

radarlabs · Sep 19, 2023 · d7dbfff · d7dbfff
1 parent 34b4ed3
commit d7dbfff
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/RadarSDK.podspec b/RadarSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'RadarSDK'
-  s.version               = '3.8.8'
+  s.version               = '3.8.9-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]' }

diff --git a/RadarSDK.xcodeproj/project.pbxproj b/RadarSDK.xcodeproj/project.pbxproj
@@ -954,7 +954,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -973,7 +973,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MARKETING_VERSION = 3.8.8;
+				MARKETING_VERSION = 3.8.9;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1018,7 +1018,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1031,7 +1031,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MARKETING_VERSION = 3.8.8;
+				MARKETING_VERSION = 3.8.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_CFLAGS = "-fembed-bitcode";

diff --git a/RadarSDK/RadarBeaconManager.m b/RadarSDK/RadarBeaconManager.m
@@ -146,11 +146,21 @@ - (void)rangeBeacons:(NSArray<RadarBeacon *> *_Nonnull)beacons completionHandler
 
         return;
     }
-
-    self.beacons = beacons;
+
     self.started = YES;
 
+    // Use a set for faster lookup
+    NSMutableSet *currentBeaconIDs = [NSMutableSet set];
+    for (RadarBeacon *currentBeacon in self.beacons) {
+        [currentBeaconIDs addObject:currentBeacon._id];
+    }
+
+
     for (RadarBeacon *beacon in beacons) {
+        if ([currentBeaconIDs containsObject:beacon._id]) {
+            // Already ranging this beacon, skip
+            continue;
+        }
         CLBeaconRegion *region = [self regionForBeacon:beacon];
 
         if (region) {
@@ -165,6 +175,7 @@ - (void)rangeBeacons:(NSArray<RadarBeacon *> *_Nonnull)beacons completionHandler
                                                                                   beacon.uuid, beacon.major, beacon.minor]];
         }
     }
+    self.beacons = [self.beacons arrayByAddingObjectsFromArray:beacons];
 }
 
 - (void)rangeBeaconUUIDs:(NSArray<NSString *> *_Nonnull)beaconUUIDs completionHandler:(RadarBeaconCompletionHandler)completionHandler {
@@ -207,10 +218,15 @@ - (void)rangeBeaconUUIDs:(NSArray<NSString *> *_Nonnull)beaconUUIDs completionHa
         return;
     }
 
-    self.beaconUUIDs = beaconUUIDs;
     self.started = YES;
+    NSMutableSet *currentBeaconUUIDsSet = [NSMutableSet setWithArray:self.beaconUUIDs];
+
 
     for (NSString *beaconUUID in beaconUUIDs) {
+            if ([currentBeaconUUIDsSet containsObject:beaconUUID]) {
+            // Already ranging this UUID, skip
+            continue;
+        }
         CLBeaconRegion *region = [self regionForUUID:beaconUUID];
 
         if (region) {
@@ -221,6 +237,8 @@ - (void)rangeBeaconUUIDs:(NSArray<NSString *> *_Nonnull)beaconUUIDs completionHa
             [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Error starting ranging UUID | beaconUUID = %@", beaconUUID]];
         }
     }
+
+    self.beaconUUIDs = [self.beaconUUIDs arrayByAddingObjectsFromArray:beaconUUIDs];
 }
 
 - (void)stopRanging {

diff --git a/RadarSDK/RadarLocationManager.m b/RadarSDK/RadarLocationManager.m
@@ -35,7 +35,7 @@ @interface RadarLocationManager ()
 @property (assign, nonatomic) int startedInterval;
 
 /**
- `YES` if `RadarAPIClient.trackWithLocation() has been called, but the
+ `YES` if `RadarAPIClient.trackWithLocation() hasp been called, but the
  response hasn't been received yet.
  */
 @property (assign, nonatomic) BOOL sending;
@@ -982,7 +982,10 @@ - (void)locationManager:(CLLocationManager *)manager didDetermineState:(CLRegion
                                                               [self handleLocation:location source:RadarLocationSourceBeaconEnter beacons:nearbyBeacons];
                                                           }];
         }
-    } else {
+    } else if (state == CLRegionStateUnknown) {
+        [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Unknown beacon region | identifier = %@", region.identifier]];
+    }
+     else {
         [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:[NSString stringWithFormat:@"Outside beacon region | identifier = %@", region.identifier]];
 
         if ([region.identifier hasPrefix:kSyncBeaconUUIDIdentifierPrefix]) {

diff --git a/RadarSDK/RadarUtils.m b/RadarSDK/RadarUtils.m
@@ -45,7 +45,7 @@ + (NSNumber *)timeZoneOffset {
 }
 
 + (NSString *)sdkVersion {
-    return @"3.8.8";
+    return @"3.8.9-beta.2";
 }
 
 + (NSString *)deviceId {