Release 4.4.0

Author: runner

Example/UnityAdsExample/SwiftFilePlaceholder.swift

@@ -0,0 +1 @@
+

Example/UnityAdsExample/ViewController.m

@@ -38,10 +38,16 @@ - (void)viewDidLoad {
         self.gameIdTextField.text = kDefaultGameId;
     }
 
-    self.interstitialPlacementId = @"video";
+    self.interstitialPlacementId = [defaults valueForKey:@"interstitialPlacementId"] ?:  @"video";
     self.rewardedPlacementId = @"rewardedVideo";
     self.bannerId = @"bannerads";
     self.testMode = YES;
+    
+    self.initializeButton.accessibilityIdentifier = @"InitializeButton";
+    self.gameIdTextField.accessibilityIdentifier = @"GameIDField";
+    self.interstitialLoadButton.accessibilityIdentifier = @"interstitialLoadButton";
+    self.interstitialShowButton.accessibilityIdentifier = @"interstitialShowButton";
+    
 } /* viewDidLoad */
 
 - (IBAction)doneEditingGameId: (id)sender {
@@ -157,6 +163,18 @@ - (void)unityAdsAdLoaded: (NSString *)placementId {
 
 - (void)unityAdsAdFailedToLoad: (NSString *)placementId withError: (UnityAdsLoadError)error withMessage: (NSString *)message {
     NSLog(@"UnityAds adFailedToLoad: %ld - %@", (long)error, message);
+    
+    UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"My Alert"
+                                   message:message
+                                   preferredStyle:UIAlertControllerStyleAlert];
+     
+    UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault
+       handler:^(UIAlertAction * action) {}];
+     
+    [alert addAction:defaultAction];
+    [self presentViewController:alert animated:YES completion:nil];
+    
+    
 }
 
 #pragma mark UnityAdsShowDelegate

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

