Release 4.8.0

runner · runner · commit 737812a164d1 · 2023-06-27T18:06:03.000Z
diff --git a/Example/UnityAdsExample/ViewController.m b/Example/UnityAdsExample/ViewController.m
@@ -209,6 +209,10 @@ - (void)bannerViewDidLoad: (UADSBannerView *)bannerView {
     NSLog(@"UnityAds Banner loaded for placement: %@", bannerView.placementId);
 }
 
+- (void)bannerViewDidShow:(UADSBannerView *)bannerView {
+    NSLog(@"UnityAds Banner showed for placement: %@", bannerView.placementId);
+}
+
 - (void)bannerViewDidClick: (UADSBannerView *)bannerView {
     // Called when the banner is clicked.
     NSLog(@"UnityAds Banner was clicked for placement: %@", bannerView.placementId);
diff --git a/SourceCode/Private/Ads/AdUnit/UADSViewController.m b/SourceCode/Private/Ads/AdUnit/UADSViewController.m
@@ -5,7 +5,8 @@
 #import "UADSApiWebPlayer.h"
 #import "USRVModuleConfiguration.h"
 #import "UADSAdsModuleConfiguration.h"
-
+#import "USRVClientProperties.h"
+#import "UADSServiceProviderContainer.h"
 #import <sys/utsname.h>
 
 @interface UADSViewController ()
@@ -153,7 +154,16 @@ - (BOOL)shouldAutorotate {
 }
 
 - (void)setSupportedOrientations: (int)supportedOrientations {
-    _supportedOrientations = supportedOrientations;
+    if ([self isOrientationSafeguardEnabled]) {
+        int currentSupported = [USRVClientProperties getSupportedOrientations];
+        if ((currentSupported & supportedOrientations) == supportedOrientations) {
+            _supportedOrientations = supportedOrientations;
+        } else {
+            _supportedOrientations = currentSupported;
+        }
+    } else {
+        _supportedOrientations = supportedOrientations;
+    }
     [self.view setNeedsLayout];
 }
 
@@ -323,4 +333,8 @@ - (void)didReceiveMemoryWarning {
                                        param1: nil];
 }
 
+- (BOOL)isOrientationSafeguardEnabled {
+    return [[UADSServiceProviderContainer sharedInstance].serviceProvider isOrientationSafeguardEnabled];
+}
+
 @end
diff --git a/SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModule.h b/SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModule.h
@@ -6,6 +6,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UADSBannerLoadModule : UADSLoadModule
 
+- (void)sendAdShowedForListenerID:(NSString *)listenerID;
+
 - (void)sendClickEventForListenerID:  (NSString *_Nonnull)listenerID;
 
 - (void)sendLeaveApplicationEventForListenerID:  (NSString *_Nonnull)listenerID;
diff --git a/SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModule.m b/SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModule.m
@@ -52,6 +52,12 @@ - (void)sendAdLoadedForPlacementID:(NSString *)placementID andListenerID:(NSStri
     [delegate bannerViewDidLoad: nil];
 }
 
+- (void)sendAdShowedForListenerID:(NSString *)listenerID {
+    UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForID: listenerID];
+
+    [delegate bannerViewDidShow: nil];
+}
+
 - (void)sendClickEventForListenerID:  (NSString *_Nonnull)listenerID {
     UADSBannerLoadModuleDelegateWrapper *delegate = [self getDelegateForID: listenerID];
 
diff --git a/SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleDelegateWrapper.m b/SourceCode/Private/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleDelegateWrapper.m
@@ -29,6 +29,12 @@ - (void)bannerViewDidLoad: (UADSBannerView *)bannerView {
     });
 }
 
