Notification receipt with silent push

Example/Example.xcodeproj/project.pbxproj

@@ -74,6 +74,7 @@
 		DD86FD0B23918B3C003225F6 /* Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Example-Bridging-Header.h"; sourceTree = "<group>"; };
 		DDB861D22385FC3E00770661 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 		E698B7382C626AE600084371 /* RadarSDKMotion.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RadarSDKMotion.xcodeproj; path = ../../RadarSDKMotion/RadarSDKMotion.xcodeproj; sourceTree = "<group>"; };
+		E6E29C3B2C8B6B5A000A6690 /* Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Example.entitlements; sourceTree = "<group>"; };
 		F625D7F82C3337650024D1E7 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -110,6 +111,7 @@
 		DD236D25230A006700EB88F9 /* Example */ = {
 			isa = PBXGroup;
 			children = (
+				E6E29C3B2C8B6B5A000A6690 /* Example.entitlements */,
 				DD86FD0B23918B3C003225F6 /* Example-Bridging-Header.h */,
 				DD236D34230A006900EB88F9 /* Info.plist */,
 				DDB861D22385FC3E00770661 /* Default-568h@2x.png */,
@@ -393,6 +395,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 96GHH65B9D;
@@ -410,7 +413,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.5.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.radar.example;
+				PRODUCT_BUNDLE_IDENTIFIER = io.radar.iosexample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -422,6 +425,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 96GHH65B9D;
@@ -439,7 +443,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.5.0;
-				PRODUCT_BUNDLE_IDENTIFIER = io.radar.example;
+				PRODUCT_BUNDLE_IDENTIFIER = io.radar.iosexample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;

Example/Example/AppDelegate.swift

@@ -34,10 +34,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate, UN
         Radar.setMetadata([ "foo": "bar" ])
         Radar.setDelegate(self)
         Radar.setVerifiedDelegate(self)
-
+        UIApplication.shared.registerForRemoteNotifications()
         return true
     }
 
+    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+        NSLog("Successfully registered for remote notifications with device token: \(deviceToken)")
+        Radar.handleDeviceToken(forRemoteNotifications: deviceToken)
+    }
+
+    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+        NSLog("Failed to register for remote notifications: \(error)")
+    }
+
+    func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+        NSLog("didReceiveRemoteNotification with userInfo: %@", userInfo)
+        Radar.handleSilentPush(payload: userInfo)
+        completionHandler(UIBackgroundFetchResult.newData)
+    } 
+
     func demoButton(text: String, function: @escaping () -> Void) {
         guard let scrollView = self.scrollView else { return }
 
@@ -284,6 +299,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate, UN
                 function()
             }
         }
+
+        demoButton(text: "create dummy notifications") {Radar.testNotificationChecker()}
     }
 
     func requestLocationPermissions() {
@@ -344,24 +361,24 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIWindowSceneDelegate, UN
 
     func didUpdateLocation(_ location: CLLocation, user: RadarUser) {
         let body = "\(user.stopped ? "Stopped at" : "Moved to") location (\(location.coordinate.latitude), \(location.coordinate.longitude)) with accuracy \(location.horizontalAccuracy) meters"
-        self.notify(body)
+        //self.notify(body)
     }
 
     func didUpdateClientLocation(_ location: CLLocation, stopped: Bool, source: RadarLocationSource) {
         let body = "\(stopped ? "Client stopped at" : "Client moved to") location (\(location.coordinate.latitude), \(location.coordinate.longitude)) with accuracy \(location.horizontalAccuracy) meters and source \(Utils.stringForRadarLocationSource(source))"
-        self.notify(body)
+        //self.notify(body)
     }
 
     func didFail(status: RadarStatus) {
-        self.notify(Radar.stringForStatus(status))
+        //self.notify(Radar.stringForStatus(status))
     }
 
     func didLog(message: String) {
-        self.notify(message)
+        //self.notify(message)
     }
 
     func didUpdateToken(_ token: RadarVerifiedLocationToken) {
 
     }
-
+        
 }

Example/Example/Example.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>

Example/Example/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -71,6 +73,8 @@
 	<array>
 		<string>fetch</string>
 		<string>location</string>
