Update failure blocks to use new OSClientFailureBlock

nan-li · nan-li · commit 65812da0599e · 2024-12-16T12:12:48.000-08:00
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSReattemptRequest.h b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSReattemptRequest.h
@@ -27,13 +27,14 @@
 
 #import <Foundation/Foundation.h>
 #import "OneSignalRequest.h"
+#import "OneSignalClientError.h"
 
 @interface OSReattemptRequest : NSObject
 
 @property (strong, nonatomic) OneSignalRequest *request;
 @property (nonatomic) OSResultSuccessBlock successBlock;
-@property (nonatomic) OSFailureBlock failureBlock;
+@property (nonatomic) OSClientFailureBlock failureBlock;
 
-+(instancetype)withRequest:(OneSignalRequest *)request successBlock:(OSResultSuccessBlock)success failureBlock:(OSFailureBlock)failure;
++(instancetype)withRequest:(OneSignalRequest *)request successBlock:(OSResultSuccessBlock)success failureBlock:(OSClientFailureBlock)failure;
 
 @end
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSReattemptRequest.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSReattemptRequest.m
@@ -29,7 +29,7 @@
 
 @implementation OSReattemptRequest
 
-+(instancetype)withRequest:(OneSignalRequest *)request successBlock:(OSResultSuccessBlock)success failureBlock:(OSFailureBlock)failure {
++(instancetype)withRequest:(OneSignalRequest *)request successBlock:(OSResultSuccessBlock)success failureBlock:(OSClientFailureBlock)failure {
     OSReattemptRequest *reattempt = [OSReattemptRequest new];
     
     reattempt.request = request;
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OneSignalClient.m
@@ -112,7 +112,7 @@ - (void)executeRequest:(OneSignalRequest *)request onSuccess:(OSResultSuccessBlo
     [task resume];
 }
 
-- (void)handleMissingAppIdError:(OSFailureBlock)failureBlock withRequest:(OneSignalRequest *)request {
+- (void)handleMissingAppIdError:(OSClientFailureBlock)failureBlock withRequest:(OneSignalRequest *)request {
     NSString *errorDescription = [NSString stringWithFormat:@"HTTP Request (%@) must contain app_id parameter", NSStringFromClass([request class])];
     
     [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:errorDescription];
@@ -147,7 +147,7 @@ - (void)reattemptRequest:(OSReattemptRequest *)reattempt {
     [self executeRequest:reattempt.request onSuccess:reattempt.successBlock onFailure:reattempt.failureBlock];
 }
 
-- (BOOL)willReattemptRequest:(int)statusCode withRequest:(OneSignalRequest *)request success:(OSResultSuccessBlock)successBlock failure:(OSFailureBlock)failureBlock asyncRequest:(BOOL)async {
+- (BOOL)willReattemptRequest:(int)statusCode withRequest:(OneSignalRequest *)request success:(OSResultSuccessBlock)successBlock failure:(OSClientFailureBlock)failureBlock asyncRequest:(BOOL)async {
     // in the event that there is no network connection, NSURLSession will return status code 0
     if ((statusCode >= 500 || statusCode == 0) && request.reattemptCount < MAX_ATTEMPT_COUNT - 1) {
         OSReattemptRequest *reattempt = [OSReattemptRequest withRequest:request successBlock:successBlock failureBlock:failureBlock];
@@ -193,7 +193,7 @@ - (void)prettyPrintDebugStatementWithRequest:(OneSignalRequest *)request {
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"HTTP Request (%@) with URL: %@, with parameters: %@ and headers: %@", NSStringFromClass([request class]), request.urlRequest.URL.absoluteString, jsonString, request.additionalHeaders]];
 }
 
-- (void)handleJSONNSURLResponse:(NSURLResponse*)response data:(NSData*)data error:(NSError*)error isAsync:(BOOL)async withRequest:(OneSignalRequest *)request onSuccess:(OSResultSuccessBlock)successBlock onFailure:(OSFailureBlock)failureBlock {
+- (void)handleJSONNSURLResponse:(NSURLResponse*)response data:(NSData*)data error:(NSError*)error isAsync:(BOOL)async withRequest:(OneSignalRequest *)request onSuccess:(OSResultSuccessBlock)successBlock onFailure:(OSClientFailureBlock)failureBlock {
     
     NSHTTPURLResponse* HTTPResponse = (NSHTTPURLResponse*)response;
     NSInteger statusCode = [HTTPResponse statusCode];
diff --git a/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m b/iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
@@ -101,9 +101,9 @@ - (void)sendReceiveReceiptWithPlayerId:(nonnull NSString *)playerId
             if (success) {
                 success(result);
             }
-        } onFailure:^(NSError *error) {
+        } onFailure:^(OneSignalClientError *error) {
             if (failure) {
-                failure(error);
+                failure(error.underlyingError);
             }
         }];
     });
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageController.m
@@ -46,13 +46,17 @@ - (void)loadMessageHTMLContentWithResult:(OSResultSuccessBlock _Nullable)success
     
     let request = [OSRequestLoadInAppMessageContent withAppId:[OneSignalConfigManager getAppId] withMessageId:self.messageId withVariantId:variantId];
     
-    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {
+        failureBlock(error.underlyingError);
+    }];
 }
 
 - (void)loadPreviewMessageHTMLContentWithUUID:(NSString * _Nonnull)previewUUID success:(OSResultSuccessBlock _Nullable)successBlock failure:(OSFailureBlock _Nullable)failureBlock {
     let request = [OSRequestLoadInAppMessagePreviewContent withAppId:[OneSignalConfigManager getAppId] previewUUID:previewUUID];
     
-    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {
+        failureBlock(error.underlyingError);
+    }];
 }
 
 /**
diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m
@@ -393,8 +393,8 @@ - (void)fetchInAppMessagesWithoutToken:(NSString *)subscriptionId {
                 return;
             }
         });
-    } onFailure:^(NSError *error) {
-        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.localizedDescription]];
+    } onFailure:^(OneSignalClientError *error) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.underlyingError.localizedDescription]];
     }];
 }
 
@@ -630,8 +630,8 @@ - (void)messageViewPageImpressionRequest:(OSInAppMessageInternal *)message withP
                                             // If the post was successful, save the updated viewedPageIds set
                                             [OneSignalUserDefaults.initStandard saveSetForKey:OS_IAM_PAGE_IMPRESSIONED_SET_KEY withValue:self.viewedPageIDs];
                                        }
-                                       onFailure:^(NSError *error) {
-        NSString *errorMessage = [NSString stringWithFormat:@"In App Message with message id: %@ and page id: %@, failed POST page impression update with error: %@", message.messageId, pageId, error];
+                                       onFailure:^(OneSignalClientError *error) {
+        NSString *errorMessage = [NSString stringWithFormat:@"In App Message with message id: %@ and page id: %@, failed POST page impression update with error: %@", message.messageId, pageId, error.message];
                                             [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:errorMessage];
                                             if (message) {
                                                 [self.viewedPageIDs removeObject:messagePrefixedPageId];
@@ -670,8 +670,8 @@ - (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message {
                                            // If the post was successful, save the updated impressionedInAppMessages set
                                            [OneSignalUserDefaults.initStandard saveSetForKey:OS_IAM_IMPRESSIONED_SET_KEY withValue:self.impressionedInAppMessages];
                                        }
-                                       onFailure:^(NSError *error) {
-                                           NSString *errorMessage = [NSString stringWithFormat:@"In App Message with id: %@, failed POST impression update with error: %@", message.messageId, error];
+                                       onFailure:^(OneSignalClientError *error) {
+                                           NSString *errorMessage = [NSString stringWithFormat:@"In App Message with id: %@, failed POST impression update with error: %@", message.messageId, error.message];
                                            [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:errorMessage];
                                            
                                            // If the post failed, remove the messageId from the impressionedInAppMessages set
@@ -1075,8 +1075,8 @@ - (void)sendClickRESTCall:(OSInAppMessageInternal *)message withAction:(OSInAppM
                                           // Save the updated clickedClickIds since click was tracked successfully
                                           [OneSignalUserDefaults.initStandard saveSetForKey:OS_IAM_CLICKED_SET_KEY withValue:self.clickedClickIds];
                                       }
-                                      onFailure:^(NSError *error) {
-                                          NSString *errorMessage = [NSString stringWithFormat:@"In App Message with id: %@, failed POST click update for click id: %@, with error: %@", message.messageId, action.clickId, error];
+                                      onFailure:^(OneSignalClientError *error) {
+                                          NSString *errorMessage = [NSString stringWithFormat:@"In App Message with id: %@, failed POST click update for click id: %@, with error: %@", message.messageId, action.clickId, error.message];
                                           [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:errorMessage];
 
                                           // Remove clickId from local clickedClickIds since click was not tracked
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V1/OSOutcomeEventsV1Repository.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V1/OSOutcomeEventsV1Repository.m
@@ -65,7 +65,9 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId
             return;
     }
 
-    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {
+        failureBlock(error.underlyingError);
+    }];
 }
 
 @end
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V2/OSOutcomeEventsV2Repository.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/Controller/V2/OSOutcomeEventsV2Repository.m
@@ -43,7 +43,9 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId
                                                                  appId:appId
                                                             deviceType:deviceType];
 
-    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];
+    [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {
+        failureBlock(error.underlyingError);
+    }];
 }
 
 @end
diff --git a/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.m b/iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.m
@@ -121,10 +121,10 @@ - (void)sendSessionEndOutcomes:(NSNumber * _Nonnull)timeElapsed
         if (successBlock) {
             successBlock(result);
         }
-    } onFailure:^(NSError *error) {
+    } onFailure:^(OneSignalClientError *error) {
         [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes attributed failed"];
         if (failureBlock) {
-            failureBlock(error);
+            failureBlock(error.underlyingError);
         }
     }];
 }
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
@@ -655,7 +655,7 @@ + (void)downloadIOSParamsWithAppId:(NSString *)appId {
 
         _downloadedParameters = true;
 
-    } onFailure:^(NSError *error) {
+    } onFailure:^(OneSignalClientError *error) {
         _didCallDownloadParameters = false;
     }];
 }

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,9 @@ - (void)sendReceiveReceiptWithPlayerId:(nonnull NSString *)playerId`
`101`	`101`	`if (success) {`
`102`	`102`	`success(result);`
`103`	`103`	`}`
`104`		`- } onFailure:^(NSError *error) {`
	`104`	`+ } onFailure:^(OneSignalClientError *error) {`
`105`	`105`	`if (failure) {`
`106`		`- failure(error);`
	`106`	`+ failure(error.underlyingError);`
`107`	`107`	`}`
`108`	`108`	`}];`
`109`	`109`	`});`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,9 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId`
`65`	`65`	`return;`
`66`	`66`	`}`
`67`	`67`
`68`		`- [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
	`68`	`+ [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {`
	`69`	`+ failureBlock(error.underlyingError);`
	`70`	`+ }];`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId`
`43`	`43`	`appId:appId`
`44`	`44`	`deviceType:deviceType];`
`45`	`45`
`46`		`- [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:failureBlock];`
	`46`	`+ [OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {`
	`47`	`+ failureBlock(error.underlyingError);`
	`48`	`+ }];`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,10 @@ - (void)sendSessionEndOutcomes:(NSNumber * _Nonnull)timeElapsed`
`121`	`121`	`if (successBlock) {`
`122`	`122`	`successBlock(result);`
`123`	`123`	`}`
`124`		`- } onFailure:^(NSError *error) {`
	`124`	`+ } onFailure:^(OneSignalClientError *error) {`
`125`	`125`	`[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes attributed failed"];`
`126`	`126`	`if (failureBlock) {`
`127`		`- failureBlock(error);`
	`127`	`+ failureBlock(error.underlyingError);`
`128`	`128`	`}`
`129`	`129`	`}];`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ + (void)downloadIOSParamsWithAppId:(NSString *)appId {`
`655`	`655`
`656`	`656`	`_downloadedParameters = true;`
`657`	`657`
`658`		`- } onFailure:^(NSError *error) {`
	`658`	`+ } onFailure:^(OneSignalClientError *error) {`
`659`	`659`	`_didCallDownloadParameters = false;`
`660`	`660`	`}];`
`661`	`661`	`}`