+- (void)bannerViewDidShow:(UADSBannerView *)bannerView {
+    dispatch_on_main( ^{
+        [self.decorated bannerViewDidShow: self.bannerView];
+    });
+}
+
 - (void)bannerViewDidClick: (UADSBannerView *)bannerView {
     dispatch_on_main( ^{
         [self.decorated bannerViewDidClick: self.bannerView];
diff --git a/SourceCode/Private/Banners/Api/UADSApiBannerListener.m b/SourceCode/Private/Banners/Api/UADSApiBannerListener.m
@@ -24,4 +24,9 @@ + (void)WebViewExposed_sendErrorEvent: (NSString *)bannerAdId code: (NSNumber *)
     [callback invoke: nil];
 }
 
++ (void)WebViewExposed_sendShowEvent: (NSString *)bannerAdId callback: (USRVWebViewCallback *)callback {
+    [[UADSBannerLoadModule sharedInstance] sendAdShowedForListenerID:bannerAdId];
+    [callback invoke: nil];
+}
+
 @end
diff --git a/SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSConfigurationExperiments.h b/SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSConfigurationExperiments.h
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)        isNativeWebViewCacheEnabled;
 - (BOOL)        isWebAdAssetCacheEnabled;
 - (BOOL)        isSwiftTokenEnabled;
+- (BOOL)        isOrientationSafeguardEnabled;
 
 - (NSDictionary<NSString *, NSString *> *)nextSessionFlags;
 - (NSDictionary<NSString *, NSString *> *)currentSessionFlags;
diff --git a/SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSConfigurationExperiments.m b/SourceCode/Private/Core/Configuration/SDKConfigurationReader/UADSConfigurationExperiments.m
@@ -77,6 +77,10 @@ - (BOOL)isSwiftTokenEnabled {
     return [self isExperimentEnabledWithKey: @"s_tkn"];
 }
 
+- (BOOL)isOrientationSafeguardEnabled {
+    return [self isExperimentEnabledWithKey: @"osg"];
+}
+
 - (NSDictionary<NSString *, NSString *> *)nextSessionFlags {
     return [self flattenFlagsWith:^BOOL (id key) {
         return [self isExperimentForNextSession: key];
diff --git a/SourceCode/Private/Core/Connectivity/USRVConnectivityUtils.h b/SourceCode/Private/Core/Connectivity/USRVConnectivityUtils.h
@@ -26,7 +26,9 @@ typedef enum : NSInteger {
     NetworkTypeHSPAP,
     NetworkTypeGSM,
     NetworkTypeTdSCDMA,
-    NetworkTypeIWLAN
+    NetworkTypeIWLAN,
+    NetworkTypeNRNSA,
+    NetworkTypeNR
 } NetworkType;
 
 @interface USRVConnectivityUtils : NSObject
diff --git a/SourceCode/Private/Core/Connectivity/USRVConnectivityUtils.m b/SourceCode/Private/Core/Connectivity/USRVConnectivityUtils.m
@@ -21,41 +21,52 @@ + (NSString *)networkTypeAsString {
 }
 
 + (NSInteger)getNetworkType {
-    if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyGPRS]) {
-        NSLog(@"GPRS");
+    NSString *currentRadioAccessTechnology = netinfo.currentRadioAccessTechnology;
+    if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyGPRS]) {
+        USRVLogInfo(@"GPRS");
         return NetworkTypeGPRS;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyEdge]) {
-        NSLog(@"Edge");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyEdge]) {
+        USRVLogInfo(@"Edge");
         return NetworkTypeEdge;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyWCDMA]) {
-        NSLog(@"WCDMA");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyWCDMA]) {
+        USRVLogInfo(@"WCDMA");
         return NetworkTypeCDMA;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyHSDPA]) {
-        NSLog(@"HSDPA");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyHSDPA]) {
+        USRVLogInfo(@"HSDPA");
         return NetworkTypeHSDPA;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyHSUPA]) {
-        NSLog(@"HSUPA");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyHSUPA]) {
+        USRVLogInfo(@"HSUPA");
         return NetworkTypeHSUPA;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMA1x]) {
-        NSLog(@"CDMA1x");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMA1x]) {
+        USRVLogInfo(@"CDMA1x");
         return NetworkTypeCDMA;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMAEVDORev0]) {
-        NSLog(@"CDMAEVDO0Rev0");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMAEVDORev0]) {
+        USRVLogInfo(@"CDMAEVDO0Rev0");
         return NetworkTypeEVDO0;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMAEVDORevA]) {
-        NSLog(@"CDMAEVDO0RevA");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMAEVDORevA]) {
+        USRVLogInfo(@"CDMAEVDO0RevA");
         return NetworkTypeEVDOA;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMAEVDORevB]) {
-        NSLog(@"CDMAEVDO0RevB");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyCDMAEVDORevB]) {
+        USRVLogInfo(@"CDMAEVDO0RevB");
         return NetworkTypeEVDOB;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyeHRPD]) {
-        NSLog(@"HRPD");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyeHRPD]) {
+        USRVLogInfo(@"HRPD");
         return NetworkTypeHRPD;
-    } else if ([netinfo.currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyLTE]) {
-        NSLog(@"LTE");
+    } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyLTE]) {
+        USRVLogInfo(@"LTE");
         return NetworkTypeLTE;
     }
