Release 4.6.0

Author: runner

SourceCode/Private/Ads/Api/UADSApiToken.m

@@ -1,7 +1,7 @@
 #import "UADSApiToken.h"
 #import "USRVWebViewCallback.h"
 #import "UADSTokenStorage.h"
-#import "UADSServiceProvider.h"
+#import "UADSServiceProviderContainer.h"
 #import "UADSWebViewEvent.h"
 
 NSString *const kTokenEventName = @"TOKEN_NATIVE_DATA";
@@ -44,7 +44,7 @@ + (void)WebViewExposed_getNativeGeneratedToken: (USRVWebViewCallback *)callback
 }
 
 + (UADSServiceProvider *)serviceProvider {
-    return UADSServiceProvider.sharedInstance;
+    return UADSServiceProviderContainer.sharedInstance.serviceProvider;
 }
 
 + (id<UADSWebViewEventSender>)webViewEventSender {

SourceCode/Private/Ads/Configuration/UADSAdsModuleConfiguration.m

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

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

@@ -24,9 +24,9 @@ typedef NSDictionary<NSString *, id<UADSAbstractModuleOperationObject> > UADSAbs
 + (void)setConfiguration: (USRVConfiguration *)config;
 + (USRVConfiguration *)                  configuration;
 
-- (void)executeForPlacement: (NSString *_Nonnull)placementId
-                withOptions: (id<UADSDictionaryConvertible>)options
-                andDelegate: (nullable id<UADSAbstractModuleDelegate>)delegate;
+- (NSString *)executeForPlacement: (NSString *_Nonnull)placementId
+                      withOptions: (id<UADSDictionaryConvertible>)options
+                      andDelegate: (nullable id<UADSAbstractModuleDelegate>)delegate;
 
 - (id<UADSAbstractModuleOperationObject>)createEventWithPlacementID: (NSString *)placementID
                                                         withOptions: (id<UADSDictionaryConvertible>)options

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

@@ -66,32 +66,33 @@ - (instancetype)init {
     return self;
 }
 
-- (void)executeForPlacement: (NSString *)placementId
-                withOptions: (id<UADSDictionaryConvertible>)options
-                andDelegate: (id<UADSAbstractModuleDelegate>)delegate {
+- (NSString *)executeForPlacement: (NSString *)placementId
+                      withOptions: (id<UADSDictionaryConvertible>)options
+                      andDelegate: (id<UADSAbstractModuleDelegate>)delegate {
     NSString *safePlacementID = placementId ? : kUADSAbstractModuleEmptyPlacementID;
-
+    
     UADSInternalError *error = [self executionErrorForPlacementID: safePlacementID];
-
+    
     if (error) {
         [self logErrorAndNotifyDelegate: delegate
                             errorParams: error
                          forPlacementID: safePlacementID];
-        return;
+        return @"";
     }
-
+    
     id<UADSAbstractModuleOperationObject> operation =  [self createEventWithPlacementID: safePlacementID
                                                                             withOptions: options
                                                                                   timer: [self.timerFactory timerWithAppLifeCycle]
                                                                            withDelegate: delegate];
-
+    
     [_eventHandler eventStarted: operation.id];
     [self saveOperation: operation];
-
-
+    
+    
     dispatch_async(_invokeQueue, ^{
         [self invokeOperation: operation];
     });
+    return operation.id;
 } /* executeForPlacement */
 
 - (NSInteger)operationOperationTimeoutMs {

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

@@ -31,6 +31,11 @@ - (nonnull NSString *)methodName {
     return nil;
 }
 
+- (nonnull NSString *)className {
+    NSAssert(NO, @"Cannot use abstract class");
+    return nil;
+}
+
 - (void)startListeningOperationTTLExpiration: (UADSVoidClosure)operationExpired {
     _operationExpired = operationExpired;
 

SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModule.h

@@ -0,0 +1,23 @@
+#import "UADSLoadModule.h"
+#import "UADSLoadOptions.h"
+#import "UADSBannerViewDelegate.h"
+#import "UnityAdsLoadError.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UADSBannerLoadModule : UADSLoadModule
+
+- (void)sendClickEventForListenerID:  (NSString *_Nonnull)listenerID;
+
+- (void)sendLeaveApplicationEventForListenerID:  (NSString *_Nonnull)listenerID;
+
+- (NSString *)loadForPlacementID: (NSString *)placementID
+                      bannerView: (UADSBannerView *)bannerView
+                         options: (UADSLoadOptions *)options
+                    loadDelegate: (nullable id<UADSBannerViewDelegate>)loadDelegate;
+
+- (UADSBannerView *)bannerViewWithID:(NSString *)bannerID;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModule.m

@@ -0,0 +1,93 @@
+#import "UADSBannerLoadModule.h"
+#import "WebViewInvokerQueueDecorator.h"
+#import "UADSBannerLoadModuleDelegateWrapper.h"
+#import "UADSBannerLoadModuleOperationObject.h"
+#import "USRVDevice.h"
+#import "UADSBannerLoadOptions.h"
+
+@implementation UADSBannerLoadModule
+
+typedef id<UADSWebViewInvoker> Invoker;
+
++ (instancetype)sharedInstance {
+    UADS_SHARED_INSTANCE(onceToken, ^{
+        return [self newSharedModule];
+    });
+}
+
++ (UADSEventHandlerType)moduleType {
+    return kUADSEventHandlerTypeBannerLoadModule;
+}
+
+- (id<UADSAbstractModuleOperationObject>)createEventWithPlacementID: (NSString *)placementID
+                                                        withOptions: (id<UADSDictionaryConvertible>)options
+                                                              timer: (id<UADSRepeatableTimer>)timer
+                                                       withDelegate: (id<UADSAbstractModuleDelegate>)delegate {
+    UADSBannerLoadModuleOperationObject *operation = [UADSBannerLoadModuleOperationObject new];
+
+    operation.placementID = placementID;
+    operation.options = options;
+    operation.delegate = delegate;
+    operation.ttl = -1;
+    operation.time = [USRVDevice getElapsedRealtime];    
+    operation.timer = timer;
+    return operation;
+}
+
+- (NSString *)loadForPlacementID: (NSString *)placementID
+                      bannerView: (nonnull UADSBannerView *)bannerView
+                         options: (UADSLoadOptions *)options
+                    loadDelegate: (nullable id<UADSBannerViewDelegate>)loadDelegate {
+    UADSBannerLoadModuleDelegateWrapper *wrappedDelegate = [UADSBannerLoadModuleDelegateWrapper newWithAdsDelegate: loadDelegate bannerView: bannerView];
+    UADSBannerLoadOptions *loadOptions = [UADSBannerLoadOptions newBannerLoadOptionsWith:options size:bannerView.size];
+    return [self executeForPlacement: placementID
+                         withOptions: loadOptions
+                         andDelegate: wrappedDelegate];
+}
+
+- (void)sendAdLoadedForPlacementID:(NSString *)placementID andListenerID:(NSString *)listenerID {
+    [self handleSuccess: listenerID];
+    UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForID: listenerID];
+
+    [delegate bannerViewDidLoad: nil];
+}
+
+- (void)sendClickEventForListenerID:  (NSString *_Nonnull)listenerID {
+    UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForID: listenerID];
+
+    [delegate bannerViewDidClick:nil];
+}
+
+- (void)sendLeaveApplicationEventForListenerID:  (NSString *_Nonnull)listenerID {
+    UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForID: listenerID];
+
+    [delegate bannerViewDidLeaveApplication:nil];
+}
+
+- (void)sendAdFailedToLoadForPlacementID:(NSString *)placementID listenerID:(NSString *)listenerID message:(NSString *)message error:(UnityAdsLoadError)error {
+    UADSInternalError *internalError = [UADSInternalError newWithErrorCode: kUADSInternalErrorLoadModule
+                                                                 andReason: error
+                                                                andMessage: message];
+
+    [self catchError: internalError
+               forId: listenerID];
+    UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForIDAndRemove: listenerID];
+
+    [delegate didFailWithError: internalError forPlacementID: @""];
+}
+
+- (UADSBannerLoadModuleDelegateWrapper *)getDelegateForIDAndRemove: (NSString *)listenerID {
+    return (UADSBannerLoadModuleDelegateWrapper *)[super getDelegateForIDAndRemove: listenerID];
+}
+
+- (UADSBannerView *)bannerViewWithID:(NSString *)bannerID {
+    UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForID: bannerID];
+    return delegate.bannerView;
+    
+}
+
+- (UADSBannerLoadModuleDelegateWrapper *)getDelegateForID: (NSString*)listenerID {
+    return (UADSBannerLoadModuleDelegateWrapper*)[super getOperationWithID: listenerID].delegate;
+}
+
+@end

SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleDelegateWrapper.h

@@ -0,0 +1,12 @@
+#import "UADSAbstractModuleDelegate.h"
+#import "UADSBannerViewDelegate.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UADSBannerLoadModuleDelegateWrapper : NSObject<UADSBannerViewDelegate, UADSAbstractModuleDelegate>
++ (instancetype)newWithAdsDelegate: (id<UADSBannerViewDelegate>)decorated bannerView:(UADSBannerView *)bannerView;
+
+@property (nonatomic, weak, readonly) UADSBannerView *bannerView;
+@end
+
+NS_ASSUME_NONNULL_END

SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleDelegateWrapper.m

@@ -0,0 +1,70 @@
+#import "UADSBannerLoadModuleDelegateWrapper.h"
+
+@interface UADSBannerLoadModuleDelegateWrapper()
+@property (nonatomic, strong) id<UADSBannerViewDelegate>decorated;
+@property (nonatomic, weak) UADSBannerView *bannerView;
+@property (nonatomic, copy) NSString *uuidString;
+@end
+
+@implementation UADSBannerLoadModuleDelegateWrapper
+
++ (instancetype)newWithAdsDelegate: (id<UADSBannerViewDelegate>)decorated bannerView:(nonnull UADSBannerView *)bannerView {
+    UADSBannerLoadModuleDelegateWrapper *wrapper = [UADSBannerLoadModuleDelegateWrapper new];
+    wrapper.uuidString = [NSUUID new].UUIDString;
+    wrapper.decorated = decorated;
+    wrapper.bannerView = bannerView;
+    return wrapper;
+}
+
+- (void)didFailWithError:(UADSInternalError * _Nonnull)error forPlacementID:(NSString * _Nonnull)placementID {
+    UADSBannerError *bannerError = [[UADSBannerError alloc] initWithCode: [self convertIntoPublicError:error]
+                                                                userInfo: @{ NSLocalizedDescriptionKey: error.errorMessage }];
+    [self bannerViewDidError: self.bannerView
+                       error: bannerError];
+}
+
+- (void)bannerViewDidLoad: (UADSBannerView *)bannerView {
+    dispatch_on_main( ^{
+        [self.decorated bannerViewDidLoad: self.bannerView];
+    });
+}
+
+- (void)bannerViewDidClick: (UADSBannerView *)bannerView {
+    dispatch_on_main( ^{
+        [self.decorated bannerViewDidClick: self.bannerView];
+    });
+}
+
+- (void)bannerViewDidLeaveApplication: (UADSBannerView *)bannerView {
+    dispatch_on_main( ^{
+        [self.decorated bannerViewDidLeaveApplication: self.bannerView];
+    });
+}
+
+- (void)bannerViewDidError: (UADSBannerView *)bannerView error: (UADSBannerError *)error {
+    dispatch_on_main( ^{
+        [self.decorated bannerViewDidError: self.bannerView error: error];
+    });
+}
+
+- (UADSBannerErrorCode)convertIntoPublicError: (UADSInternalError *)error {
+    if (error.errorCode == kUADSInternalErrorAbstractModule && error.reasonCode == kUADSInternalErrorAbstractModuleTimeout) {
+        return UADSBannerErrorCodeNativeError;
+    }
+
+    if (error.errorCode == kUADSInternalErrorWebView && error.reasonCode == kUADSInternalErrorWebViewInternal) {
+        return UADSBannerErrorCodeWebViewError;
+    }
+
+    if (error.errorCode == kUADSInternalErrorWebView && error.reasonCode == kUADSInternalErrorWebViewSDKNotInitialized) {
+        return UADSBannerErrorInitializeFailed;
+    }
+
+    if (error.errorCode == kUADSInternalErrorAbstractModule && error.reasonCode == kUADSInternalErrorAbstractModuleEmptyPlacementID) {
+        return UADSBannerErrorInvalidArgument;
+    }
+
+    return error.reasonCode;
+}
+
+@end

SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleOperationObject.h

@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+#import "UADSAbstractModuleOperationBasicObject.h"
+#import "UADSBannerView.h"
+NS_ASSUME_NONNULL_BEGIN
+
+static NSString *const kUADSBannerWidth = @"width";
+static NSString *const kUADSBannerHeight = @"height";
+
+@interface UADSBannerLoadModuleOperationObject : UADSAbstractModuleOperationBasicObject
+@end
+
+NS_ASSUME_NONNULL_END