Skip to content

Commit 52ca73a

Browse files
committed
Fix Failure Block in setLanguageOnServer
* Fixed Failure block in OneSignal.h on setLanguageOnServer
1 parent 262aa4f commit 52ca73a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

iOS_SDK/OneSignalSDK/Source/OneSignal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ typedef void (^OSSMSSuccessBlock)(NSDictionary *results);
566566
#pragma mark Language
567567
// Typedefs defining completion blocks for updating language
568568
typedef void (^OSUpdateLanguageFailureBlock)(NSError *error);
569-
typedef void (^OSUpdateLanguageSuccessBlock)(NSDictionary *results);
569+
typedef void (^OSUpdateLanguageSuccessBlock)();
570570

571571
+ (void)setLanguage:(NSString * _Nonnull)language;
572572
+ (void)setLanguage:(NSString * _Nonnull)language withSuccess:(OSUpdateLanguageSuccessBlock _Nullable)successBlock withFailure:(OSUpdateLanguageFailureBlock)failureBlock;

iOS_SDK/OneSignalSDK/Source/OneSignal.m

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2710,7 +2710,7 @@ + (void)setLanguage:(NSString * _Nonnull)language {
27102710
[self setLanguageOnServer:language WithSuccess:nil withFailure:nil];
27112711
}
27122712

2713-
+ (void)setLanguage:(NSString * _Nonnull)language withSuccess:(OSUpdateLanguageSuccessBlock)successBlock withFailure:(OSUpdateLanguageFailureBlock)failureBlock {
2713+
+ (void)setLanguage:(NSString * _Nonnull)language withSuccess:(OSUpdateLanguageSuccessBlock _Nullable)successBlock withFailure:(OSUpdateLanguageFailureBlock _Nullable)failureBlock {
27142714
// return if the user has not granted privacy permissions
27152715
if ([self shouldLogMissingPrivacyConsentErrorWithMethodName:@"setLanguage"])
27162716
return;
@@ -2722,13 +2722,16 @@ + (void)setLanguage:(NSString * _Nonnull)language withSuccess:(OSUpdateLanguageS
27222722

27232723
+ (void)setLanguageOnServer:(NSString * _Nonnull)language WithSuccess:(OSUpdateLanguageSuccessBlock)successBlock withFailure:(OSUpdateLanguageFailureBlock)failureBlock {
27242724

2725-
[OneSignal.stateSynchronizer updateLanguage:language appId:appId withSuccess:successBlock withFailure:failureBlock];
2726-
2727-
if(successBlock) {
2725+
[OneSignal.stateSynchronizer updateLanguage:language appId:appId withSuccess:^(NSDictionary *results) {
27282726
let languageProviderAppDefined = [LanguageProviderAppDefined new];
27292727
[languageProviderAppDefined setLanguage:language];
27302728
[languageContext setStrategy:languageProviderAppDefined];
2731-
}
2729+
if (successBlock)
2730+
successBlock(results);
2731+
} withFailure:^(NSError *error) {
2732+
if (failureBlock)
2733+
failureBlock([NSError errorWithDomain:@"com.onesignal.language" code:0 userInfo:@{@"error" : @"Invalid Language Code"}]);
2734+
}];
27322735
}
27332736

27342737
+ (void)setExternalUserId:(NSString * _Nonnull)externalId {

0 commit comments

Comments
 (0)