+		<string>processing</string>
+		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>Launch Screen.storyboard</string>

RadarSDK/Include/Radar.h

@@ -409,6 +409,8 @@ typedef void (^_Nullable RadarLogConversionCompletionHandler)(RadarStatus status
  */
 + (void)setAnonymousTrackingEnabled:(BOOL)enabled;
 
++ (void)handleDeviceTokenForRemoteNotifications:(NSData *)deviceToken;
+
 #pragma mark - Location
 
 /**
@@ -590,6 +592,8 @@ typedef void (^_Nullable RadarLogConversionCompletionHandler)(RadarStatus status
  */
 + (BOOL)isUsingRemoteTrackingOptions;
 
++ (void)handleSilentPushWithPayload:(NSDictionary *)payload NS_SWIFT_NAME(handleSilentPush(payload:));
+
 #pragma mark - Delegate
 
 /**
@@ -1232,6 +1236,8 @@ typedef void (^_Nullable RadarLogConversionCompletionHandler)(RadarStatus status
  */
 + (void)nativeSetup NS_SWIFT_NAME(nativeSetup());
 
++ (void) testNotificationChecker NS_SWIFT_NAME(testNotificationChecker());
+
 @end
 
 NS_ASSUME_NONNULL_END

RadarSDK/Radar.m

@@ -63,12 +63,20 @@ + (void)initializeWithPublishableKey:(NSString *)publishableKey options:(RadarIn
                                                  name:UIApplicationWillEnterForegroundNotification
                                                object:nil];
 
+    [[NSNotificationCenter defaultCenter] addObserver:[self sharedInstance]
+                                             selector:@selector(applicationDidEnterBackground)
+                                                 name:UIApplicationDidEnterBackgroundNotification
+                                               object:nil];
+
     [RadarSettings setPublishableKey:publishableKey];
 
     RadarSdkConfiguration *sdkConfiguration = [RadarSettings sdkConfiguration];
 
+
     if (NSClassFromString(@"XCTestCase") == nil && options.autoLogNotificationConversions) {
-        [Radar nativeSetup];
+        if (options.autoLogNotificationConversions) {
+            [Radar nativeSetup];
+        }
     }
 
     if (sdkConfiguration.usePersistence) {
@@ -146,6 +154,21 @@ + (void)setAnonymousTrackingEnabled:(BOOL)enabled {
     [RadarSettings setAnonymousTrackingEnabled:enabled];
 }
 
++ (void)handleDeviceTokenForRemoteNotifications:(NSData *)deviceToken {
+    [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:@"Received device token for remote notifications."];
+
+    const char *data = (char *)[deviceToken bytes];
+    NSMutableString *token = [NSMutableString string];
+    for (NSUInteger i = 0; i < [deviceToken length]; i++) {
+        [token appendFormat:@"%02.2hhX", data[i]];
+    }
+    //print the token
+    NSLog(@"deviceToken: %@", token);
+
+    // Save to settings
+    [RadarSettings setDevicePushToken:token];
+}
+
 #pragma mark - Location
 
 + (void)getLocationWithCompletionHandler:(RadarLocationCompletionHandler)completionHandler {
@@ -420,6 +443,32 @@ + (BOOL)isUsingRemoteTrackingOptions {
     return [RadarSettings remoteTrackingOptions] != nil;
 }
 
++ (void)handleSilentPushWithPayload:(NSDictionary *)payload {
+    NSString *message = [NSString stringWithFormat:@"App received silent push notification | payload=%@", payload];
+    [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug type:RadarLogTypeNone message:message includeDate:YES includeBattery:YES];
+
+
+    [RadarNotificationHelper showDidReceiveSilentPushNotification:payload];
+
+    // [RadarNotificationHelper checkForSentOnPremiseNotifications:^{}];
+
+    // payload contains array of actions, only using a single action for now
+    // action is a dictionary with type and optional data
+    // if (payload[@"actions"]) {
+    //     NSDictionary *action = payload[@"actions"][0];
+
+    //     [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug type:RadarLogTypeNone message:message includeDate:YES includeBattery:YES];
+
+    //     // TRACK_ONCE
+    //     if ([action[@"type"] isEqualToString:@"TRACK_ONCE"]) {
+    //         [Radar trackOnceWithCompletionHandler:^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
+    //         }];
+    //     }
+    //     // START_TRACKING
+    //     // ...
+    // }
+}
+
 #pragma mark - Delegate
 
 + (void)setDelegate:(id<RadarDelegate>)delegate {
@@ -1340,13 +1389,18 @@ - (void)applicationWillEnterForeground {
     }
 
     [Radar logOpenedAppConversion];
-
+    [RadarNotificationHelper checkForSentOnPremiseNotifications:^{}];
+
     RadarSdkConfiguration *sdkConfiguration = [RadarSettings sdkConfiguration];
     if (sdkConfiguration.trackOnceOnAppOpen) {
         [Radar trackOnceWithCompletionHandler:nil];
     }
 }
 
+- (void)applicationDidEnterBackground {
+
+}
+
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
@@ -1388,4 +1442,9 @@ + (void)flushLogs {
                             }];
 }
 
++ (void)testNotificationChecker {
+    UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:@"test" content:[UNNotificationContent new] trigger:nil];
+    [RadarState addPendingNotificationRequest:request];
+}
+
 @end

