Release 4.7.0

Author: runner

LICENSE

@@ -1,4 +1,4 @@
-Unity Advertisements copyright © 2022 Unity Technologies.
+Unity Advertisements copyright © 2023 Unity Technologies.
 This software is subject to, and made available under, the terms of service for Operate Solutions (see https://unity3d.com/legal/one-operate-services-terms-of-service), and is an "Operate Service" as defined therein.
 
 Your use of the Services constitutes your acceptance of such terms. Unless expressly provided otherwise, the software under this license is made available strictly on an "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the terms of service for details on these and other terms and conditions.

SourceCode/Private/Core/Api/USRVApiSdk.h

@@ -7,6 +7,5 @@ typedef NS_ENUM (NSInteger, USRVDownloadLatestWebViewStatus) {
     kDownloadLatestWebViewStatusMissingLatestConfig,
     kDownloadLatestWebViewStatusBackgroundDownloadStarted
 };
-+ (void)setServiceProviderForTesting: (id)sProvider;
-+ (void)WebViewExposed_getTrrData: (USRVWebViewCallback *)callback;
++ (void)WebViewExposed_getTrrData: (nonnull USRVWebViewCallback *)callback;
 @end

SourceCode/Private/Core/Api/USRVApiSdk.m

@@ -7,17 +7,8 @@
 #import "USRVDevice.h"
 #import "UADSServiceProviderContainer.h"
 
-static UADSServiceProvider* serviceProvider;
 @implementation USRVApiSdk
 
-+ (void)load {
-    serviceProvider = UADSServiceProviderContainer.sharedInstance.serviceProvider;
-}
-
-+ (void)setServiceProviderForTesting: (UADSServiceProvider*)sProvider {
-    serviceProvider = sProvider;
-}
-
 + (void)WebViewExposed_loadComplete: (USRVWebViewCallback *)callback {
     USRVLogDebug(@"Web application loaded");
     [[USRVWebViewApp getCurrentApp] setWebAppLoaded: true];
@@ -114,11 +105,11 @@ + (NSString *)privacyState {
 }
 
 + (void)WebViewExposed_getTrrData: (USRVWebViewCallback *)callback {
-    [callback invoke: serviceProvider.configurationStorage.getCurrentConfiguration.originalJSON, nil];
+    [callback invoke: UADSServiceProviderContainer.sharedInstance.serviceProvider.configurationStorage.getCurrentConfiguration.originalJSON, nil];
 }
 
 + (void)WebViewExposed_getSharedSessionID:(USRVWebViewCallback *)callback {
-    [callback invoke: serviceProvider.sharedSessionId];
+    [callback invoke: UADSServiceProviderContainer.sharedInstance.serviceProvider.sharedSessionId];
 }
 
 @end

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/Decorators/UADSConfigurationLoaderWithPrivacy.m

@@ -1,9 +1,11 @@
 #import "UADSConfigurationLoaderWithPrivacy.h"
+#import "UADSErrorState.h"
 
 @interface UADSConfigurationLoaderWithPrivacy ()
 @property (nonatomic, strong) id<UADSConfigurationLoader>original;
 @property (nonatomic, strong) id<UADSPrivacyLoader>privacyLoader;
 @property (nonatomic, strong) id<UADSPrivacyResponseSaver, UADSPrivacyResponseReader>responseStorage;
+@property (nonatomic, strong) NSArray<NSNumber*> *fastFailCodes;
 @end
 
 @implementation UADSConfigurationLoaderWithPrivacy
@@ -17,6 +19,7 @@ + (instancetype)newWithOriginal: (id<UADSConfigurationLoader>)original
     decorator.original = original;
     decorator.privacyLoader = privacyLoader;
     decorator.responseStorage = responseStorage;
+    decorator.fastFailCodes = @[@(kPrivacyGameIdDisabledCode)];
     return decorator;
 }
 
@@ -72,7 +75,7 @@ - (void)processPrivacyError: (id<UADSError>)privacyError
 }
 
 - (BOOL)shouldProceedWithTheCallForError: (id<UADSError>)error {
-    return error.errorDomain == kPrivacyLoaderErrorDomain;
+    return error.errorDomain == kPrivacyLoaderErrorDomain && ![_fastFailCodes containsObject: error.errorCode];
 }
 
 @end

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/PrivacyLoader/UADSInitializationResponse.h

@@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) NSDictionary *originalJSON;
 @property (nonatomic, assign) long responseCode;
 @property (nonatomic, assign) BOOL allowTracking;
+@property (nonatomic, assign) BOOL shouldSendNonBehavioural;
 
 + (instancetype)newFromDictionary: (NSDictionary *)dictionary;
 

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/PrivacyLoader/UADSInitializationResponse.m

@@ -40,6 +40,7 @@ + (instancetype)newFromDictionary: (NSDictionary *)dictionary {
     response.originalJSON = dictionary;
 
     response.allowTracking = [dictionary[@"pas"] boolValue] ? : false;
+    response.shouldSendNonBehavioural = [dictionary[@"snb"] boolValue] ?: false;
     return response;
 }
 

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/PrivacyLoader/UADSPrivacyLoader.h

@@ -2,6 +2,8 @@
 #import "UADSInitializationResponse.h"
 #import "UADSGenericCompletion.h"
 #import "USRVInitializationRequestFactory.h"
+#import "UADSErrorState.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^UADSPrivacyCompletion)(UADSInitializationResponse *);
@@ -32,6 +34,11 @@ extern NSString *const kPrivacyLoaderErrorDomain;
                                code: kUADSPrivacyLoaderInvalidResponseCode \
                            userInfo: nil] \
 
+#define uads_privacyGameDisabledError \
+    [[NSError alloc] initWithDomain: kPrivacyLoaderErrorDomain \
+                               code: kPrivacyGameIdDisabledCode \
+                           userInfo: nil] \
+
 @protocol UADSPrivacyLoader <NSObject>
 - (void)loadPrivacyWithSuccess: (UADSPrivacyCompletion)success
             andErrorCompletion: (UADSErrorCompletion)errorCompletion;

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/PrivacyLoader/UADSPrivacyLoader.m

@@ -68,6 +68,10 @@ - (void)makePrivacyRequestWithSuccess: (nonnull UADSPrivacyCompletion)success
     }
 
     if (![request is2XXResponse]) {
+        if (request.responseCode == 423) {
+            errorCompletion(uads_privacyGameDisabledError);
+            return;
+        }
         errorCompletion(uads_privacyInvalidResponseCodeError);
         return;
     }

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/PrivacyLoader/UADSPrivacyStorage.h

@@ -21,6 +21,7 @@ NSString * uads_privacyResponseStateToString(UADSPrivacyResponseState);
 @protocol UADSPrivacyResponseReader <NSObject>
 
 - (UADSPrivacyResponseState)responseState;
+- (BOOL)shouldSendUserNonBehavioral;
 
 @end
 

SourceCode/Private/Core/Configuration/SDKConfigurationReader/ConfigurationLoader/PrivacyLoader/UADSPrivacyStorage.m

@@ -34,6 +34,10 @@ - (void)saveResponse: (nonnull UADSInitializationResponse *)response {
     [self.mediator notifyObserversWithObjectAndRemove: response];
 }
 
+- (BOOL)shouldSendUserNonBehavioral {
+    return self.response.shouldSendNonBehavioural;
+}
+
 - (UADSPrivacyResponseState)responseState {
     if (!self.response) {
         return kUADSPrivacyResponseUnknown;