Release

runner · runner · commit 46580096c132 · 2022-05-11T23:26:28.000Z
diff --git a/SourceCode/Private/Core/Properties/USRVSdkProperties.m b/SourceCode/Private/Core/Properties/USRVSdkProperties.m
@@ -10,12 +10,12 @@
 NSString *const kUnityServicesLocalStorageFilePrefix = @"UnityAdsStorage-";
 NSString *const kUnityServicesWebviewBranchInfoDictionaryKey = @"UADSWebviewBranch";
 NSString *const kUnityServicesWebviewConfigInfoDictionaryKey = @"UADSWebviewConfig";
-NSString *const kUnityServicesVersionName = @"4.2.0";
+NSString *const kUnityServicesVersionName = @"4.2.1";
 NSString *const kUnityServicesFlavorDebug = @"debug";
 NSString *const kUnityServicesFlavorRelease = @"release";
 NSString *const kChinaIsoAlpha2Code = @"CN";
 NSString *const kChinaIsoAlpha3Code = @"CHN";
-int const kUnityServicesVersionCode = 4200;
+int const kUnityServicesVersionCode = 4210;
 
 @implementation USRVSdkProperties
 
diff --git a/SourceCode/Private/GMAScar/GMAAdLoaders/GMAAdLoaderStrategy/Interstitial/GMAGenericAdsDelegateObject/GMAAdDelegateBase.m b/SourceCode/Private/GMAScar/GMAAdLoaders/GMAAdLoaderStrategy/Interstitial/GMAGenericAdsDelegateObject/GMAAdDelegateBase.m
@@ -59,6 +59,7 @@ - (void)willDismissAd: (id)ad {
 - (void)didDismissAd: (id)ad {
     [_quartileEventsStream invalidate];
     _quartileEventsStream = nil;
+    _timer = nil;
     [_eventSender sendEvent: [GMAWebViewEvent newAdClosedWithMeta: _meta]];
 }
 
diff --git a/SourceCode/Private/GMAScar/GMABridges/GMADelegatesFactory/GMADelegatesFactory.h b/SourceCode/Private/GMAScar/GMABridges/GMADelegatesFactory/GMADelegatesFactory.h
@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
 #import "GMAInterstitialAdDelegateProxy.h"
 #import "GMARewardedAdDelegateProxy.h"
+#import "UADSTimerFactory.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol GMADelegatesFactory <NSObject>
@@ -17,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)newWithEventSender: (id<UADSWebViewEventSender>)eventSender
                       errorHandler: (id<UADSErrorHandler>)errorHandler
-                             timer: (id<UADSRepeatableTimer>)timer;
+                      timerFactory: (id<UADSTimerFactory>)timerFactory;
 
 @end
 
diff --git a/SourceCode/Private/GMAScar/GMABridges/GMADelegatesFactory/GMADelegatesFactory.m b/SourceCode/Private/GMAScar/GMABridges/GMADelegatesFactory/GMADelegatesFactory.m
@@ -5,7 +5,7 @@
 @interface GMADelegatesBaseFactory ()
 @property (nonatomic, strong) id<UADSWebViewEventSender> eventSender;
 @property (nonatomic, strong) id<UADSErrorHandler> errorHandler;
-@property (nonatomic, strong) id<UADSRepeatableTimer> timer;
+@property (nonatomic, strong) id<UADSTimerFactory> timerFactory;
 @end
 
 @implementation GMADelegatesBaseFactory
@@ -14,17 +14,17 @@ + (instancetype)newWithEventSender: (id<UADSWebViewEventSender>)eventSender
                       errorHandler: (id<UADSErrorHandler>)errorHandler {
     return [GMADelegatesBaseFactory newWithEventSender: eventSender
                                           errorHandler: errorHandler
-                                                 timer: [UADSTimerWithAppLifeCycle defaultTimer]];
+                                          timerFactory: [UADSTimerFactoryBase new]];
 }
 
 + (instancetype)newWithEventSender: (id<UADSWebViewEventSender>)eventSender
                       errorHandler: (id<UADSErrorHandler>)errorHandler
