feat: IAMs now display when triggers added before first fetch #1635
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -149,6 +149,12 @@ @interface OSMessagingController () | |
| /// set when we attempt getInAppMessagesFromServer and no onesignal ID is available yet | ||
| @property (strong, nonatomic, nullable) NSString *shouldFetchOnUserChangeWithSubscriptionID; | ||
|
|
||
| /// Tracks whether the first IAM fetch has completed since this cold start | ||
| @property (nonatomic) BOOL hasCompletedFirstFetch; | ||
|
|
||
| /// Tracks trigger keys added early on cold start (before first fetch completes), for redisplay logic | ||
| @property (strong, nonatomic, nonnull) NSMutableSet<NSString *> *earlySessionTriggers; | ||
|
|
||
| @end | ||
|
|
||
| @implementation OSMessagingController | ||
|
|
@@ -218,6 +224,8 @@ - (instancetype)init { | |
| self.messageDisplayQueue = [NSMutableArray new]; | ||
| self.clickListeners = [NSMutableArray new]; | ||
| self.lifecycleListeners = [NSMutableArray new]; | ||
| self.hasCompletedFirstFetch = NO; | ||
| self.earlySessionTriggers = [NSMutableSet new]; | ||
|
|
||
| let standardUserDefaults = OneSignalUserDefaults.initStandard; | ||
|
|
||
|
|
@@ -404,6 +412,23 @@ - (void)updateInAppMessagesFromServer:(NSArray<OSInAppMessageInternal *> *)newMe | |
| self.messages = newMessages; | ||
| self.calledLoadTags = NO; | ||
| [self resetRedisplayMessagesBySession]; | ||
|
|
||
| // Apply isTriggerChanged for messages that match triggers added too early on cold start | ||
| if (self.earlySessionTriggers.count > 0) { | ||
| [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Processing triggers added early on cold start: %@", self.earlySessionTriggers]]; | ||
| for (OSInAppMessageInternal *message in self.messages) { | ||
| if ([self.redisplayedInAppMessages objectForKey:message.messageId] && | ||
| [self.triggerController hasSharedTriggers:message newTriggersKeys:self.earlySessionTriggers.allObjects]) { | ||
| [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Setting isTriggerChanged=YES for message %@", message]]; | ||
| message.isTriggerChanged = YES; | ||
| } | ||
| } | ||
| [self.earlySessionTriggers removeAllObjects]; | ||
| } | ||
|
|
||
| // Mark that first fetch has completed | ||
| self.hasCompletedFirstFetch = YES; | ||
|
|
||
| [self evaluateMessages]; | ||
| [self deleteOldRedisplayedInAppMessages]; | ||
| } | ||
|
|
@@ -806,6 +831,13 @@ - (void)evaluateRedisplayedInAppMessages:(NSArray<NSString *> *)newTriggersKeys | |
| #pragma mark Trigger Methods | ||
| - (void)addTriggers:(NSDictionary<NSString *, id> *)triggers { | ||
| [self evaluateRedisplayedInAppMessages:triggers.allKeys]; | ||
|
|
||
| // Track triggers added early on cold start (before first fetch completes) for redisplay logic | ||
| if (!self.hasCompletedFirstFetch) { | ||
|
There was a problem hiding this comment. how do we make sure there are no duplicates in this? There was a problem hiding this comment. How do we make sure this is thread safe?
Contributor
Author
There was a problem hiding this comment. Duplicates? Unsure what you mean, earlySessionTriggers is a set. If clients are concurrently calling addTrigger from 2 threads, then the existing code would already be an issue? There was a problem hiding this comment. yeah as we discussed on the call, this is something we should work on soon. Please create a tech debt ticket for this @nan-li . thanks
abdulraqeeb33 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Tracking triggers added early on cold start: %@", triggers]]; | ||
| [self.earlySessionTriggers addObjectsFromArray:triggers.allKeys]; | ||
| } | ||
|
|
||
| [self.triggerController addTriggers:triggers]; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we need some tests for this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have tests in EarlyTriggerTrackingTests.swfit. I think the lines you are are pointing out here have tests in
testMessagesMatchingEarlyTriggers_getIsTriggerChangedFlag. Is there something else in particular you want tested?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah right, missed looking at them.