Skip to content

Commit de12d89

Browse files
author
Unity Ads Travis
committed
Release 2.2.1
1 parent 1106edf commit de12d89

File tree

7 files changed

+42
-9
lines changed

7 files changed

+42
-9
lines changed

UnityAds/Configuration/UADSInitialize.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@interface UADSInitialize : NSObject
55

66
+ (void)initialize:(UADSConfiguration *)configuration;
7+
+ (void)reset;
78

89
@end
910

@@ -26,6 +27,12 @@
2627

2728
@end
2829

30+
// FORCE RESET
31+
32+
@interface UADSInitializeStateForceReset : UADSInitializeStateReset
33+
34+
@end
35+
2936
// CONFIG
3037

3138
@interface UADSInitializeStateConfig : UADSInitializeState

UnityAds/Configuration/UADSInitialize.m

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ + (void)initialize:(UADSConfiguration *)configuration {
3434
}
3535
}
3636

37+
+ (void) reset {
38+
if (initializeQueue) {
39+
id state = [[UADSInitializeStateForceReset alloc] initWithConfiguration:currentConfiguration];
40+
[initializeQueue addOperation:state];
41+
}
42+
}
43+
3744
@end
3845

3946
/* STATE CLASSES */
@@ -121,6 +128,17 @@ - (instancetype)execute {
121128

122129
@end
123130

131+
// FORCE RESET
132+
133+
@implementation UADSInitializeStateForceReset : UADSInitializeStateReset
134+
135+
- (instancetype)execute {
136+
[super execute];
137+
return nil;
138+
}
139+
140+
@end
141+
124142
// CONFIG
125143

126144
@implementation UADSInitializeStateConfig : UADSInitializeState

UnityAds/Properties/UADSSdkProperties.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
NSString * const kUnityAdsLocalCacheFilePrefix = @"UnityAdsCache-";
55
NSString * const kUnityAdsLocalStorageFilePrefix = @"UnityAdsStorage-";
66
NSString * const kUnityAdsWebviewBranchInfoDictionaryKey = @"UADSWebviewBranch";
7-
NSString * const kUnityAdsVersionName = @"2.2.0";
7+
NSString * const kUnityAdsVersionName = @"2.2.1";
88
NSString * const kUnityAdsFlavorDebug = @"debug";
99
NSString * const kUnityAdsFlavorRelease = @"release";
10-
int const kUnityAdsVersionCode = 2200;
10+
int const kUnityAdsVersionCode = 2201;
1111

1212
@implementation UADSSdkProperties
1313

UnityAds/Purchasing/UADSPurchasing.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ typedef NS_ENUM(NSInteger, UnityAdsPurchasingEvent) {
1717
/**
1818
* An event that indicates the success or failure of initializing Purchasing.
1919
*/
20-
kUnityAdsPurchasingEventInitializationResult
20+
kUnityAdsPurchasingEventInitializationResult,
21+
/**
22+
* An event that indicates a message directly from Purchasing.
23+
*/
24+
kUnityAdsPurchasingEventPurchasingEvent
2125
};
2226
/**
2327
* The `UADSPurchasingDelegate` protocol defines the required methods for receiving IAP promo-related messages from UnityAds.

UnityAds/Purchasing/UADSPurchasing.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
static NSString *unityAdsPurchasingProductCatalogEvent = @"CATALOG";
77
static NSString *unityAdsPurchasingCommandCallback = @"COMMAND";
88
static NSString *unityAdsPurchasingInitializationResult = @"INITIALIZATION";
9-
9+
static NSString *unityAdsPurchasingEvent = @"EVENT";
1010

1111
NSString *NSStringFromPurchasingEvent(UnityAdsPurchasingEvent event) {
1212
switch (event) {
@@ -18,6 +18,8 @@
1818
return unityAdsPurchasingCommandCallback;
1919
case kUnityAdsPurchasingEventInitializationResult:
2020
return unityAdsPurchasingInitializationResult;
21+
case kUnityAdsPurchasingEventPurchasingEvent:
22+
return unityAdsPurchasingEvent;
2123
}
2224
}
2325

UnityAds/UnityAds.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ + (void)show:(UIViewController *)viewController placementId:(NSString *)placemen
135135

136136
[UADSWebViewMethodInvokeQueue addOperation:operation];
137137
} else {
138-
if (![self isSupported]) {
138+
if (!placementId) {
139+
NSException *exception = [NSException exceptionWithName:@"IllegalArgumentException" reason:@"PlacementID is nil" userInfo:nil];
140+
@throw exception;
141+
} else if (![self isSupported]) {
139142
[self handleShowError:placementId unityAdsError:kUnityAdsErrorNotInitialized message:@"Unity Ads is not supported for this device"];
140143
} else if (![self isInitialized]) {
141144
[self handleShowError:placementId unityAdsError:kUnityAdsErrorNotInitialized message:@"Unity Ads is not initialized"];

UnityAds/WebView/Bridge/UADSWebViewShowOperation.m

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#import "UADSCacheQueue.h"
55
#import "UADSConnectivityMonitor.h"
66
#import "UADSSdkProperties.h"
7+
#import "UADSInitialize.h"
78

89
@implementation UADSWebViewShowOperation
910

@@ -29,9 +30,7 @@ - (void)main {
2930
}
3031
}
3132

32-
[UADSPlacement reset];
33-
[UADSCacheQueue cancelAllDownloads];
34-
[UADSConnectivityMonitor stopAll];
33+
[UADSInitialize reset];
3534
}
3635
else {
3736
UADSLogDebug(@"SHOW SUCCESS");
@@ -44,4 +43,4 @@ + (void)callback:(NSArray *)params {
4443
}
4544
}
4645

47-
@end
46+
@end

0 commit comments

Comments
 (0)