Skip to content

Commit 2e20861

Browse files
authored
Merge pull request #962 from OneSignal/fix/capability_error_detection
Fix missing push notification capability error detection
2 parents a241b6a + 8119ee9 commit 2e20861

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

iOS_SDK/OneSignalSDK/Source/OneSignal.m

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,15 +1603,8 @@ + (void)handleDidFailRegisterForRemoteNotification:(NSError*)err {
16031603
waitingForApnsResponse = false;
16041604

16051605
if (err.code == 3000) {
1606-
if ([((NSString*)[err.userInfo objectForKey:NSLocalizedDescriptionKey]) rangeOfString:@"no valid 'aps-environment'"].location != NSNotFound) {
1607-
// User did not enable push notification capability
1608-
[OneSignal setSubscriptionErrorStatus:ERROR_PUSH_CAPABLILITY_DISABLED];
1609-
[OneSignal onesignal_Log:ONE_S_LL_ERROR message:@"ERROR! 'Push Notification' capability not turned on! Enable it in Xcode under 'Project Target' -> Capability."];
1610-
}
1611-
else {
1612-
[OneSignal setSubscriptionErrorStatus:ERROR_PUSH_OTHER_3000_ERROR];
1613-
[OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"ERROR! Unknown 3000 error returned from APNs when getting a push token: %@", err]];
1614-
}
1606+
[OneSignal setSubscriptionErrorStatus:ERROR_PUSH_CAPABLILITY_DISABLED];
1607+
[OneSignal onesignal_Log:ONE_S_LL_ERROR message:@"ERROR! 'Push Notifications' capability missing! Add the capability in Xcode under 'Target' -> '<MyAppName(MainTarget)>' -> 'Signing & Capabilities' then click the '+ Capability' button."];
16151608
}
16161609
else if (err.code == 3010) {
16171610
[OneSignal setSubscriptionErrorStatus:ERROR_PUSH_SIMULATOR_NOT_SUPPORTED];

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ typedef enum {GET, POST, HEAD, PUT, DELETE, OPTIONS, CONNECT, TRACE} HTTPMethod;
221221
#define ERROR_PUSH_DELEGATE_NEVER_FIRED -14
222222
#define ERROR_PUSH_SIMULATOR_NOT_SUPPORTED -15
223223
#define ERROR_PUSH_UNKNOWN_APNS_ERROR -16
224-
#define ERROR_PUSH_OTHER_3000_ERROR -17
224+
#define ERROR_PUSH_OTHER_3000_ERROR_UNUSED_RESERVED -17
225225
#define ERROR_PUSH_NEVER_PROMPTED -18
226226
#define ERROR_PUSH_PROMPT_NEVER_ANSWERED -19
227227

0 commit comments

Comments
 (0)