Skip to content

Fix HTTP Race Condition #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 18, 2018
Merged

Fix HTTP Race Condition #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
577f98f
Fix HTTP Concurrency
Nightsd01 May 18, 2018
4688812
Remove Debug Statement
Nightsd01 May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions iOS_SDK/OneSignalSDK/Source/OneSignalClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,27 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *

//execute on a background thread or the semaphore will block the caller thread
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
dispatch_group_t group = dispatch_group_create();

__block NSMutableDictionary<NSString *, NSError *> *errors = [NSMutableDictionary new];
__block NSMutableDictionary<NSString *, NSDictionary *> *results = [NSMutableDictionary new];

for (NSString *identifier in requests.allKeys) {
let request = requests[identifier];

//use a dispatch_group instead of a semaphore, in case the failureBlock gets called synchronously
//this will prevent the SDK from waiting/blocking on a request that instantly failed
dispatch_group_enter(group);
[self executeRequest:request onSuccess:^(NSDictionary *result) {
results[identifier] = result;
dispatch_semaphore_signal(semaphore);
dispatch_group_leave(group);
} onFailure:^(NSError *error) {
errors[identifier] = error;
dispatch_semaphore_signal(semaphore);
dispatch_group_leave(group);
}];
}

for (int i = 0; i < requests.count; i++) {
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
}
dispatch_group_wait(group, DISPATCH_TIME_FOREVER);

//requests should all be completed at this point
dispatch_async(dispatch_get_main_queue(), ^{
Expand Down
4 changes: 4 additions & 0 deletions iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ + (void) endBackgroundFocusTask {

+ (void)onFocus:(BOOL)toBackground {

// return if the user has not granted privacy permissions
if ([OneSignal requiresUserPrivacyConsent])
return;

// Prevent the onFocus to be called twice when app being terminated
// - Both WillResignActive and willTerminate
if (lastOnFocusWasToBackground == toBackground)
Expand Down