Skip to content

Commit 1f5ae96

Browse files
emawbyemawby
authored
Merge pull request #1132 from OneSignal/fix/xcode_14_warnings_and_build_fail
Fix xcode 14 warnings and build failure
2 parents 80ab08d + 0102f9a commit 1f5ae96

File tree

3 files changed

+106
-74
lines changed

3 files changed

+106
-74
lines changed

‎iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,7 +2701,6 @@
27012701
ALWAYS_SEARCH_USER_PATHS = NO;
27022702
ARCHS = (
27032703
"$(ARCHS_STANDARD)",
2704-
armv7s,
27052704
x86_64h,
27062705
x86_64,
27072706
);
@@ -2765,6 +2764,11 @@
27652764
CA2951B82167F4120064227A /* Release */ = {
27662765
isa = XCBuildConfiguration;
27672766
buildSettings = {
2767+
ARCHS = (
2768+
"$(ARCHS_STANDARD)",
2769+
x86_64h,
2770+
x86_64,
2771+
);
27682772
CLANG_ANALYZER_NONNULL = YES;
27692773
CLANG_ENABLE_CODE_COVERAGE = NO;
27702774
CLANG_ENABLE_MODULES = YES;
@@ -2859,7 +2863,6 @@
28592863
ALWAYS_SEARCH_USER_PATHS = NO;
28602864
ARCHS = (
28612865
"$(ARCHS_STANDARD)",
2862-
armv7s,
28632866
x86_64h,
28642867
x86_64,
28652868
);
@@ -2923,6 +2926,11 @@
29232926
CA2951C42167FB950064227A /* Debug */ = {
29242927
isa = XCBuildConfiguration;
29252928
buildSettings = {
2929+
ARCHS = (
2930+
"$(ARCHS_STANDARD)",
2931+
x86_64h,
2932+
x86_64,
2933+
);
29262934
CLANG_ANALYZER_NONNULL = YES;
29272935
CLANG_ENABLE_CODE_COVERAGE = NO;
29282936
CLANG_ENABLE_MODULES = YES;
@@ -3016,6 +3024,11 @@
30163024
isa = XCBuildConfiguration;
30173025
buildSettings = {
30183026
APPLICATION_EXTENSION_API_ONLY = YES;
3027+
ARCHS = (
3028+
"$(ARCHS_STANDARD)",
3029+
x86_64h,
3030+
x86_64,
3031+
);
30193032
CLANG_ANALYZER_NONNULL = YES;
30203033
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
30213034
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -3072,6 +3085,11 @@
30723085
isa = XCBuildConfiguration;
30733086
buildSettings = {
30743087
APPLICATION_EXTENSION_API_ONLY = YES;
3088+
ARCHS = (
3089+
"$(ARCHS_STANDARD)",
3090+
x86_64h,
3091+
x86_64,
3092+
);
30753093
CLANG_ANALYZER_NONNULL = YES;
30763094
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
30773095
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";

‎iOS_SDK/OneSignalSDK/Source/OneSignalLocation.m‎

Lines changed: 83 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -200,81 +200,92 @@ + (void)sendCurrentAuthStatusToListeners {
200200
}
201201

202202
+ (void)internalGetLocation:(bool)prompt fallbackToSettings:(BOOL)fallback {
203-
fallbackToSettings = fallback;
204-
id clLocationManagerClass = NSClassFromString(@"CLLocationManager");
205-
206-
// On the application init we are always calling this method
207-
// If location permissions was not asked "started" will never be true
208-
if ([self started]) {
209-
// We evaluate the following cases after permissions were asked (denied or given)
210-
CLAuthorizationStatus permissionStatus = [clLocationManagerClass performSelector:@selector(authorizationStatus)];
211-
BOOL showSettings = prompt && fallback && permissionStatus == kCLAuthorizationStatusDenied;
212-
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"internalGetLocation called showSettings: %@", showSettings ? @"YES" : @"NO"]];
213-
// Fallback to settings alert view when the following condition are true:
214-
// - On a prompt flow
215-
// - Fallback to settings is enabled
216-
// - Permission were denied
217-
if (showSettings)
218-
[self showLocationSettingsAlertController];
219-
else
220-
[self sendCurrentAuthStatusToListeners];
221-
return;
222-
}
223-
224-
// Check for location in plist
225-
if (![clLocationManagerClass performSelector:@selector(locationServicesEnabled)]) {
226-
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:@"CLLocationManager locationServices Disabled."];
227-
[self sendAndClearLocationListener:ERROR];
228-
return;
229-
}
230-
231-
CLAuthorizationStatus permissionStatus = [clLocationManagerClass performSelector:@selector(authorizationStatus)];
232-
// return if permission not determined and should not prompt
233-
if (permissionStatus == kCLAuthorizationStatusNotDetermined && !prompt) {
234-
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:@"internalGetLocation kCLAuthorizationStatusNotDetermined."];
235-
return;
236-
}
237-
238-
[self sendCurrentAuthStatusToListeners];
239-
locationManager = [[clLocationManagerClass alloc] init];
240-
[locationManager setValue:[self sharedInstance] forKey:@"delegate"];
241-
203+
/*
204+
Do permission checking on a background thread to resolve locationServicesEnabled warning.
205+
*/
206+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
207+
fallbackToSettings = fallback;
208+
id clLocationManagerClass = NSClassFromString(@"CLLocationManager");
242209

243-
//Check info plist for request descriptions
244-
//LocationAlways > LocationWhenInUse > No entry (Log error)
245-
//Location Always requires: Location Background Mode + NSLocationAlwaysUsageDescription
246-
NSArray* backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"];
247-
NSString* alwaysDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationAlwaysUsageDescription"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationAlwaysAndWhenInUseUsageDescription"];
248-
// use background location updates if always permission granted or prompt allowed
249-
BOOL backgroundLocationEnable = backgroundModes && [backgroundModes containsObject:@"location"] && alwaysDescription;
250-
BOOL permissionEnable = permissionStatus == kCLAuthorizationStatusAuthorizedAlways || prompt;
251-
252-
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"internalGetLocation called backgroundLocationEnable: %@ permissionEnable: %@", backgroundLocationEnable ? @"YES" : @"NO", permissionEnable ? @"YES" : @"NO"]];
253-
254-
if (backgroundLocationEnable && permissionEnable) {
255-
#pragma clang diagnostic push
256-
#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
257-
[locationManager performSelector:NSSelectorFromString(@"requestAlwaysAuthorization")];
258-
#pragma clang diagnostic pop
259-
if ([OneSignalHelper isIOSVersionGreaterThanOrEqual:@"9.0"])
260-
[locationManager setValue:@YES forKey:@"allowsBackgroundLocationUpdates"];
261-
}
262-
263-
else if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationWhenInUseUsageDescription"]) {
264-
if (permissionStatus == kCLAuthorizationStatusNotDetermined)
265-
[locationManager performSelector:@selector(requestWhenInUseAuthorization)];
266-
}
267-
268-
else {
269-
[OneSignal onesignalLog:ONE_S_LL_ERROR message:@"Include a privacy NSLocationAlwaysUsageDescription or NSLocationWhenInUseUsageDescription in your info.plist to request location permissions."];
270-
[self sendAndClearLocationListener:LOCATION_PERMISSIONS_MISSING_INFO_PLIST];
271-
}
210+
// On the application init we are always calling this method
211+
// If location permissions was not asked "started" will never be true
212+
if ([self started]) {
213+
// We evaluate the following cases after permissions were asked (denied or given)
214+
CLAuthorizationStatus permissionStatus = [clLocationManagerClass performSelector:@selector(authorizationStatus)];
215+
BOOL showSettings = prompt && fallback && permissionStatus == kCLAuthorizationStatusDenied;
216+
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"internalGetLocation called showSettings: %@", showSettings ? @"YES" : @"NO"]];
217+
// Fallback to settings alert view when the following condition are true:
218+
// - On a prompt flow
219+
// - Fallback to settings is enabled
220+
// - Permission were denied
221+
if (showSettings)
222+
[self showLocationSettingsAlertController];
223+
else
224+
[self sendCurrentAuthStatusToListeners];
225+
return;
226+
}
272227