RadarSDK/RadarAPIClient.m

@@ -225,6 +225,7 @@ - (void)trackWithLocation:(CLLocation *_Nonnull)location
         params[@"userId"] = [RadarSettings userId];
         params[@"deviceId"] = [RadarUtils deviceId];
         params[@"description"] = [RadarSettings __description];
+        params[@"devicePushToken"] = [RadarSettings devicePushToken];
         params[@"metadata"] = [RadarSettings metadata];
         NSString *sessionId = [RadarSettings sessionId];
         if (sessionId) {

RadarSDK/RadarLocationManager.m

@@ -526,7 +526,12 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
     for (int i = 0; i < numGeofences; i++) {
         RadarGeofence *geofence = [geofences objectAtIndex:i];
         NSString *geofenceId = geofence._id;
-        NSString *identifier = [NSString stringWithFormat:@"%@%@", kSyncGeofenceIdentifierPrefix, geofenceId];
+
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyyMMddHHmmss"];
+        NSString *timestamp = [dateFormatter stringFromDate:[NSDate date]];
+        NSString *identifier = [NSString stringWithFormat:@"%@%@_%@", kSyncGeofenceIdentifierPrefix, geofenceId, timestamp];
+
         RadarCoordinate *center;
         double radius = 100;
         if ([geofence.geometry isKindOfClass:[RadarCircleGeometry class]]) {
@@ -574,7 +579,7 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
                     } else {
                         [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:@"Notification does not repeat"];
                     }
-
+                  
                     UNLocationNotificationTrigger *trigger = [UNLocationNotificationTrigger triggerWithRegion:region repeats:repeats];
 
                     UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:identifier content:content trigger:trigger];
@@ -586,8 +591,12 @@ - (void)replaceSyncedGeofences:(NSArray<RadarGeofence *> *)geofences {
         }
     }
 
-    [RadarNotificationHelper removePendingNotificationsWithCompletionHandler: ^{
-        [RadarNotificationHelper addOnPremiseNotificationRequests:requests];
+    [RadarNotificationHelper checkForSentOnPremiseNotifications: ^{
+        [RadarState clearPendingNotificationRequests];
+
+        [RadarNotificationHelper removePendingNotificationsWithCompletionHandler: ^{
+            [RadarNotificationHelper addOnPremiseNotificationRequests:requests];
+        }];
     }];
 }
 

RadarSDK/RadarNotificationHelper.h

@@ -16,8 +16,12 @@ typedef void (^NotificationPermissionCheckCompletion)(BOOL granted);
 
 + (void)showNotificationsForEvents:(NSArray<RadarEvent *> *)events;
 
++ (void)showDidReceiveSilentPushNotification:(NSDictionary *)payload;
+
 + (void)swizzleNotificationCenterDelegate;
 
++ (void)checkForSentOnPremiseNotifications:(void (^)(void))completionHandler;
+
 + (void)removePendingNotificationsWithCompletionHandler:(void (^)(void))completionHandler;
 
 + (void)addOnPremiseNotificationRequests:(NSArray<UNNotificationRequest *> *)requests;