-                             timer: (id<UADSRepeatableTimer>)timer {
+                      timerFactory: (id<UADSTimerFactory>)timerFactory {
     GMADelegatesBaseFactory *factory = [GMADelegatesBaseFactory new];
 
     factory.eventSender = eventSender;
     factory.errorHandler = errorHandler;
-    factory.timer = timer;
+    factory.timerFactory = timerFactory;
     return factory;
 }
 
@@ -34,15 +34,15 @@ - (nonnull GMAInterstitialAdDelegateProxy *)interstitialDelegate: (nonnull GMAAd
                                            andErrorHandler: _errorHandler
                                                  andSender: _eventSender
                                              andCompletion: completion
-                                                  andTimer: _timer];
+                                                  andTimer: [_timerFactory timerWithAppLifeCycle]];
 }
 
 - (nonnull GMARewardedAdDelegateProxy *)rewardedDelegate: (nonnull GMAAdMetaData *)meta {
     return [GMARewardedAdDelegateProxy newWithMetaData: meta
                                        andErrorHandler: _errorHandler
                                              andSender: _eventSender
                                          andCompletion: [UADSAnyCompletion new]
-                                              andTimer: _timer];
+                                              andTimer: [_timerFactory timerWithAppLifeCycle]];
 }
 
 @end