-
+    
+    if (@available(iOS 14.1, *)) {
+        if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyNRNSA]) {
+            USRVLogInfo(@"NRNSA")
+            return NetworkTypeNRNSA;
+        } else if ([currentRadioAccessTechnology isEqualToString: CTRadioAccessTechnologyNR]) {
+            USRVLogInfo(@"NR")
+            return NetworkTypeNR;
+        }
+    }
+    
     return NetworkTypeUnknown;
 } /* getNetworkType */
 
diff --git a/SourceCode/Private/Core/Properties/USRVSdkProperties.m b/SourceCode/Private/Core/Properties/USRVSdkProperties.m
@@ -11,12 +11,12 @@
 NSString *const kUnityServicesLocalStorageFilePrefix = @"UnityAdsStorage-";
 NSString *const kUnityServicesWebviewBranchInfoDictionaryKey = @"UADSWebviewBranch";
 NSString *const kUnityServicesWebviewConfigInfoDictionaryKey = @"UADSWebviewConfig";
-NSString *const kUnityServicesVersionName = @"4.7.1";
+NSString *const kUnityServicesVersionName = @"4.8.0";
 NSString *const kUnityServicesFlavorDebug = @"debug";
 NSString *const kUnityServicesFlavorRelease = @"release";
 NSString *const kChinaIsoAlpha2Code = @"CN";
 NSString *const kChinaIsoAlpha3Code = @"CHN";
-int const kUnityServicesVersionCode = 4710;
+int const kUnityServicesVersionCode = 4800;
 
 @implementation USRVSdkProperties
 
diff --git a/SourceCode/Private/Core/UADSServiceProvider.h b/SourceCode/Private/Core/UADSServiceProvider.h
@@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (USRVInitializeStateFactory *)stateFactory;
 
 - (BOOL)newInitFlowEnabled;
+- (BOOL)isOrientationSafeguardEnabled;
 - (NSString *)sharedSessionId;
 @end
 
diff --git a/SourceCode/Private/Core/UADSServiceProvider.m b/SourceCode/Private/Core/UADSServiceProvider.m
@@ -46,6 +46,9 @@ - (BOOL)newInitFlowEnabled {
     return [self.experiments isSwiftInitFlowEnabled];
 }
 
