Skip to content

Commit f6027db

Browse files
authored
Merge pull request #1594 from OneSignal/fix/nserror_localized_description_errors
Fix: Prevent exception when copying an error's localizedDescription
2 parents 73a8eda + c81982d commit f6027db

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ - (void)attemptFetchWithRetries:(NSString *)subscriptionId
318318
onFailure:^(OneSignalClientError *error) {
319319
NSDictionary* responseHeaders = error.responseHeaders;
320320

321-
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.underlyingError.localizedDescription]];
321+
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.description]];
322322

323323
if (error.code == 425 || error.code == 429) { // 425 Too Early or 429 Too Many Requests
324324
NSInteger retryAfter = [responseHeaders[@"Retry-After"] integerValue] ?: DEFAULT_RETRY_AFTER_SECONDS;
@@ -387,7 +387,7 @@ - (void)fetchInAppMessagesWithoutToken:(NSString *)subscriptionId {
387387
}
388388
});
389389
} onFailure:^(OneSignalClientError *error) {
390-
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.underlyingError.localizedDescription]];
390+
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.description]];
391391
}];
392392
}
393393

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/OneSignalLiveActivitiesManagerImpl.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public class OneSignalLiveActivitiesManagerImpl: NSObject, OSLiveActivities {
171171
contentState: contentState,
172172
pushType: .token)
173173
} catch let error {
174-
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot start default live activity: " + error.localizedDescription)
174+
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot start default live activity: \(error)")
175175
}
176176
}
177177

0 commit comments

Comments
 (0)