diff --git a/SourceCode/Private/Tools/Timer/UADSTimer.m b/SourceCode/Private/Tools/Timer/UADSTimer.m
@@ -69,14 +69,14 @@ - (void)invalidate {
 }
 
 - (void)pause {
-    if (self.isValid) {
+    if (self.isValid && self.wasInitialized) {
         self.remainingTime = [self.timer.fireDate timeIntervalSinceNow];
         [self invalidate];
     }
 }
 
 - (void)resume {
-    if (!self.isValid) {
+    if (!self.isValid && self.wasInitialized) {
         [self scheduleTimerWithTimeInterval: self.remainingTime];
     }
 }
@@ -85,4 +85,8 @@ - (BOOL)isValid {
     return self.timer && self.timer.isValid;
 }
 
+- (BOOL)wasInitialized {
+    return self.timeIntervals && self.timerBlock;
+}
+
 @end
diff --git a/SourceCode/Private/Tools/Timer/UADSTimerFactory.h b/SourceCode/Private/Tools/Timer/UADSTimerFactory.h
@@ -0,0 +1,15 @@
+#import <Foundation/Foundation.h>
+
+#import "UADSTimer.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol UADSTimerFactory <NSObject>
+- (id<UADSRepeatableTimer>)timerWithAppLifeCycle;
+@end
+
+@interface UADSTimerFactoryBase : NSObject <UADSTimerFactory>
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SourceCode/Private/Tools/Timer/UADSTimerFactory.m b/SourceCode/Private/Tools/Timer/UADSTimerFactory.m
@@ -0,0 +1,10 @@
+#import "UADSTimerFactory.h"
+#import "UADSTimerWithAppLifeCycle.h"
+
+@implementation UADSTimerFactoryBase
+
+- (nonnull id<UADSRepeatableTimer>)timerWithAppLifeCycle {
+    return [UADSTimerWithAppLifeCycle defaultTimer];
+}
+
+@end
diff --git a/SourceCode/Private/Tools/WeakProxy/NSObject+WeakProxy.m b/SourceCode/Private/Tools/WeakProxy/NSObject+WeakProxy.m
@@ -1,10 +1,3 @@
-//
-//  NSObject+WeakProxy.m
-//  UnityAds
-//
-//  Created by Alex Crowe on 2020-10-13.
-//
-
 #import "NSObject+WeakProxy.h"
 #import "UADSWeakProxy.h"
 
diff --git a/Tests/UnityAdsTests/GMAInfo/GMAInterstitialAdDelegateProxy/GMAInterstitialAdDelegateProxyTests.m b/Tests/UnityAdsTests/GMAInfo/GMAInterstitialAdDelegateProxy/GMAInterstitialAdDelegateProxyTests.m
@@ -11,16 +11,18 @@
 #import "GMAError.h"
 #import "GMATestCommonConstants.h"
 #import "UADSRepeatableTimerMock.h"
+#import "UADSTimerFactoryMock.h"
+#import "XCTestCase+Convenience.h"
 
 @interface GMAInterstitialAdDelegateProxyTests : XCTestCase
 @property (nonatomic, strong) USRVWebViewAppMock *webAppMock;
-@property (nonatomic, strong) UADSRepeatableTimerMock *timerMock;
+@property (nonatomic, strong) UADSTimerFactoryMock *timerFactoryMock;
 @end
 
 @implementation GMAInterstitialAdDelegateProxyTests
 
 - (void)setUp {
-    _timerMock = [UADSRepeatableTimerMock new];
+    _timerFactoryMock = [UADSTimerFactoryMock new];
     _webAppMock = [USRVWebViewAppMock new];
     [USRVWebViewApp setCurrentApp: _webAppMock];
 }
@@ -148,7 +150,7 @@ - (void)test_no_quarlites_events_after_did_dismiss {
     [delegateToTest interstitialWillPresentScreen:  self.fakeAdObject];
     [self simulateQuartilesPlayed: 2];
     [delegateToTest interstitialDidDismissScreen: self.fakeAdObject];
-    XCTAssertTrue(_timerMock.invalidateCalled);
+    XCTAssertTrue(self.timerFactoryMock.lastTimerMock.invalidateCalled);
     GMAAdMetaData *meta = self.defaultMeta;
     NSArray<GMAWebViewEvent *> *expectedEvents = @[
         [GMAWebViewEvent newAdStartedWithMeta: meta],
@@ -260,7 +262,7 @@ - (void)test_did_fail_sends_id_error_and_code {
 }
 
 - (void)simulateQuartilesPlayed: (NSInteger)count {
-    [_timerMock fire: count];
+    [self.timerFactoryMock.lastTimerMock fire: count];
 }
 
 - (void)validateExpectedEvents: (NSArray<GMAWebViewEvent *> *)expectedEvents {
@@ -313,7 +315,59 @@ - (GMAAdMetaData *)defaultMeta {
 
     return [GMADelegatesBaseFactory newWithEventSender: eventSender
                                           errorHandler: errorHandler
-                                                 timer: _timerMock];
+                                          timerFactory: self.timerFactoryMock];
+}
+
+- (void)test_factory_not_crash_if_ad_not_started_before_background {
+    id<UADSWebViewEventSender>eventSender = [UADSWebViewEventSenderBase new];
+    id<UADSErrorHandler>errorHandler = [UADSWebViewErrorHandler newWithEventSender: eventSender];
+
+    [GMADelegatesBaseFactory newWithEventSender: eventSender
+                                   errorHandler: errorHandler];
+
+    [self postDidEnterBackground];
+    [self postDidBecomeActive];
+}
+
+- (void)test_interstitial_delegate_not_crash_if_ad_not_started_before_background {
+    id<UADSWebViewEventSender>eventSender = [UADSWebViewEventSenderBase new];
+    id<UADSErrorHandler>errorHandler = [UADSWebViewErrorHandler newWithEventSender: eventSender];
+
+    GMADelegatesBaseFactory *factory = [GMADelegatesBaseFactory newWithEventSender: eventSender
+                                                                      errorHandler: errorHandler];
+
+    [factory interstitialDelegate: self.defaultMeta
+                    andCompletion: [UADSAnyCompletion new]];
+
+    [self postDidEnterBackground];
+    [self postDidBecomeActive];
+}
+
+- (void)test_no_quartile_events_sent_after_dismiss_ad {
+    id<UADSWebViewEventSender>eventSender = [UADSWebViewEventSenderBase new];
+    id<UADSErrorHandler>errorHandler = [UADSWebViewErrorHandler newWithEventSender: eventSender];
+
+    GMADelegatesBaseFactory *factory = [GMADelegatesBaseFactory newWithEventSender: eventSender
+                                                                      errorHandler: errorHandler];
+
+    @autoreleasepool {
+        GMAInterstitialAdDelegateProxy *delegateToTest = [factory interstitialDelegate: self.defaultMeta
+                                                                         andCompletion: [UADSAnyCompletion new]];
+
+        [delegateToTest interstitialWillPresentScreen:  self.fakeAdObject];
+        [delegateToTest adDidDismissFullScreenContent: self.fakeAdObject];
+    }
+    [self postDidEnterBackground];
+    [self postDidBecomeActive];
+    GMAAdMetaData *meta = self.defaultMeta;
+    NSArray<GMAWebViewEvent *> *expectedEvents = @[
+        [GMAWebViewEvent newAdStartedWithMeta: meta],
+        [GMAWebViewEvent newAdSkippedWithMeta: meta],
+        [GMAWebViewEvent newAdClosedWithMeta: meta],
+    ];
+
+    [self waitForTimeInterval: 0.5];
+    [self validateExpectedEvents: expectedEvents];
 }
 
 @end
diff --git a/Tests/UnityAdsTests/GMAInfo/GMARewardedAdDelegateProxy/GMARewardedAdDelegateProxyTests.m b/Tests/UnityAdsTests/GMAInfo/GMARewardedAdDelegateProxy/GMARewardedAdDelegateProxyTests.m
@@ -11,16 +11,18 @@
 #import "GMAError.h"
 #import "GMATestCommonConstants.h"
 #import "UADSRepeatableTimerMock.h"
+#import "UADSTimerFactoryMock.h"
+#import "XCTestCase+Convenience.h"
 
 @interface GMARewardedAdDelegateProxyTests : XCTestCase
 @property (nonatomic, strong) USRVWebViewAppMock *webAppMock;
-@property (nonatomic, strong) UADSRepeatableTimerMock *timerMock;
+@property (nonatomic, strong) UADSTimerFactoryMock *timerFactoryMock;
 @end
 
 @implementation GMARewardedAdDelegateProxyTests
 
 - (void)setUp {
-    _timerMock = [UADSRepeatableTimerMock new];
+    _timerFactoryMock = [UADSTimerFactoryMock new];
     _webAppMock = [USRVWebViewAppMock new];
     [USRVWebViewApp setCurrentApp: _webAppMock];
 }
@@ -219,7 +221,7 @@ - (void)test_did_fail_sends_id_error_and_code {
 }
 
 - (void)simulateQuartilesPlayed: (NSInteger)count {
-    [_timerMock fire: count];
+    [self.timerFactoryMock.lastTimerMock fire: count];
 }
 
 - (void)validateExpectedEvents: (NSArray<GMAWebViewEvent *> *)expectedEvents {
@@ -261,7 +263,47 @@ - (GMAAdMetaData *)defaultMeta {
 
     return [GMADelegatesBaseFactory newWithEventSender: eventSender
                                           errorHandler: errorHandler
-                                                 timer: _timerMock];
+                                          timerFactory: self.timerFactoryMock];
+}
+
+- (void)test_rewarded_delegate_not_crash_if_ad_not_started_before_background {
+    id<UADSWebViewEventSender>eventSender = [UADSWebViewEventSenderBase new];
+    id<UADSErrorHandler>errorHandler = [UADSWebViewErrorHandler newWithEventSender: eventSender];
+
+    GMADelegatesBaseFactory *factory = [GMADelegatesBaseFactory newWithEventSender: eventSender
+                                                                      errorHandler: errorHandler];
+
+    [factory rewardedDelegate: self.defaultMeta];
+
+    [self postDidEnterBackground];
+    [self postDidBecomeActive];
+}
+
+- (void)test_no_quartile_events_sent_after_dismiss_ad {
+    id<UADSWebViewEventSender>eventSender = [UADSWebViewEventSenderBase new];
+    id<UADSErrorHandler>errorHandler = [UADSWebViewErrorHandler newWithEventSender: eventSender];
+
+    GMADelegatesBaseFactory *factory = [GMADelegatesBaseFactory newWithEventSender: eventSender
+                                                                      errorHandler: errorHandler];
+
+    @autoreleasepool {
+        GMARewardedAdDelegateProxy *delegateToTest = [factory rewardedDelegate: self.defaultMeta];
+
+        [delegateToTest rewardedAdDidPresent:  self.fakeAdObject];
+        [delegateToTest adDidDismissFullScreenContent: self.fakeAdObject];
+    }
+
+    [self postDidEnterBackground];
+    [self postDidBecomeActive];
+    GMAAdMetaData *meta = self.defaultMeta;
+    NSArray<GMAWebViewEvent *> *expectedEvents = @[
+        [GMAWebViewEvent newAdStartedWithMeta: meta],
+        [GMAWebViewEvent newAdSkippedWithMeta: meta],
+        [GMAWebViewEvent newAdClosedWithMeta: meta],
+    ];
+
+    [self waitForTimeInterval: 0.5];
+    [self validateExpectedEvents: expectedEvents];
 }
 
 @end
diff --git a/Tests/UnityAdsTests/Mocks/UADSRepeatableTimerMock.h b/Tests/UnityAdsTests/Mocks/UADSRepeatableTimerMock.h
diff --git a/Tests/UnityAdsTests/Mocks/UADSRepeatableTimerMock.m b/Tests/UnityAdsTests/Mocks/UADSRepeatableTimerMock.m
diff --git a/Tests/UnityAdsTests/Mocks/UADSTimerFactoryMock.h b/Tests/UnityAdsTests/Mocks/UADSTimerFactoryMock.h
@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+#import "UADSTimerFactory.h"
+#import "UADSRepeatableTimerMock.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UADSTimerFactoryMock : NSObject <UADSTimerFactory>
+@property (nonatomic, strong) NSMutableArray *timerMocks;
+- (UADSRepeatableTimerMock *)lastTimerMock;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Tests/UnityAdsTests/Mocks/UADSTimerFactoryMock.m b/Tests/UnityAdsTests/Mocks/UADSTimerFactoryMock.m
@@ -0,0 +1,22 @@
+#import "UADSTimerFactoryMock.h"
+#import "UADSTools.h"
+@implementation UADSTimerFactoryMock
+
+- (instancetype)init {
+    SUPER_INIT;
+    _timerMocks = [NSMutableArray array];
+    return self;
+}
+
+- (nonnull id<UADSRepeatableTimer>)timerWithAppLifeCycle {
+    UADSRepeatableTimerMock *mock = [UADSRepeatableTimerMock new];
+
+    [self.timerMocks addObject: mock];
+    return mock;
+}
+
+- (UADSRepeatableTimerMock *)lastTimerMock {
+    return self.timerMocks.lastObject;
+}
+
+@end
diff --git a/Tests/UnityAdsTests/Tools/Timer/UADSAppLifeCycleListenerBaseTests.m b/Tests/UnityAdsTests/Tools/Timer/UADSAppLifeCycleListenerBaseTests.m
@@ -29,14 +29,4 @@ - (void)test_calls_blocks_on_lifecycle_events {
     [self postDidEnterBackground];
 }
 
-- (void)postDidBecomeActive {
-    [[NSNotificationCenter defaultCenter] postNotificationName: UIApplicationDidBecomeActiveNotification
-                                                        object: nil];
-}
-
-- (void)postDidEnterBackground {
-    [[NSNotificationCenter defaultCenter] postNotificationName: UIApplicationDidEnterBackgroundNotification
-                                                        object: nil];
-}
-
 @end
diff --git a/Tests/UnityAdsTests/Tools/Timer/UADSTimerWithAppLifeCycleTests.m b/Tests/UnityAdsTests/Tools/Timer/UADSTimerWithAppLifeCycleTests.m
diff --git a/Tests/UnityAdsTests/UADTestsTools/XCTestCase+Convenience.h b/Tests/UnityAdsTests/UADTestsTools/XCTestCase+Convenience.h
diff --git a/Tests/UnityAdsTests/UADTestsTools/XCTestCase+Convenience.m b/Tests/UnityAdsTests/UADTestsTools/XCTestCase+Convenience.m
diff --git a/UnityAds.podspec b/UnityAds.podspec

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ - (void)willDismissAd: (id)ad {`
`59`	`59`	`- (void)didDismissAd: (id)ad {`
`60`	`60`	`[_quartileEventsStream invalidate];`
`61`	`61`	`_quartileEventsStream = nil;`
	`62`	`+ _timer = nil;`
`62`	`63`	`[_eventSender sendEvent: [GMAWebViewEvent newAdClosedWithMeta: _meta]];`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,14 @@ - (void)invalidate {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`- (void)pause {`
`72`		`- if (self.isValid) {`
	`72`	`+ if (self.isValid && self.wasInitialized) {`
`73`	`73`	`self.remainingTime = [self.timer.fireDate timeIntervalSinceNow];`
`74`	`74`	`[self invalidate];`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`- (void)resume {`
`79`		`- if (!self.isValid) {`
	`79`	`+ if (!self.isValid && self.wasInitialized) {`
`80`	`80`	`[self scheduleTimerWithTimeInterval: self.remainingTime];`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -85,4 +85,8 @@ - (BOOL)isValid {`
`85`	`85`	`return self.timer && self.timer.isValid;`
`86`	`86`	`}`
`87`	`87`
	`88`	`+- (BOOL)wasInitialized {`
	`89`	`+ return self.timeIntervals && self.timerBlock;`
	`90`	`+}`
	`91`	`+`
`88`	`92`	`@end`