Release 2.3.0

Author: Unity Ads Travis

UnityAds/Api/UADSApiRequest.m

@@ -85,6 +85,11 @@ + (void)WebViewExposed_post:(NSString *)requestId url:(NSString *)url body:(NSSt
     [callback invoke:requestId, nil];
 }
 
++ (void)WebViewExposed_setConcurrentRequestCount: (int) count callback:(UADSWebViewCallback *)callback {
+    [UADSWebRequestQueue setConcurrentRequestCount: count];
+    [callback invoke:nil];
+}
+
 + (NSDictionary<NSString*,NSArray*> *)getHeadersMap:(NSArray *)headers {
     NSMutableDictionary *mappedHeaders = [[NSMutableDictionary alloc] init];
 

UnityAds/Properties/UADSSdkProperties.m

@@ -4,10 +4,10 @@
 NSString * const kUnityAdsLocalCacheFilePrefix = @"UnityAdsCache-";
 NSString * const kUnityAdsLocalStorageFilePrefix  = @"UnityAdsStorage-";
 NSString * const kUnityAdsWebviewBranchInfoDictionaryKey = @"UADSWebviewBranch";
-NSString * const kUnityAdsVersionName = @"2.2.1";
+NSString * const kUnityAdsVersionName = @"2.3.0";
 NSString * const kUnityAdsFlavorDebug = @"debug";
 NSString * const kUnityAdsFlavorRelease = @"release";
-int const kUnityAdsVersionCode = 2201;
+int const kUnityAdsVersionCode = 2300;
 
 @implementation UADSSdkProperties
 

UnityAds/Request/UADSWebRequestQueue.h

@@ -4,9 +4,10 @@
 @interface UADSWebRequestQueue : NSObject
 
 + (void)start;
++ (void)setConcurrentRequestCount: (int) count;
 + (void)requestUrl:(NSString *)url type:(NSString *)type headers:(NSDictionary<NSString*, NSArray*> *)headers body:(NSString *)body completeBlock:(UnityAdsWebRequestCompletion)completeBlock connectTimeout:(int)connectTimeout;
 + (void)requestUrl:(NSString *)url type:(NSString *)type headers:(NSDictionary<NSString*, NSArray*> *)headers completeBlock:(UnityAdsWebRequestCompletion)completeBlock connectTimeout:(int)connectTimeout;
 + (BOOL)resolve:(NSString *)host completeBlock:(UnityAdsResolveRequestCompletion)completeBlock;
 + (void)cancelAllOperations;
 
-@end
+@end

UnityAds/Request/UADSWebRequestQueue.m

@@ -22,6 +22,10 @@ + (void)start {
     });
 }
 
++ (void)setConcurrentRequestCount: (int) count {
+    requestQueue.maxConcurrentOperationCount = count;
+}
+
 + (void)requestUrl:(NSString *)url type:(NSString *)type headers:(NSDictionary<NSString*, NSArray*> *)headers completeBlock:(UnityAdsWebRequestCompletion)completeBlock connectTimeout:(int)connectTimeout {
     [UADSWebRequestQueue requestUrl:url type:type headers:headers body:NULL completeBlock:completeBlock connectTimeout:connectTimeout];
 }

UnityAds/UnityAds.m