273-
// This method is used for getting the location manager to obtain an initial location fix
274-
// and will notify your delegate by calling its locationManager:didUpdateLocations: method
275-
[locationManager performSelector:@selector(startUpdatingLocation)];
228+
// Check for location in plist
229+
if (![clLocationManagerClass performSelector:@selector(locationServicesEnabled)]) {
230+
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:@"CLLocationManager locationServices Disabled."];
231+
[self sendAndClearLocationListener:ERROR];
232+
return;
233+
}
234+
235+
CLAuthorizationStatus permissionStatus = [clLocationManagerClass performSelector:@selector(authorizationStatus)];
236+
// return if permission not determined and should not prompt
237+
if (permissionStatus == kCLAuthorizationStatusNotDetermined && !prompt) {
238+
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:@"internalGetLocation kCLAuthorizationStatusNotDetermined."];
239+
return;
240+
}
241+
242+
[self sendCurrentAuthStatusToListeners];
243+
/*
244+
The location manager must be created on a thread with a run loop so we will go back to the main thread.
245+
*/
246+
dispatch_async(dispatch_get_main_queue(), ^{
247+
locationManager = [[clLocationManagerClass alloc] init];
248+
[locationManager setValue:[self sharedInstance] forKey:@"delegate"];
249+
250+
251+
//Check info plist for request descriptions
252+
//LocationAlways > LocationWhenInUse > No entry (Log error)
253+
//Location Always requires: Location Background Mode + NSLocationAlwaysUsageDescription
254+
NSArray* backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"];
255+
NSString* alwaysDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationAlwaysUsageDescription"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationAlwaysAndWhenInUseUsageDescription"];
256+
// use background location updates if always permission granted or prompt allowed
257+
BOOL backgroundLocationEnable = backgroundModes && [backgroundModes containsObject:@"location"] && alwaysDescription;
258+
BOOL permissionEnable = permissionStatus == kCLAuthorizationStatusAuthorizedAlways || prompt;
259+
260+
[OneSignal onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"internalGetLocation called backgroundLocationEnable: %@ permissionEnable: %@", backgroundLocationEnable ? @"YES" : @"NO", permissionEnable ? @"YES" : @"NO"]];
261+
262+
if (backgroundLocationEnable && permissionEnable) {
263+
#pragma clang diagnostic push
264+
#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
265+
[locationManager performSelector:NSSelectorFromString(@"requestAlwaysAuthorization")];
266+
#pragma clang diagnostic pop
267+
if ([OneSignalHelper isIOSVersionGreaterThanOrEqual:@"9.0"])
268+
[locationManager setValue:@YES forKey:@"allowsBackgroundLocationUpdates"];
269+
}
270+
271+
else if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationWhenInUseUsageDescription"]) {
272+
if (permissionStatus == kCLAuthorizationStatusNotDetermined)
273+
[locationManager performSelector:@selector(requestWhenInUseAuthorization)];
274+
}
275+
276+
else {
277+
[OneSignal onesignalLog:ONE_S_LL_ERROR message:@"Include a privacy NSLocationAlwaysUsageDescription or NSLocationWhenInUseUsageDescription in your info.plist to request location permissions."];
278+
[self sendAndClearLocationListener:LOCATION_PERMISSIONS_MISSING_INFO_PLIST];
279+
}
280+
281+
// This method is used for getting the location manager to obtain an initial location fix
282+
// and will notify your delegate by calling its locationManager:didUpdateLocations: method
283+
284+
[locationManager performSelector:@selector(startUpdatingLocation)];
285+
started = true;
286+
});
287+
});
276288

