Skip to content

Commit cf90a80

Browse files
authored
Merge pull request #1468 from OneSignal/feat/fix_misleading_error_log_for_wrappers
Omit misleading fatal-level log for wrappers
2 parents d63855d + d2eca16 commit cf90a80

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

iOS_SDK/OneSignalSDK/Source/OneSignal.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,10 @@ + (void)setAppId:(nullable NSString*)newAppId {
293293

294294
+ (BOOL)isValidAppId:(NSString*)appId {
295295
if (!appId || ![[NSUUID alloc] initWithUUIDString:appId]) {
296-
[OneSignalLog onesignalLog:ONE_S_LL_FATAL message:[NSString stringWithFormat:@"OneSignal AppId: %@ - AppId is null or format is invalid, stopping initialization.\nExample usage: 'b2f7f966-d8cc-11e4-bed1-df8f05be55ba'\n", appId]];
296+
if (!OneSignalWrapper.sdkType) {
297+
// Fatal log if not a wrapper SDK, wrappers will call init with null App Id
298+
[OneSignalLog onesignalLog:ONE_S_LL_FATAL message:[NSString stringWithFormat:@"OneSignal AppId: %@ - AppId is null or format is invalid, stopping initialization.\nExample usage: 'b2f7f966-d8cc-11e4-bed1-df8f05be55ba'\n", appId]];
299+
}
297300
return false;
298301
}
299302
return true;

iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ NS_SWIFT_NAME(login(externalId:token:));
7676
+ (Class<OSNotifications>)Notifications NS_REFINED_FOR_SWIFT;
7777

7878
#pragma mark Initialization
79-
+ (void)setLaunchOptions:(nullable NSDictionary*)newLaunchOptions; // meant for use by wrappers
8079
+ (void)initialize:(nonnull NSString*)newAppId withLaunchOptions:(nullable NSDictionary*)launchOptions;
8180
+ (void)setProvidesNotificationSettingsView:(BOOL)providesView;
8281

0 commit comments

Comments
 (0)