@@ -112,7 +112,11 @@ + (void)initialize:(NSString *)gameId
 }
 
 + (void)show:(UIViewController *)viewController {
-    [UnityAds show:viewController placementId:[UADSPlacement getDefaultPlacement]];
+    if([UADSPlacement getDefaultPlacement]) {
+        [UnityAds show:viewController placementId:[UADSPlacement getDefaultPlacement]];
+    } else {
+        [self handleShowError:@"" unityAdsError:kUnityAdsErrorNotInitialized message:@"Unity Ads default placement is not initialized"];
+    }
 }
 
 + (void)show:(UIViewController *)viewController placementId:(NSString *)placementId {
@@ -135,10 +139,7 @@ + (void)show:(UIViewController *)viewController placementId:(NSString *)placemen
 
         [UADSWebViewMethodInvokeQueue addOperation:operation];
     } else {
-        if (!placementId) {
-            NSException *exception = [NSException exceptionWithName:@"IllegalArgumentException" reason:@"PlacementID is nil" userInfo:nil];
-            @throw exception;
-        } else if (![self isSupported]) {
+        if (![self isSupported]) {
             [self handleShowError:placementId unityAdsError:kUnityAdsErrorNotInitialized message:@"Unity Ads is not supported for this device"];
         } else if (![self isInitialized]) {
             [self handleShowError:placementId unityAdsError:kUnityAdsErrorNotInitialized message:@"Unity Ads is not initialized"];
@@ -203,14 +204,21 @@ + (BOOL)isInitialized {
 }
 
 + (void)handleShowError:(NSString *)placementId unityAdsError:(UnityAdsError)unityAdsError message:(NSString *)message {
-    NSString *errorMessage = [NSString stringWithFormat:@"Unity Ads show failed: %@", message];
-    UADSLogError(@"%@", errorMessage);
-    if ([self getDelegate] && [[self getDelegate]respondsToSelector:@selector(unityAdsDidError:withMessage:)]) {
-        [[self getDelegate] unityAdsDidError:unityAdsError withMessage:errorMessage];
-    }
-    if ([self getDelegate] && [[self getDelegate]respondsToSelector:@selector(unityAdsDidFinish:withFinishState:)]) {
-        [[self getDelegate] unityAdsDidFinish:placementId withFinishState:kUnityAdsFinishStateError];
-    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString *errorMessage = [NSString stringWithFormat:@"Unity Ads show failed: %@", message];
+        UADSLogError(@"%@", errorMessage);
+        if ([self getDelegate] && [[self getDelegate]respondsToSelector:@selector(unityAdsDidError:withMessage:)]) {
+            [[self getDelegate] unityAdsDidError:unityAdsError withMessage:errorMessage];
+        }
+
+        if ([self getDelegate] && [[self getDelegate]respondsToSelector:@selector(unityAdsDidFinish:withFinishState:)]) {
+            if (placementId) {
+                [[self getDelegate] unityAdsDidFinish:placementId withFinishState:kUnityAdsFinishStateError];
+            } else {
+                [[self getDelegate] unityAdsDidFinish:@"" withFinishState:kUnityAdsFinishStateError];
+            }
+        }
+    });
 }
 
 @end

UnityAds/WebView/Bridge/UADSWebViewShowOperation.m

@@ -19,16 +19,18 @@ - (void)main {
 
     if (!self.success) {
         UADSLogError(@"Unity Ads webapp timeout, shutting down Unity Ads");
-        id delegate = [UADSClientProperties getDelegate];
-        if (delegate) {
-            if ([delegate respondsToSelector:@selector(unityAdsDidError:withMessage:)]) {
-                [delegate unityAdsDidError:kUnityAdsErrorShowError withMessage:@"Webapp timeout, shutting down Unity Ads"];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            id delegate = [UADSClientProperties getDelegate];
+            if (delegate) {
+                if ([delegate respondsToSelector:@selector(unityAdsDidError:withMessage:)]) {
+                    [delegate unityAdsDidError:kUnityAdsErrorShowError withMessage:@"Webapp timeout, shutting down Unity Ads"];
+                }
+                if ([delegate respondsToSelector:@selector(unityAdsDidFinish:withFinishState:)]) {
+                    NSString *placementId = [self.parameters objectAtIndex:0];
+                    [delegate unityAdsDidFinish:placementId withFinishState:kUnityAdsFinishStateError];
+                }
             }
-            if ([delegate respondsToSelector:@selector(unityAdsDidFinish:withFinishState:)]) {
-                NSString *placementId = [self.parameters objectAtIndex:0];
-                [delegate unityAdsDidFinish:placementId withFinishState:kUnityAdsFinishStateError];
-            }
-        }
+        });
 
         [UADSInitialize reset];
     }