277-
started = true;
278289
}
279290

280291
+ (void)showLocationSettingsAlertController {

‎iOS_SDK/OneSignalSDK/UnitTests/RemoteParamsTests.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ - (void)testLocationPromptAcceptedWithSetLocationShared_iOS9_WhenInUseUsage {
9090
[OneSignal setLocationShared:true];
9191
// Simulate user granting location services
9292
[OneSignalLocationOverrider grantLocationServices];
93+
[UnitTestCommonMethods runLongBackgroundThreads];
9394
// Last location should exist since we are sharing location
9495
XCTAssertTrue([OneSignalLocation lastLocation]);
9596
}
@@ -108,6 +109,7 @@ - (void)testLocationPromptAcceptedWithSetLocationSharedTrueFromRemoteParams_iOS9
108109
XCTAssertFalse([OneSignalLocation lastLocation]);
109110
// Simulate user granting location services
110111
[OneSignalLocationOverrider grantLocationServices];
112+
[UnitTestCommonMethods runLongBackgroundThreads];
111113
// Last location should exist since we are sharing location
112114
XCTAssertTrue([OneSignalLocation lastLocation]);
113115
}
@@ -144,6 +146,7 @@ - (void)testLocationSharedTrueFromRemoteParams {
144146
XCTAssertFalse([OneSignalLocation lastLocation]);
145147
// Simulate user granting location services
146148
[OneSignalLocationOverrider grantLocationServices];
149+
[UnitTestCommonMethods runLongBackgroundThreads];
147150
// Last location should exist since we are sharing location
148151
XCTAssertTrue([OneSignalLocation lastLocation]);
149152
}

0 commit comments

Comments
 (0)