Merge pull request #1070 from OneSignal/fix/respect_duration_since_last_IAM

Respect duration since last message trigger on app close and relaunch

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessagingDefines.h

@@ -76,6 +76,7 @@ typedef NS_ENUM(NSUInteger, OSTriggerOperatorType) {
 #define OS_IAM_PAGE_IMPRESSIONED_SET_KEY @"OS_IAM_PAGE_IMPRESSIONED_SET"
 #define OS_IAM_MESSAGES_ARRAY @"OS_IAM_MESSAGES_ARRAY"
 #define OS_IAM_REDISPLAY_DICTIONARY @"OS_IAM_REDISPLAY_DICTIONARY"
+#define OS_IAM_TIME_SINCE_LAST_MESSAGE_KEY @"OS_IAM_TIME_SINCE_LAST_MESSAGE"
 
 // Dynamic trigger kind types
 #define OS_DYNAMIC_TRIGGER_KIND_CUSTOM @"custom"

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

@@ -138,8 +138,7 @@ - (instancetype)init {
         };
         self.messages = [OneSignalUserDefaults.initStandard getSavedCodeableDataForKey:OS_IAM_MESSAGES_ARRAY
                                                                                           defaultValue:[NSArray<OSInAppMessageInternal *> new]];
-        self.triggerController = [OSTriggerController new];
-        self.triggerController.delegate = self;
+        [self initializeTriggerController];
         self.messageDisplayQueue = [NSMutableArray new];
 
         let standardUserDefaults = OneSignalUserDefaults.initStandard;
@@ -160,6 +159,14 @@ - (instancetype)init {
     return self;
 }
 
+- (void)initializeTriggerController {
+    self.triggerController = [OSTriggerController new];
+    self.triggerController.delegate = self;
+    NSString *timeSinceLastMessage = [OneSignalUserDefaults.initShared getSavedStringForKey:OS_IAM_TIME_SINCE_LAST_MESSAGE_KEY defaultValue:nil];
+    [self.triggerController timeSinceLastMessage:[[NSDateFormatter iso8601DateFormatter]
+                                                  dateFromString:timeSinceLastMessage]];
+}
+
 - (void)updateInAppMessagesFromCache {
     self.messages = [OneSignalUserDefaults.initStandard getSavedCodeableDataForKey:OS_IAM_MESSAGES_ARRAY defaultValue:[NSArray new]];
     [self evaluateMessages];
@@ -602,7 +609,7 @@ - (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message disp
         // Reset the IAM viewController to prepare for next IAM if one exists
         self.viewController = nil;
         // Reset time since last IAM
-        [self.triggerController timeSinceLastMessage:[NSDate new]];
+        [self setAndPersistTimeSinceLastMessage];
 
         if (!_currentPromptAction) {
             [self evaluateMessageDisplayQueue];
@@ -612,6 +619,15 @@ - (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message disp
     }
 }
 
+- (void)setAndPersistTimeSinceLastMessage {
+    NSDate *timeSinceLastMessage = [NSDate new];
+    [self.triggerController timeSinceLastMessage:timeSinceLastMessage];
+    NSString *stringTimeSinceLastMessage = [[NSDateFormatter iso8601DateFormatter]
+                                            stringFromDate:timeSinceLastMessage];
+    [OneSignalUserDefaults.initShared saveStringForKey:OS_IAM_TIME_SINCE_LAST_MESSAGE_KEY
+                                             withValue:stringTimeSinceLastMessage];
+}
+
 - (void)evaluateMessageDisplayQueue {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Evaluating message display queue"];
     // No IAMs are showing currently

iOS_SDK/OneSignalSDK/Source/OSTriggerController.m

@@ -120,6 +120,9 @@ - (BOOL)messageHasOnlyDynamicTriggers:(OSInAppMessageInternal *)message {
 #pragma mark Private Methods
 
 - (void)timeSinceLastMessage:(NSDate *)date {
+    if (date == nil) {
+        date = [NSDate distantPast];
+    }
     self.dynamicTriggerController.timeSinceLastMessage = date;
 }