Release

Author: runner

Example/UnityAdsExample/ViewController.m

@@ -1,5 +1,5 @@
 #import "ViewController.h"
-
+#import "USRVDeviceLog.h"
 static NSString *const kDefaultGameId = @"14850";
 static NSString *const kGameIdKey = @"adsExampleAppGameId";
 
@@ -66,11 +66,12 @@ - (IBAction)initializeButtonTapped: (id)sender {
     self.gameIdTextField.enabled = NO;
     self.testModeSwitch.enabled = NO;
 
-    [UnityAds setDebugMode: true];
-
+    [UnityAds setDebugMode: false];
+    [USRVDeviceLog setLogLevel: -1];
     [UnityAds initialize: gameId
                       testMode: self.testMode
         initializationDelegate: self];
+    [USRVDeviceLog setLogLevel: -1];
 } /* initializeButtonTapped */
 
 - (IBAction)interstitialLoadButtonTapped: (id)sender {
@@ -116,6 +117,20 @@ - (IBAction)bannerButtonTapped: (id)sender {
     }
 }
 
+- (void)enableLoad: (BOOL)loadEnabled show: (BOOL)showEnabled forPlacementId: (NSString *)placementId {
+    if ([placementId isEqualToString: self.interstitialPlacementId]) {
+        [self toggleButtons: @[self.interstitialShowButton]
+                    enabled: showEnabled];
+        [self toggleButtons: @[self.interstitialLoadButton]
+                    enabled: loadEnabled];
+    } else if ([placementId isEqualToString: self.rewardedPlacementId]) {
+        [self toggleButtons: @[self.rewardedShowButton]
+                    enabled: showEnabled];
+        [self toggleButtons: @[self.rewardedLoadButton]
+                    enabled: loadEnabled];
+    }
+}
+
 #pragma mark UnityAdsInitializationDelegate
 
 - (void)initializationComplete {
@@ -135,17 +150,9 @@ - (void)initializationFailed: (UnityAdsInitializationError)error
 - (void)unityAdsAdLoaded: (NSString *)placementId {
     NSLog(@"UnityAds adLoaded");
 
-    if ([placementId isEqualToString: self.interstitialPlacementId]) {
-        [self toggleButtons: @[self.interstitialShowButton]
-                    enabled: YES];
-        [self toggleButtons: @[self.interstitialLoadButton]
-                    enabled: NO];
-    } else if ([placementId isEqualToString: self.rewardedPlacementId]) {
-        [self toggleButtons: @[self.rewardedShowButton]
-                    enabled: YES];
-        [self toggleButtons: @[self.rewardedLoadButton]
-                    enabled: NO];
-    }
+    [self   enableLoad: NO
+                  show: YES
+        forPlacementId: placementId];
 }
 
 - (void)unityAdsAdFailedToLoad: (NSString *)placementId withError: (UnityAdsLoadError)error withMessage: (NSString *)message {
@@ -156,21 +163,17 @@ - (void)unityAdsAdFailedToLoad: (NSString *)placementId withError: (UnityAdsLoad
 - (void)unityAdsShowComplete: (NSString *)placementId withFinishState: (UnityAdsShowCompletionState)state {
     NSLog(@"UnityAds showComplete %@ %ld", placementId, state);
 
-    if ([placementId isEqualToString: self.interstitialPlacementId]) {
-        [self toggleButtons: @[self.interstitialShowButton]
-                    enabled: NO];
-        [self toggleButtons: @[self.interstitialLoadButton]
-                    enabled: YES];
-    } else if ([placementId isEqualToString: self.rewardedPlacementId]) {
-        [self toggleButtons: @[self.rewardedShowButton]
-                    enabled: NO];
-        [self toggleButtons: @[self.rewardedLoadButton]
-                    enabled: YES];
-    }
+    [self   enableLoad: YES
+                  show: NO
+        forPlacementId: placementId];
 }
 
-- (void)unityAdsShowFailed: (NSString *)adUnitId withError: (UnityAdsShowError)error withMessage: (NSString *)message {
+- (void)unityAdsShowFailed: (NSString *)placementId withError: (UnityAdsShowError)error withMessage: (NSString *)message {
     NSLog(@"UnityAds showFailed %@ %ld", message, error);
+
+    [self   enableLoad: YES
+                  show: NO
+        forPlacementId: placementId];
 }
 
 - (void)unityAdsShowStart: (NSString *)adUnitId {

SourceCode/Private/AR/Configuration/UADSARModuleConfiguration.m

@@ -16,7 +16,7 @@ - (BOOL)initModuleState: (USRVConfiguration *)configuration {
     return true;
 }
 
-- (BOOL)initErrorState: (USRVConfiguration *)configuration state: (NSString *)state message: (NSString *)message {
+- (BOOL)initErrorState: (USRVConfiguration *)configuration code: (UADSErrorState)stateCode message: (NSString *)message {
     return true;
 }
 

SourceCode/Private/Ads/Api/UADSApiGMAScar/UADSApiGMAScar.m

@@ -24,6 +24,8 @@ + (UADSGMAScar *)facade {
 }
 
 + (void)WebViewExposed_getVersion: (USRVWebViewCallback *)callback {
+    [self sendAvailabilityMetrics];
+    
     [callback invoke: self.facade.sdkVersion, nil];
 }
 
@@ -121,4 +123,16 @@ + (void)sendEvent: (id<UADSWebViewEvent>)event {
     [self.eventSender sendEvent: event];
 }
 
++ (void)sendAvailabilityMetrics {
+    if (self.facade.isGADExists) {
+        [self sendEvent:[GMAWebViewEvent newScarPresent]];
+        
+        if (!self.facade.isGADSupported) {
+            [self sendEvent:[GMAWebViewEvent newScarUnsupported]];
+        }
+    } else {
+        [self sendEvent:[GMAWebViewEvent newScarNotPresent]];
+    }
+}
+
 @end

SourceCode/Private/Ads/Api/UADSApiToken.h

@@ -1,2 +1,4 @@
+#import "USRVWebViewCallback.h"
 @interface UADSApiToken : NSObject
++ (void)WebViewExposed_getNativeGeneratedToken: (USRVWebViewCallback *)callback;
 @end

SourceCode/Private/Ads/Api/UADSApiToken.m

@@ -1,7 +1,11 @@
 #import "UADSApiToken.h"
 #import "USRVWebViewCallback.h"
 #import "UADSTokenStorage.h"
-#import "UADSHeaderBiddingTokenReaderBuilder.h"
+#import "UADSServiceProvider.h"
+#import "UADSWebViewEvent.h"
+
+NSString *const kTokenEventName = @"TOKEN_NATIVE_DATA";
+NSString *const kTokenCategoryName = @"TOKEN";
 
 @implementation UADSApiToken
 
@@ -25,8 +29,27 @@ + (void)WebViewExposed_setPeekMode: (NSNumber *)value callback: (USRVWebViewCall
     [callback invoke: nil];
 }
 
++ (void)WebViewExposed_getNativeGeneratedToken: (USRVWebViewCallback *)callback {
+    
+    [self.serviceProvider.nativeTokenGenerator getToken:^(UADSHeaderBiddingToken * _Nullable token) {
+            UADSWebViewEventBase *event = [UADSWebViewEventBase newWithCategory: kTokenCategoryName
+                                                                      withEvent: kTokenEventName
+                                                                     withParams: @[token.value]];
+        [self.webViewEventSender sendEvent: event];
+    }];
+    [callback invoke: nil];
+}
+
 + (id<UADSHeaderBiddingTokenCRUD>)tokenStorage {
-    return UADSHeaderBiddingTokenReaderBuilder.sharedInstance.defaultReader;
+    return self.serviceProvider.hbTokenReader;
+}
+
++ (UADSServiceProvider *)serviceProvider {
+    return UADSServiceProvider.sharedInstance;
+}
+
++ (id<UADSWebViewEventSender>)webViewEventSender {
+    return self.serviceProvider.webViewEventSender;
 }
 
 @end

SourceCode/Private/Ads/Configuration/UADSAdsModuleConfiguration.m

@@ -2,8 +2,7 @@
 #import "UADSWebViewShowOperation.H"
 #import "UADSTokenStorage.h"
 #import "UADSAbstractModule.h"
-#import "UADSHeaderBiddingTokenReaderBuilder.h"
-
+#import "UADSServiceProvider.h"
 @implementation UADSAdsModuleConfiguration
 
 - (NSArray<NSString *> *)getWebAppApiClassList {
@@ -21,7 +20,7 @@ @implementation UADSAdsModuleConfiguration
 
 - (BOOL)resetState: (USRVConfiguration *)configuration {
     [self setConfigurationToRequiredModules: configuration];
-    [[UADSTokenStorage sharedInstance] deleteTokens];
+    [UADSServiceProvider.sharedInstance.hbTokenReader deleteTokens];
     return true;
 }
 
@@ -30,9 +29,9 @@ - (BOOL)initModuleState: (USRVConfiguration *)configuration {
     return true;
 }
 
-- (BOOL)initErrorState: (USRVConfiguration *)configuration state: (NSString *)state message: (NSString *)message {
-    [UADSHeaderBiddingTokenReaderBuilder.sharedInstance.defaultReader setInitToken: nil];
-    [UADSHeaderBiddingTokenReaderBuilder.sharedInstance.defaultReader deleteTokens];
+- (BOOL)initErrorState: (USRVConfiguration *)configuration code: (UADSErrorState)stateCode message: (NSString *)message {
+    [UADSServiceProvider.sharedInstance.hbTokenReader setInitToken: nil];
+    [UADSServiceProvider.sharedInstance.hbTokenReader deleteTokens];
 
     return true;
 }

SourceCode/Private/Ads/Load/UADSAbstractModule/UADSAbstractModule.h

@@ -4,7 +4,8 @@
 #import <UIKit/UIKit.h>
 #import "UADSWebViewInvoker.h"
 #import "UADSAbstractModuleOperationBasicObject.h"
-#import "UADSInternalErrorLogger.h"
+#import "UADSTimerFactory.h"
+#import "UADSEventHandler.h"
 NS_ASSUME_NONNULL_BEGIN
 
 static NSString *const kUnityAdsNotSupportedMessage = @"Unity Ads is not supported for this device";
@@ -16,7 +17,8 @@ typedef NSDictionary<NSString *, id<UADSAbstractModuleOperationObject> > UADSAbs
 // Contains common initialization flow for sharedInstances.
 + (instancetype)newSharedModule;
 + (instancetype) newWithInvoker: (id<UADSWebViewInvoker>)invoker
-                andErrorHandler: (id<UADSInternalErrorHandler>)errorHandler;
+                andEventHandler: (id<UADSEventHandler>)eventHandler
+                   timerFactory: (id<UADSTimerFactory>)timerFactory;
 + (instancetype)                         createDefaultModule;
 + (instancetype)                         sharedInstance;
 + (void)setConfiguration: (USRVConfiguration *)config;
@@ -28,6 +30,7 @@ typedef NSDictionary<NSString *, id<UADSAbstractModuleOperationObject> > UADSAbs
 
 - (id<UADSAbstractModuleOperationObject>)createEventWithPlacementID: (NSString *)placementID
                                                         withOptions: (id<UADSDictionaryConvertible>)options
+                                                              timer: (id<UADSRepeatableTimer>)timer
                                                        withDelegate: (id<UADSAbstractModuleDelegate>)delegate;
 
 - (UADSInternalError *_Nullable)executionErrorForPlacementID: (NSString *)placementID;
@@ -37,6 +40,8 @@ typedef NSDictionary<NSString *, id<UADSAbstractModuleOperationObject> > UADSAbs
 - (_Nullable id)getDelegateForIDAndRemove: (NSString *)listenerID;
 - (NSInteger)                            operationOperationTimeoutMs;
 - (id<UADSAbstractModuleOperationObject>)getOperationWithID: (NSString *)operationID;
+- (void)handleSuccess: (NSString *)operationID;
+- (void)catchError: (UADSInternalError *)error forId: (NSString *)operationID;
 @end
 
 NS_ASSUME_NONNULL_END

SourceCode/Private/Ads/Load/UADSAbstractModule/UADSAbstractModule.m

@@ -1,6 +1,6 @@
 #import "UADSAbstractModule.h"
 #import "USRVConfiguration.h"
-#import "NSMutableDictionary + SafeRemoval.h"
+#import "NSMutableDictionary+SafeRemoval.h"
 
 static NSString *const kUADSOperationExpirationMessage = @"%@ method timeout after %li for listener ID %@";
 static NSString *const kUADSAbstractModuleErrorMessage = @"UADSAbstractModule cannot continue with the empty placement ID";
@@ -13,17 +13,20 @@ @interface UADSAbstractModule ()
 @property (nonatomic, strong) dispatch_queue_t synchronizedQueue;
 @property (nonatomic, strong) dispatch_queue_t invokeQueue;
 @property (nonatomic, strong) id<UADSWebViewInvoker> invoker;
-@property (nonatomic, strong) id<UADSInternalErrorHandler> errorHandler;
+@property (nonatomic, strong) id<UADSTimerFactory> timerFactory;
+@property (nonatomic, strong) id<UADSEventHandler> eventHandler;
 @end
 
 @implementation UADSAbstractModule
 
 + (instancetype)newWithInvoker: (id<UADSWebViewInvoker>)invoker
-               andErrorHandler: (id<UADSInternalErrorHandler>)errorHandler {
+               andEventHandler: (id<UADSEventHandler>)eventHandler
+                  timerFactory: (id<UADSTimerFactory>)timerFactory {
     UADSAbstractModule *module = [self new];
 
     module.invoker = invoker;
-    module.errorHandler = errorHandler;
+    module.eventHandler = eventHandler;
+    module.timerFactory = timerFactory;
     return module;
 }
 
@@ -79,8 +82,10 @@ - (void)executeForPlacement: (NSString *)placementId
 
     id<UADSAbstractModuleOperationObject> operation =  [self createEventWithPlacementID: safePlacementID
                                                                             withOptions: options
+                                                                                  timer: [self.timerFactory timerWithAppLifeCycle]
                                                                            withDelegate: delegate];
 
+    [_eventHandler eventStarted: operation.id];
     [self saveOperation: operation];
 
 
@@ -105,15 +110,31 @@ - (UADSInternalError *_Nullable)executionErrorForPlacementID: (NSString *)placem
 
 - (id<UADSAbstractModuleOperationObject>)createEventWithPlacementID: (NSString *)placementID
                                                         withOptions: (id<UADSDictionaryConvertible>)options
+                                                              timer: (id<UADSRepeatableTimer>)timer
                                                        withDelegate: (id<UADSAbstractModuleDelegate>)delegate {
     NSAssert(NO, @"Cannot use abstract class");
     return nil;
 }
 
+- (void)handleSuccess: (NSString *)operationID {
+    [self.eventHandler onSuccess: operationID];
+}
+
+- (void)catchError: (UADSInternalError *)error forId: (nonnull NSString *)operationID {
+    [self.eventHandler catchError: error
+                            forId: operationID];
+}
+
 - (void)logErrorAndNotifyDelegate: (id<UADSAbstractModuleDelegate>)delegate
                       errorParams: (UADSInternalError *)error
                    forPlacementID: (NSString *)placementID {
-    [_errorHandler catchError: error];
+    // Send both start and failure metrics to align total number of calls.
+    NSString *failedId = [NSUUID UUID].UUIDString;
+
+    [_eventHandler eventStarted: failedId];
+    [self catchError: error
+               forId: failedId];
+
     [delegate didFailWithError: error
                 forPlacementID: placementID];
 }
@@ -179,7 +200,8 @@ - (void)notifyDelegateWithInternalError: (UADSInternalError *_Nullable)error
     id<UADSAbstractModuleOperationObject> operation = [self getOperationWithID: operationID];
 
     GUARD(operation);
-    [_errorHandler catchError: error];
+    [self catchError: error
+               forId: operationID];
     [operation.delegate didFailWithError: error
                           forPlacementID: operation.placementID];
 }

SourceCode/Private/Ads/Load/UADSAbstractModule/UADSAbstractModuleBasicState/UADSAbstractModuleOperationBasicObject.h

@@ -1,5 +1,6 @@
 #import "UADSWebViewInvoker.h"
 #import "UADSAbstractModuleDelegate.h"
+#import "UADSTimer.h"
 NS_ASSUME_NONNULL_BEGIN
 
 static NSString *const kUADSPlacementIDKey = @"placementId";
@@ -19,6 +20,7 @@ static NSString *const kUADSOptionsDictionaryKey = @"options";
 @property (nonatomic, copy) NSString *placementID;
 @property (nonatomic, strong) NSNumber *time;
 @property (nonatomic, strong) id<UADSDictionaryConvertible> options;
+@property (nonatomic, strong, nullable) id<UADSRepeatableTimer> timer;
 @property (nonatomic, strong) id<UADSAbstractModuleDelegate> delegate;
 @property (nonatomic, assign) NSInteger ttl;
 - (void)                          stopTTLObserving;

SourceCode/Private/Ads/Load/UADSAbstractModule/UADSAbstractModuleBasicState/UADSAbstractModuleOperationBasicObject.m

@@ -41,9 +41,11 @@ - (void)startListeningOperationTTLExpiration: (UADSVoidClosure)operationExpired
 
 - (void)startTimer {
     __weak typeof(self) weakSelf = self;
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, _ttl * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-        [weakSelf signalExpiration];
-    });
+    [self.timer scheduleWithTimeInterval: _ttl
+                             repeatCount: 1
+                                   block:^(NSInteger index) {
+                                       [weakSelf signalExpiration];
+                                   }];
 }
 
 - (void)signalExpiration {
@@ -53,6 +55,8 @@ - (void)signalExpiration {
 }
 
 - (void)stopTTLObserving {
+    [self.timer invalidate];
+    self.timer = nil;
     _operationExpired = nil;
 }