@@ -25,7 +25,7 @@ + (UADSGMAScar *)facade {
 
 + (void)WebViewExposed_getVersion: (USRVWebViewCallback *)callback {
     [self sendAvailabilityMetrics];
-    
+
     [callback invoke: self.facade.sdkVersion, nil];
 }
 
@@ -125,13 +125,13 @@ + (void)sendEvent: (id<UADSWebViewEvent>)event {
 
 + (void)sendAvailabilityMetrics {
     if (self.facade.isGADExists) {
-        [self sendEvent:[GMAWebViewEvent newScarPresent]];
-        
+        [self sendEvent: [GMAWebViewEvent newScarPresent]];
+
         if (!self.facade.isGADSupported) {
-            [self sendEvent:[GMAWebViewEvent newScarUnsupported]];
+            [self sendEvent: [GMAWebViewEvent newScarUnsupported]];
         }
     } else {
-        [self sendEvent:[GMAWebViewEvent newScarNotPresent]];
+        [self sendEvent: [GMAWebViewEvent newScarNotPresent]];
     }
 }
 

SourceCode/Private/Ads/Api/UADSApiToken.m

@@ -30,11 +30,10 @@ + (void)WebViewExposed_setPeekMode: (NSNumber *)value callback: (USRVWebViewCall
 }
 
 + (void)WebViewExposed_getNativeGeneratedToken: (USRVWebViewCallback *)callback {
-    
-    [self.serviceProvider.nativeTokenGenerator getToken:^(UADSHeaderBiddingToken * _Nullable token) {
-            UADSWebViewEventBase *event = [UADSWebViewEventBase newWithCategory: kTokenCategoryName
-                                                                      withEvent: kTokenEventName
-                                                                     withParams: @[token.value]];
+    [self.serviceProvider.nativeTokenGenerator getToken:^(UADSHeaderBiddingToken *_Nullable token) {
+        UADSWebViewEventBase *event = [UADSWebViewEventBase newWithCategory: kTokenCategoryName
+                                                                  withEvent: kTokenEventName
+                                                                 withParams: @[token.value]];
         [self.webViewEventSender sendEvent: event];
     }];
     [callback invoke: nil];

SourceCode/Private/Core/Api/USRVApiCache.m

@@ -7,6 +7,7 @@
 #import "NSString+Hash.h"
 #import <AVFoundation/AVFoundation.h>
 #import "USRVApiRequest.h"
+#import "NSDictionary+Headers.h"
 
 NSString * USRVNSStringFromCacheError(UnityServicesCacheError error) {
     switch (error) {
@@ -55,7 +56,7 @@ + (void)WebViewExposed_download: (NSString *)url fileId: (NSString *)fileId head
 
     BOOL success = [USRVCacheQueue download: url
                                      target: [USRVApiCache fileIdToFilename: fileId]
-                                    headers: [USRVApiRequest getHeadersMap: headers]
+                                    headers: [NSDictionary uads_getHeadersMap: headers]
                                      append: [append boolValue]];
 
     if (!success) {

SourceCode/Private/Core/Api/USRVApiRequest.h

@@ -2,7 +2,4 @@
 
 @interface USRVApiRequest : NSObject
 
-+ (NSArray<NSArray<NSString *> *> *)getHeadersArray: (NSDictionary<NSString *, NSString *> *)headersMap;
-+ (NSDictionary<NSString *, NSArray *> *)getHeadersMap: (NSArray *)headers;
-
 @end

SourceCode/Private/Core/Api/USRVApiRequest.m

@@ -4,11 +4,25 @@
 #import "USRVWebViewApp.h"
 #import "USRVWebRequestError.h"
 #import "USRVWebRequestEvent.h"
+#import "UADSServiceProviderProxy.h"
+#import "NSMutableDictionary+SafeOperations.h"
+#import "UADSServiceProviderProxy.h"
+#import "UADSBaseOptions.h"
+#import "UADSCommonNetworkErrorProxy.h"
+#import "UADSCorePresenceChecker.h"
+#import "NSDictionary+Headers.h"
 
 @implementation USRVApiRequest
-
 static NSString *webRequestEventCategory = @"REQUEST";
 
++ (USRVWebViewApp *)eventSender {
+    return [USRVWebViewApp getCurrentApp];
+}
+
++ (void)WebViewExposed_supportsURLSession: (USRVWebViewCallback *)callback {
+    [callback invoke: [NSNumber numberWithBool: UADSCorePresenceChecker.isPresent], nil];
+}
+
 + (void)WebViewExposed_get: (NSString *)requestId url: (NSString *)url headers: (NSArray *)headers connectTimeout: (NSNumber *)connectTimeout callback: (USRVWebViewCallback *)callback {
     if (headers && headers.count == 0) {
         headers = NULL;
@@ -28,7 +42,7 @@ + (void)WebViewExposed_get: (NSString *)requestId url: (NSString *)url headers:
         }
     };
 
-    NSDictionary *mappedHeaders = [USRVApiRequest getHeadersMap: headers];
+    NSDictionary *mappedHeaders = [NSDictionary uads_getHeadersMap: headers];
 
     if (!mappedHeaders) {
         [callback error: USRVNSStringFromWebRequestError(kUnityServicesWebRequestErrorMappingHeadersFailed)
@@ -63,7 +77,7 @@ + (void)WebViewExposed_head: (NSString *)requestId url: (NSString *)url headers:
         }
     };
 
-    NSDictionary *mappedHeaders = [USRVApiRequest getHeadersMap: headers];
+    NSDictionary *mappedHeaders = [NSDictionary uads_getHeadersMap: headers];
 
     if (!mappedHeaders) {
         [callback error: USRVNSStringFromWebRequestError(kUnityServicesWebRequestErrorMappingHeadersFailed)
@@ -98,7 +112,7 @@ + (void)WebViewExposed_post: (NSString *)requestId url: (NSString *)url body: (N
         }
     };
 
-    NSDictionary *mappedHeaders = [USRVApiRequest getHeadersMap: headers];
+    NSDictionary *mappedHeaders = [NSDictionary uads_getHeadersMap: headers];
 
     if (!mappedHeaders) {
         [callback error: USRVNSStringFromWebRequestError(kUnityServicesWebRequestErrorMappingHeadersFailed)
@@ -120,54 +134,8 @@ + (void)WebViewExposed_setConcurrentRequestCount: (NSNumber *)count callback: (U
     [callback invoke: nil];
 }
 
-+ (NSDictionary<NSString *, NSArray *> *)getHeadersMap: (NSArray *)headers {
-    NSMutableDictionary *mappedHeaders = [[NSMutableDictionary alloc] init];
-
-    if (headers && headers.count > 0) {
-        for (int idx = 0; idx < headers.count; idx++) {
-            if (![[headers objectAtIndex: idx] isKindOfClass: [NSArray class]]) return NULL;
-
-            NSArray *header = [headers objectAtIndex: idx];
-
-            if ([header count] != 2) return NULL;
-
-            if (![[header objectAtIndex: 0] isKindOfClass: [NSString class]] || ![[header objectAtIndex: 1] isKindOfClass: [NSString class]]) {
-                return NULL;
-            }
-
-            NSString *headerKey = [header objectAtIndex: 0];
-            NSString *headerValue = [header objectAtIndex: 1];
-
-            if (headerKey.length < 1) return NULL;
-
-            NSMutableArray *valueList = [[NSMutableArray alloc] initWithArray: [mappedHeaders objectForKey: headerKey]];
-            [valueList addObject: headerValue];
-            [mappedHeaders setObject: valueList
-                              forKey: headerKey];
-        }
-    }
-
-    return mappedHeaders;
-} /* getHeadersMap */
-
-+ (NSArray<NSArray<NSString *> *> *)getHeadersArray: (NSDictionary<NSString *, NSString *> *)headersMap {
-    __block NSArray *headersArray = [NSArray array];
-
-    if (headersMap && headersMap.count > 0) {
-        @try {
-            [headersMap enumerateKeysAndObjectsUsingBlock: ^(NSString *_Nonnull key, NSString *_Nonnull obj, BOOL *_Nonnull stop) {
-                headersArray = [headersArray arrayByAddingObject: @[key, obj]];
-            }];
-        } @catch (id exception) {
-            return NULL;
-        }
-    }
-
-    return headersArray;
-}
-
 + (void)sendSuccess: (NSString *)requestId url: (NSString *)url response: (NSString *)response responseCode: (long)responseCode headers: (NSDictionary<NSString *, NSString *> *)headers {
-    NSArray<NSArray<NSString *> *> *responseHeaders = [USRVApiRequest getHeadersArray: headers];
+    NSArray<NSArray<NSString *> *> *responseHeaders = [NSDictionary uads_getHeadersArray: headers];
 
     if (!responseHeaders) {
         NSError *error = [NSError errorWithDomain: @"com.unity3d.ads.UnityServices.Error"
@@ -211,4 +179,35 @@ + (void)sendFailed: (NSString *)requestId url: (NSString *)url error: (NSError *
      nil];
 } /* sendFailed */
 
++ (void)sendResponseToWebView: (NSDictionary *)dictionary
+                     category: (UnityServicesWebRequestEvent)event {
+    [self.eventSender sendEvent: USRVNSStringFromWebRequestEvent(event)
+                       category: webRequestEventCategory
+                         param1: dictionary, nil];
+}
+
++ (void)WebViewExposed_sendRequest: (NSDictionary *)requestDictionary
+                          callback: (USRVWebViewCallback *)callback {
+    id errorCompletion = ^(NSDictionary *_Nonnull error) {
+        [self sendResponseToWebView: error
+                           category: kUnityServicesWebRequestEventFailed];
+    };
+
+    id successCompletion = ^(NSDictionary *_Nonnull response) {
+        [self sendResponseToWebView: response
+                           category: kUnityServicesWebRequestEventComplete];
+    };
+
+
+    [self.network sendRequestUsing: requestDictionary
+                 successCompletion: successCompletion
+                andErrorCompletion: errorCompletion];
+
+    [callback invoke: requestDictionary[@"id"] ? : @"", nil];
+}
+
++ (UADSCommonNetworkProxy *)network {
+    return [UADSServiceProviderProxy shared].mainNetworkLayer;
+}
+
 @end

SourceCode/Private/Core/Cache/USRVCacheOperation.m

@@ -6,6 +6,7 @@
 #import "USRVApiRequest.h"
 #import "USRVApiCache.h"
 #import "USRVWebRequestFactory.h"
+#import "NSDictionary+Headers.h"
 
 @implementation USRVCacheOperation
 
@@ -74,10 +75,10 @@ - (void)main {
 
     long long startTime = [[NSDate date] timeIntervalSince1970] * 1000;
 
-    self.request = [USRVWebRequestFactory create: self.source
-                                     requestType: @"GET"
-                                         headers: NULL
-                                  connectTimeout: self.connectTimeout];
+    self.request = [[USRVWebRequestFactory new] create: self.source
+                                           requestType: @"GET"
+                                               headers: NULL
+                                        connectTimeout: self.connectTimeout];
 
     if (self.append) {
         @try {
@@ -151,7 +152,7 @@ - (void)main {
                             [NSNumber numberWithLongLong: fileSize],
                             [NSNumber numberWithLongLong: weakSelf.expectedContentSize],
                             [NSNumber numberWithLong: responseCode],
-                            [USRVApiRequest getHeadersArray: responseHeaders],
+                            [NSDictionary uads_getHeadersArray: responseHeaders],
                             nil];
                        });
     }];
@@ -239,7 +240,7 @@ - (void)main {
              [NSNumber numberWithLongLong: self.expectedContentSize],
              [NSNumber numberWithLongLong: duration],
              [NSNumber numberWithLong: responseCode],
-             [USRVApiRequest getHeadersArray: responseHeaders],
+             [NSDictionary uads_getHeadersArray: responseHeaders],
              nil];
         });
     } else {
@@ -251,7 +252,7 @@ - (void)main {
              [NSNumber numberWithLongLong: self.expectedContentSize],
              [NSNumber numberWithLongLong: duration],
              [NSNumber numberWithLong: responseCode],
-             [USRVApiRequest getHeadersArray: responseHeaders],
+             [NSDictionary uads_getHeadersArray: responseHeaders],
              nil];
         });
     }

SourceCode/Private/Core/Categories/NSDictionary/NSDictionary+Filter.h

@@ -6,6 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSDictionary *)uads_filter: (BOOL(NS_NOESCAPE ^)(KeyType key, ObjectType obj))block;
 - (NSDictionary *)uads_mapKeys: (KeyType(NS_NOESCAPE ^)(KeyType key))block;
+- (NSDictionary *)uads_mapValues: (ObjectType(NS_NOESCAPE ^)(KeyType key, ObjectType obj))block;
 @end
 
 NS_ASSUME_NONNULL_END

SourceCode/Private/Core/Categories/NSDictionary/NSDictionary+Filter.m

@@ -23,4 +23,14 @@ - (NSDictionary *)uads_mapKeys: (id(NS_NOESCAPE ^)(id key))block {
     return newDictionary;
 }
 
+- (NSDictionary *)uads_mapValues: (id(NS_NOESCAPE ^)(id key, id obj))block {
+    NSMutableDictionary *newDictionary = [NSMutableDictionary new];
+
+    [self enumerateKeysAndObjectsUsingBlock:^(id _Nonnull key, id _Nonnull obj, BOOL *_Nonnull stop) {
+        newDictionary[key] = block(key, obj);
+    }];
+
+    return newDictionary;
+}
+
 @end