2.8.5 Release

Nightsd01 · Nightsd01 · commit 5f655895e355 · 2018-05-18T15:45:13.000-07:00
• Resolves a rare concurrency issue with the SDK's HTTP client
diff --git a/OneSignal.podspec b/OneSignal.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "2.8.4"
+  s.version          = "2.8.5"
   s.summary          = "OneSignal push notification library for mobile apps."
   s.homepage         = "https://onesignal.com"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/OneSignal b/iOS_SDK/OneSignalSDK/Framework/OneSignal.framework/Versions/A/OneSignal
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
@@ -132,7 +132,7 @@ @implementation OSPendingCallbacks
 
 @implementation OneSignal
 
-NSString* const ONESIGNAL_VERSION = @"020804";
+NSString* const ONESIGNAL_VERSION = @"020805";
 static NSString* mSDKType = @"native";
 static BOOL coldStartFromTapOnNotification = NO;
 
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m b/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m
@@ -92,7 +92,7 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString *, OneSignalRequest *
             }];
         }
         
-        dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+        dispatch_group_wait(group, dispatch_time(DISPATCH_TIME_NOW, REQUEST_TIMEOUT_REQUEST * NSEC_PER_SEC));
         
         //requests should all be completed at this point
         dispatch_async(dispatch_get_main_queue(), ^{

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ - (void)executeSimultaneousRequests:(NSDictionary<NSString , OneSignalRequest `
`92`	`92`	`}];`
`93`	`93`	`}`
`94`	`94`
`95`		`- dispatch_group_wait(group, DISPATCH_TIME_FOREVER);`
	`95`	`+ dispatch_group_wait(group, dispatch_time(DISPATCH_TIME_NOW, REQUEST_TIMEOUT_REQUEST * NSEC_PER_SEC));`
`96`	`96`
`97`	`97`	`//requests should all be completed at this point`
`98`	`98`	`dispatch_async(dispatch_get_main_queue(), ^{`