+- (BOOL)isOrientationSafeguardEnabled {
+    return [self.experiments isOrientationSafeguardEnabled];
+}
 
 -(NSDictionary *)getDeviceInfoWithExtended: (BOOL)extended {
     
diff --git a/SourceCode/Public/Banners/UADSBannerViewDelegate.h b/SourceCode/Public/Banners/UADSBannerViewDelegate.h
@@ -16,6 +16,14 @@
  */
 - (void)bannerViewDidLoad: (UADSBannerView *)bannerView;
 
+@optional
+/**
+ * Called when the banner is showed in the view hierarchy.
+ *
+ * @param bannerView View that was showed
+ */
+- (void)bannerViewDidShow: (UADSBannerView *)bannerView;
+
 /**
  * Called when the user clicks the banner.
  *
diff --git a/Tests/UnityAdsTests/Core/Device/HeaderBiddingTokenReader/UADSHeaderBiddingTokenReaderBridgeTestCase.m b/Tests/UnityAdsTests/Core/Device/HeaderBiddingTokenReader/UADSHeaderBiddingTokenReaderBridgeTestCase.m
@@ -7,6 +7,7 @@
 #import "XCTestCase+Convenience.h"
 #import "UADSTools.h"
 #import "NSArray+Map.h"
+#import "UnityAds+Testability.h"
 
 @interface UADSHeaderBiddingTokenReaderBridgeTestCase ()
 
@@ -15,11 +16,16 @@ @interface UADSHeaderBiddingTokenReaderBridgeTestCase ()
 @implementation UADSHeaderBiddingTokenReaderBridgeTestCase
 
 - (void)setUp {
+    [UnityAds resetForTest];
     self.nativeGeneratorMock = [UADSHeaderBiddingTokenAsyncReaderMock new];
     self.tokenCRUDMock = [UADSTokenStorage new];
     self.configReaderMock = [UADSConfigurationReaderMock new];
 }
 
+- (void)tearDown {
+    [UnityAds resetForTest];
+}
+
 - (id<UADSHeaderBiddingAsyncTokenReader, UADSHeaderBiddingTokenCRUD>)sut {
     return [self sutWithTimeoutValue: 5];
 }
diff --git a/Tests/UnityAdsTests/Core/Device/HeaderBiddingTokenReader/UADSHeaderBiddingTokenReaderSwiftBridgeTestCase.m b/Tests/UnityAdsTests/Core/Device/HeaderBiddingTokenReader/UADSHeaderBiddingTokenReaderSwiftBridgeTestCase.m
@@ -1,5 +1,6 @@
 #import <XCTest/XCTest.h>
 #import "UADSHeaderBiddingTokenReaderSwiftBridge.h"
+#import "UnityAds+Testability.h"
 
 @interface UADSHeaderBiddingTokenReaderSwiftBridgeTestCase : XCTestCase
 
@@ -8,10 +9,12 @@ @interface UADSHeaderBiddingTokenReaderSwiftBridgeTestCase : XCTestCase
 @implementation UADSHeaderBiddingTokenReaderSwiftBridgeTestCase
 
 - (void)setUp {
+    [UnityAds resetForTest];
     [self saveConfigurationWithSwiftDeviceInfo:true];
 }
 
 - (void)tearDown {
+    [UnityAds resetForTest];
 }
 
 - (void)test_native_generator_in_swift_returns_token {
diff --git a/Tests/UnityAdsTests/Metrics/UADSMetricSenderTestCase.m b/Tests/UnityAdsTests/Metrics/UADSMetricSenderTestCase.m
@@ -11,6 +11,7 @@
 #import "USRVStorageManager.h"
 #import "NSDictionary+Merge.h"
 #import "USRVClientProperties.h"
+#import "UnityAds+Testability.h"
 
 @interface UADSMetricSenderTestCase : XCTestCase
 @property (nonatomic, strong) UADSServiceProvider *serviceProvider;
@@ -25,6 +26,7 @@ @implementation UADSMetricSenderTestCase
 
 - (void)setUp {
     [super setUp];
+    [UnityAds resetForTest];
     [self deleteConfigFile];
     [USRVClientProperties setGameId:@"54321"];
     self.privacyMock = [[UADSPrivacyStorageMock alloc] init];
@@ -45,6 +47,7 @@ - (void)tearDown {
     [super tearDown];
     [self deleteConfigFile];
     UADSServiceProviderContainer.sharedInstance.serviceProvider = [UADSServiceProvider new];
+    [UnityAds resetForTest];
 }
 
 - (void)test_sends_proper_performance_metrics_payload {
diff --git a/Tests/UnityAdsTests/UnityServices/Ads/Load/UADSBannerLoadModule/Mocks/UADSBannerViewDelegateMock.h b/Tests/UnityAdsTests/UnityServices/Ads/Load/UADSBannerLoadModule/Mocks/UADSBannerViewDelegateMock.h
@@ -8,6 +8,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSArray<UADSBannerView *> *failedBanners;
 @property (nonatomic, strong) NSArray<UADSBannerView *> *clickedBanners;
 @property (nonatomic, strong) NSArray<UADSBannerView *> *leaveAppBanners;
+@property (nonatomic, strong) NSArray<UADSBannerView *> *showedBanners;
 @property (nonatomic, strong) NSArray<NSNumber *> *errorCodes;
 @property (nonatomic, strong) NSArray<NSString *> *errorMessages;
 @property (nonatomic, strong, readwrite) XCTestExpectation *expectation;
diff --git a/Tests/UnityAdsTests/UnityServices/Ads/Load/UADSBannerLoadModule/Mocks/UADSBannerViewDelegateMock.m b/Tests/UnityAdsTests/UnityServices/Ads/Load/UADSBannerLoadModule/Mocks/UADSBannerViewDelegateMock.m
@@ -12,13 +12,19 @@ - (instancetype)init {
     self.errorMessages = [NSArray new];
     self.clickedBanners = [NSArray new];
     self.leaveAppBanners = [NSArray new];
+    self.showedBanners = [NSArray new];
     return self;
 }
 
 - (void)bannerViewDidLoad: (UADSBannerView *)bannerView {
     _succeedBanners = [_succeedBanners arrayByAddingObject:bannerView];
     [self.expectation fulfill];
 }
+
+- (void)bannerViewDidShow:(UADSBannerView *)bannerView {
+    _showedBanners = [_showedBanners arrayByAddingObject:bannerView];
+    [self.expectation fulfill];
+}
  
 - (void)bannerViewDidClick: (UADSBannerView *)bannerView {
     _clickedBanners = [_clickedBanners arrayByAddingObject:bannerView];
diff --git a/Tests/UnityAdsTests/UnityServices/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleIntegrationTests.m b/Tests/UnityAdsTests/UnityServices/Ads/Load/UADSBannerLoadModule/UADSBannerLoadModuleIntegrationTests.m
@@ -60,9 +60,10 @@ - (void)test_load_after_SDK_is_initialized_calls_web_view {
 
 - (void)test_load_after_SDK_is_initialized {
     [self initializeCommonFlowWithSDKInitialized: INITIALIZED_SUCCESSFULLY];
-    _loadDelegateMock.expectation.expectedFulfillmentCount = 3;
+    _loadDelegateMock.expectation.expectedFulfillmentCount = 4;
     [self emulateInvokerSuccessResponse];
     [self emulateSendLoadedForTheLastListener];
+    [self emulateSendShowed];
     [self emulateSendClicked];
     [self emulateSendLeaveApplication];
     [self waitForExpectations: @[_loadDelegateMock.expectation]
@@ -71,6 +72,7 @@ - (void)test_load_after_SDK_is_initialized {
     XCTAssertEqual(_loadDelegateMock.failedBanners.count, 0);
     XCTAssertEqual(_loadDelegateMock.clickedBanners.count, 1);
     XCTAssertEqual(_loadDelegateMock.leaveAppBanners.count, 1);
+    XCTAssertEqual(_loadDelegateMock.showedBanners.count, 1);
     XCTAssertEqual(_webAppMock.returnedParams.count, 1);
 }
 
@@ -208,6 +210,10 @@ - (void)emulateSendLeaveApplication {
     [self.moduleToTest sendLeaveApplicationEventForListenerID:self.lastListenerID];
 }
 
+- (void)emulateSendShowed {
+    [self.moduleToTest sendAdShowedForListenerID:self.lastListenerID];
+}
+
 - (void)await {
     [self waitForExpectationsWithTimeout: DEFAULT_TEST_WAIT_TIME
                                  handler: nil];
diff --git a/UnityAds.podspec b/UnityAds.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name = 'UnityAds'
-  s.version = '4.7.1'
+  s.version = '4.8.0'
   s.license = { :type => 'Unity License', :file => 'LICENSE' }
   s.author = { 'UnityAds' => 'itunes@unity3d.com' }
   s.homepage = 'https://unity3d.com/services/ads'
   s.summary = 'Monetize your entire player base and reach new audiences with video ads.'
   s.platform = :ios
-  s.source = { :http => 'https://github.com/Unity-Technologies/unity-ads-ios/releases/download/4.7.1/UnityAds.zip' }
+  s.source = { :http => 'https://github.com/Unity-Technologies/unity-ads-ios/releases/download/4.8.0/UnityAds.zip' }
   s.ios.deployment_target = '9.0'
   s.ios.vendored_frameworks = 'UnityAds.xcframework'
   s.swift_version = '5.0'

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,9 @@ + (void)WebViewExposed_sendErrorEvent: (NSString )bannerAdId code: (NSNumber )`
`24`	`24`	`[callback invoke: nil];`
`25`	`25`	`}`
`26`	`26`
	`27`	`++ (void)WebViewExposed_sendShowEvent: (NSString )bannerAdId callback: (USRVWebViewCallback )callback {`
	`28`	`+ [[UADSBannerLoadModule sharedInstance] sendAdShowedForListenerID:bannerAdId];`
	`29`	`+ [callback invoke: nil];`
	`30`	`+}`
	`31`	`+`
`27`	`32`	`@end`