Background sending of session ending outcomes

* Add callbacks before ending the background task to send attributed session time, and save unsent time as zero only after a success callback
* This waits 30 seconds in the background

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.h

@@ -52,6 +52,8 @@
                          appId:(NSString * _Nonnull)appId
             pushSubscriptionId:(NSString * _Nonnull)pushSubscriptionId
                    onesignalId:(NSString * _Nonnull)onesignalId
-               influenceParams:(NSArray<OSFocusInfluenceParam *> *_Nonnull)influenceParams;
+               influenceParams:(NSArray<OSFocusInfluenceParam *> * _Nonnull)influenceParams
+                     onSuccess:(OSResultSuccessBlock _Nonnull)successBlock
+                     onFailure:(OSFailureBlock _Nonnull)failureBlock;
 
 @end

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.m

@@ -108,22 +108,24 @@ - (void)sendSessionEndOutcomes:(NSNumber * _Nonnull)timeElapsed
                          appId:(NSString * _Nonnull)appId
             pushSubscriptionId:(NSString * _Nonnull)pushSubscriptionId
                    onesignalId:(NSString * _Nonnull)onesignalId
-               influenceParams:(NSArray<OSFocusInfluenceParam *> * _Nonnull)influenceParams {
-    // Don't send influenced session with time < 1 seconds
-    if ([timeElapsed intValue] < 1) {
-        [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"sendSessionEndOutcomes not sending active time %@", timeElapsed]];
-        return;
-    }
-    // TODO: What to do onSuccess and onFailure
+               influenceParams:(NSArray<OSFocusInfluenceParam *> * _Nonnull)influenceParams
+                     onSuccess:(OSResultSuccessBlock _Nonnull)successBlock
+                     onFailure:(OSFailureBlock _Nonnull)failureBlock {
     [OneSignalClient.sharedClient executeRequest:[OSRequestSendSessionEndOutcomes
                                                   withActiveTime:timeElapsed
                                                   appId:appId
                                                   pushSubscriptionId:pushSubscriptionId
                                                   onesignalId:onesignalId
                                                   influenceParams:influenceParams] onSuccess:^(NSDictionary *result) {
-        [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"sendSessionEndOutcomes attributed succeed"];
+        [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes attributed succeed"];
+        if (successBlock) {
+            successBlock(result);
+        }
     } onFailure:^(NSError *error) {
-        [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"sendSessionEndOutcomes attributed failed"];
+        [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes attributed failed"];
+        if (failureBlock) {
+            failureBlock(error);
+        }
     }];
 }
 

iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m

@@ -30,7 +30,7 @@
 #import "OSAttributedFocusTimeProcessor.h"
 
 @interface OneSignal ()
-+ (BOOL)sendSessionEndOutcomes:(NSNumber*)totalTimeActive params:(OSFocusCallParams *)params;
++ (void)sendSessionEndOutcomes:(NSNumber*)totalTimeActive params:(OSFocusCallParams *)params onSuccess:(OSResultSuccessBlock _Nonnull)successBlock onFailure:(OSFailureBlock _Nonnull)failureBlock;
 @end
 
 @implementation OSAttributedFocusTimeProcessor {
@@ -73,6 +73,12 @@ - (void)sendUnsentActiveTime:(OSFocusCallParams *)params {
 }
 
 - (void)sendOnFocusCallWithParams:(OSFocusCallParams *)params totalTimeActive:(NSTimeInterval)totalTimeActive {
+    // Don't send influenced session with time < 1 seconds
+    if (totalTimeActive < 1) {
+        [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"sendSessionEndOutcomes not sending active time %f", totalTimeActive]];
+        return;
+    }
+    
     [OSBackgroundTaskManager beginBackgroundTask:ATTRIBUTED_FOCUS_TASK];
 
     if (params.onSessionEnded) {

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -698,26 +698,33 @@ + (UNMutableNotificationContent*)serviceExtensionTimeWillExpireRequest:(UNNotifi
  Start of outcome module
  */
 
-// Returns if we can send this, meaning we have a subscription_id and onesignal_id
-+ (BOOL)sendSessionEndOutcomes:(NSNumber*)totalTimeActive params:(OSFocusCallParams *)params {
++ (void)sendSessionEndOutcomes:(NSNumber*)totalTimeActive params:(OSFocusCallParams *)params onSuccess:(OSResultSuccessBlock _Nonnull)successBlock onFailure:(OSFailureBlock _Nonnull)failureBlock {
     if (![OSOutcomes sharedController]) {
         [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"Make sure OneSignal init is called first"];
-        return false;
+        if (failureBlock) {
+            failureBlock([NSError errorWithDomain:@"onesignal" code:0 userInfo:@{@"error" : @"Missing outcomes controller."}]);
+        }
+        return;
     }
 
     NSString* onesignalId = OneSignalUserManagerImpl.sharedInstance.onesignalId;
     NSString* pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId;
 
     if (!onesignalId || !pushSubscriptionId) {
-        return false;
+        if (failureBlock) {
+            failureBlock([NSError errorWithDomain:@"onesignal" code:0 userInfo:@{@"error" : @"Missing onesignalId or pushSubscriptionId."}]);
+        }
+        return;
+        
     }
 
     [OSOutcomes.sharedController sendSessionEndOutcomes:totalTimeActive
-                                                         appId:appId
-                                            pushSubscriptionId:pushSubscriptionId
-                                                   onesignalId:onesignalId
-                                               influenceParams:params.influenceParams];
-    return true;
+                                                  appId:appId
+                                     pushSubscriptionId:pushSubscriptionId
+                                            onesignalId:onesignalId
+                                        influenceParams:params.influenceParams
+                                              onSuccess:successBlock
+                                              onFailure:failureBlock];
 }
 
 @end