RadarSettings --> RadarState

radarlabs · Dec 19, 2024 · 4ced992 · 4ced992
1 parent aa42fb1
commit 4ced992
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/RadarSDK/RadarAPIClient.m b/RadarSDK/RadarAPIClient.m
@@ -459,7 +459,7 @@ - (void)makeTrackRequestWithParams:(NSDictionary *)params
                                     NSMutableDictionary *bufferParams = [params mutableCopy];
                                     bufferParams[@"replayed"] = @(YES);
 
-                                    [RadarSettings setRegisteredNotifications:notificationsRemaining];
+                                    [RadarState setRegisteredNotifications:notificationsRemaining];
 
                                     [[RadarReplayBuffer sharedInstance] writeNewReplayToBuffer:bufferParams];
                                 } else if (options.replay == RadarTrackingOptionsReplayStops && stopped &&

diff --git a/RadarSDK/RadarNotificationHelper.m b/RadarSDK/RadarNotificationHelper.m
@@ -194,7 +194,7 @@ + (void)addOnPremiseNotificationRequests:(NSArray<UNNotificationRequest *> *)req
                     }
                 }];
             }
-            [RadarSettings setRegisteredNotifications:registeredNotifications];
+            [RadarState setRegisteredNotifications:registeredNotifications];
         } else {
             [[RadarLogger sharedInstance] logWithLevel:RadarLogLevelDebug message:@"Notification permissions not granted. Skipping adding notifications."];
             return;
@@ -204,7 +204,7 @@ + (void)addOnPremiseNotificationRequests:(NSArray<UNNotificationRequest *> *)req
 
 + (void)getNotificationDiffWithCompletionHandler:(void (^)(NSArray *notificationsDelivered, NSArray *notificationsRemaining))completionHandler {
     UNUserNotificationCenter *notificationCenter = [UNUserNotificationCenter currentNotificationCenter];
-    NSArray *registeredNotifications = [RadarSettings registeredNotifications];
+    NSArray *registeredNotifications = [RadarState registeredNotifications];
 
     [notificationCenter getPendingNotificationRequestsWithCompletionHandler:^(NSArray<UNNotificationRequest *> *requests) {
         NSMutableArray *currentNotifications = [NSMutableArray new];

diff --git a/RadarSDK/RadarSettings.h b/RadarSDK/RadarSettings.h
@@ -53,8 +53,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)setLogLevel:(RadarLogLevel)level;
 + (NSArray<NSString *> *_Nullable)beaconUUIDs;
 + (void)setBeaconUUIDs:(NSArray<NSString *> *_Nullable)beaconUUIDs;
-+ (NSArray<NSDictionary *> *_Nullable)registeredNotifications;
-+ (void)setRegisteredNotifications:(NSArray<NSDictionary *> *_Nullable)registeredNotifications;
 + (NSString *)host;
 + (void)updateLastTrackedTime;
 + (NSDate *)lastTrackedTime;

diff --git a/RadarSDK/RadarSettings.m b/RadarSDK/RadarSettings.m
@@ -277,15 +277,6 @@ + (void)setBeaconUUIDs:(NSArray<NSString *> *_Nullable)beaconUUIDs {
     [[NSUserDefaults standardUserDefaults] setValue:beaconUUIDs forKey:kBeaconUUIDs];
 }
 
-+ (NSArray<NSDictionary *> *_Nullable)registeredNotifications {
-    NSArray<NSDictionary *> *registeredNotifications = [[NSUserDefaults standardUserDefaults] valueForKey:kRegisteredNotifications];
-    return registeredNotifications;
-}
-
-+ (void)setRegisteredNotifications:(NSArray<NSDictionary *> *_Nullable)registeredNotifications {
-    [[NSUserDefaults standardUserDefaults] setValue:registeredNotifications forKey:kRegisteredNotifications];
-}
-
 + (NSString *)host {
     NSString *host = [[NSUserDefaults standardUserDefaults] stringForKey:kHost];
     return host ? host : kDefaultHost;

diff --git a/RadarSDK/RadarState.h b/RadarSDK/RadarState.h
@@ -40,6 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)setLastMotionActivityData:(NSDictionary *_Nullable)lastMotionActivityData;
 + (void)setNotificationPermissionGranted:(BOOL)granted;
 + (BOOL)notificationPermissionGranted;
++ (NSArray<NSDictionary *> *_Nullable)registeredNotifications;
++ (void)setRegisteredNotifications:(NSArray<NSDictionary *> *_Nullable)registeredNotifications;
 
 @end
 

diff --git a/RadarSDK/RadarState.m b/RadarSDK/RadarState.m
@@ -190,4 +190,12 @@ + (BOOL)notificationPermissionGranted {
     return [[NSUserDefaults standardUserDefaults] boolForKey:kNotificationPermissionGranted];
 }
 
++ (NSArray<NSDictionary *> *_Nullable)registeredNotifications {
+    NSArray<NSDictionary *> *registeredNotifications = [[NSUserDefaults standardUserDefaults] valueForKey:kRegisteredNotifications];
+    return registeredNotifications;
+}
+
++ (void)setRegisteredNotifications:(NSArray<NSDictionary *> *_Nullable)registeredNotifications {
+    [[NSUserDefaults standardUserDefaults] setValue:registeredNotifications forKey:kRegisteredNotifications];
+}
 @end