Skip to content

Commit c2cbea7

Browse files
author
Ville Orkas
committed
Release 2.0.3
1 parent 148cf75 commit c2cbea7

21 files changed

+1156
-49
lines changed

‎UnityAds/Api/UADSApiDeviceInfo.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,4 @@ + (void)WebViewExposed_isSimulator:(UADSWebViewCallback *)callback {
120120
[callback invoke:[NSNumber numberWithBool:[UADSDevice isSimulator]], nil];
121121
}
122122

123-
+ (void)WebViewExposed_isAppleWatchPaired:(UADSWebViewCallback *)callback {
124-
[callback invoke:[NSNumber numberWithBool:[UADSDevice isAppleWatchPaired]], nil];
125-
}
126-
127123
@end

‎UnityAds/Api/UADSApiRequest.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22

33
@interface UADSApiRequest : NSObject
44

5+
+ (NSArray<NSArray<NSString*>*> *)getHeadersArray:(NSDictionary<NSString*,NSString*> *)headersMap;
6+
57
@end

‎UnityAds/Api/UADSApiRequest.m

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,26 @@ + (void)WebViewExposed_post:(NSString *)requestId url:(NSString *)url body:(NSSt
8181
return mappedHeaders;
8282
}
8383

84+
+ (NSArray<NSArray<NSString*>*> *)getHeadersArray:(NSDictionary<NSString*,NSString*> *)headersMap {
85+
__block NSArray *headersArray = [NSArray array];
86+
87+
if (headersMap && headersMap.count > 0) {
88+
[headersMap enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull obj, BOOL * _Nonnull stop) {
89+
headersArray = [headersArray arrayByAddingObject:@[key, obj]];
90+
}];
91+
}
92+
93+
return headersArray;
94+
}
95+
8496
+ (void)sendSuccess:(NSString *)requestId url:(NSString *)url response:(NSString *)response responseCode:(long)responseCode headers:(NSDictionary<NSString*,NSString*> *)headers {
8597
[[UADSWebViewApp getCurrentApp] sendEvent:NSStringFromWebRequestEvent(kUnityAdsWebRequestEventComplete)
8698
category:webRequestEventCategory
8799
param1:requestId,
88100
url,
89101
response,
90102
[NSNumber numberWithLong:responseCode],
91-
headers,
103+
[UADSApiRequest getHeadersArray:headers],
92104
nil];
93105
}
94106

@@ -113,4 +125,4 @@ + (void)sendFailed:(NSString *)requestId url:(NSString *)url error:(NSError *)er
113125
nil];
114126
}
115127

116-
@end
128+
@end

‎UnityAds/Api/UADSApiStorage.m

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ + (void)WebViewExposed_set:(NSString *)type key:(NSString *)key value:(id)value
1818
nil];
1919
}
2020
else {
21-
[callback error:NSStringFromStorageError(kUnityAdsCouldntSetValue) arg1:nil];
21+
[callback error:NSStringFromStorageError(kUnityAdsCouldntSetValue) arg1:key, value, nil];
2222
}
2323
}
2424
else {
25-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
25+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, key, value, nil];
2626
}
2727
}
2828

@@ -39,11 +39,11 @@ + (void)WebViewExposed_get:(NSString *)type key:(NSString *)key callback:(UADSWe
3939
nil];
4040
}
4141
else {
42-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetValue) arg1:nil];
42+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetValue) arg1:key, nil];
4343
}
4444
}
4545
else {
46-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
46+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, key, nil];
4747
}
4848
}
4949

@@ -58,7 +58,7 @@ + (void)WebViewExposed_read:(NSString *)type callback:(UADSWebViewCallback *)cal
5858
nil];
5959
}
6060
else {
61-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
61+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, nil];
6262
}
6363
}
6464

@@ -75,11 +75,11 @@ + (void)WebViewExposed_write:(NSString *)type callback:(UADSWebViewCallback *)ca
7575
nil];
7676
}
7777
else {
78-
[callback error:NSStringFromStorageError(kUnityAdsCouldntWriteStorageToCache) arg1:nil];
78+
[callback error:NSStringFromStorageError(kUnityAdsCouldntWriteStorageToCache) arg1:type, nil];
7979
}
8080
}
8181
else {
82-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
82+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, nil];
8383
}
8484
}
8585

@@ -96,11 +96,11 @@ + (void)WebViewExposed_clear:(NSString *)type callback:(UADSWebViewCallback *)ca
9696
nil];
9797
}
9898
else {
99-
[callback error:NSStringFromStorageError(kUnityAdsCouldntClearStorage) arg1:nil];
99+
[callback error:NSStringFromStorageError(kUnityAdsCouldntClearStorage) arg1:type, nil];
100100
}
101101
}
102102
else {
103-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
103+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, nil];
104104
}
105105
}
106106

@@ -117,11 +117,11 @@ + (void)WebViewExposed_delete:(NSString *)type key:(NSString *)key callback:(UAD
117117
nil];
118118
}
119119
else {
120-
[callback error:NSStringFromStorageError(kUnityAdsCouldntDeleteValue) arg1:nil];
120+
[callback error:NSStringFromStorageError(kUnityAdsCouldntDeleteValue) arg1:type, nil];
121121
}
122122
}
123123
else {
124-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
124+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, nil];
125125
}
126126
}
127127

@@ -135,7 +135,7 @@ + (void)WebViewExposed_getKeys:(NSString *)type key:(NSString *)key recursive:(N
135135
nil];
136136
}
137137
else {
138-
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:nil];
138+
[callback error:NSStringFromStorageError(kUnityAdsCouldntGetStorage) arg1:type, key, nil];
139139
}
140140
}
141141

‎UnityAds/Cache/UADSCacheOperation.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#import "UADSWebViewApp.h"
44
#import "UADSCacheEvent.h"
55
#import "UADSWebViewEventCategory.h"
6+
#import "UADSApiRequest.h"
67

78
@implementation UADSCacheOperation
89

@@ -85,7 +86,7 @@ - (void)main {
8586
dispatch_async(dispatch_get_main_queue(), ^{
8687
[[UADSWebViewApp getCurrentApp] sendEvent:NSStringFromCacheEvent(kUnityAdsDownloadStarted)
8788
category:NSStringFromWebViewEventCategory(kUnityAdsWebViewEventCategoryCache)
88-
param1:weakSelf.source, [NSNumber numberWithLongLong:fileSize], [NSNumber numberWithLongLong:weakSelf.expectedContentSize], [NSNumber numberWithLong:responseCode], responseHeaders, nil];
89+
param1:weakSelf.source, [NSNumber numberWithLongLong:fileSize], [NSNumber numberWithLongLong:weakSelf.expectedContentSize], [NSNumber numberWithLong:responseCode], [UADSApiRequest getHeadersArray:responseHeaders], nil];
8990
});
9091
}];
9192

@@ -137,7 +138,7 @@ - (void)main {
137138
[NSNumber numberWithLongLong:self.expectedContentSize],
138139
[NSNumber numberWithLong:duration],
139140
[NSNumber numberWithLong:responseCode],
140-
responseHeaders,
141+
[UADSApiRequest getHeadersArray:responseHeaders],
141142
nil];
142143
});
143144
}
@@ -150,7 +151,7 @@ - (void)main {
150151
[NSNumber numberWithLongLong:(long) self.expectedContentSize],
151152
[NSNumber numberWithLong:duration],
152153
[NSNumber numberWithLong:responseCode],
153-
responseHeaders,
154+
[UADSApiRequest getHeadersArray:responseHeaders],
154155
nil];
155156
});
156157
}

‎UnityAds/Device/UADSDevice.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,4 @@
5858

5959
+ (NSInteger)getUserInterfaceIdiom;
6060

61-
+ (BOOL)isAppleWatchPaired;
62-
6361
@end

‎UnityAds/Device/UADSDevice.m

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@import AdSupport;
33
@import AVFoundation;
44
@import CoreTelephony;
5-
@import WatchConnectivity;
65

76
#import <sys/utsname.h>
87
#import <mach/mach.h>
@@ -12,11 +11,6 @@
1211
#import "UADSDevice.h"
1312
#import "UADSConnectivityUtils.h"
1413

15-
@interface WatchSessionDelegate : NSObject <WCSessionDelegate>
16-
@end
17-
@implementation WatchSessionDelegate
18-
@end
19-
2014
@implementation UADSDevice
2115

2216
+ (NSString *)getOsVersion {
@@ -59,7 +53,8 @@ + (NSString *)getAdvertisingTrackingId {
5953
}
6054

6155
+ (BOOL)isLimitTrackingEnabled {
62-
return [ASIdentifierManager sharedManager].isAdvertisingTrackingEnabled;
56+
// Note that isAdvertisingTrackingEnabled == !isLimitTrackingEnabled
57+
return ![ASIdentifierManager sharedManager].isAdvertisingTrackingEnabled;
6358
}
6459

6560
+ (BOOL)isUsingWifi {
@@ -261,18 +256,5 @@ + (NSInteger)getUserInterfaceIdiom {
261256
return [[UIDevice currentDevice] userInterfaceIdiom];
262257
}
263258

264-
+ (BOOL)isAppleWatchPaired {
265-
if ([WCSession isSupported]) {
266-
WatchSessionDelegate *delegate = [[WatchSessionDelegate alloc]init];
267-
[[WCSession defaultSession] setDelegate:delegate];
268-
[[WCSession defaultSession] activateSession];
269-
if ([WCSession defaultSession].paired) {
270-
delegate = nil;
271-
return true;
272-
}
273-
}
274-
return false;
275-
}
276-
277259
@end
278260

‎UnityAds/Properties/UADSSdkProperties.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
NSString * const kUnityAdsCacheDirName = @"UnityAdsCache";
44
NSString * const kUnityAdsLocalCacheFilePrefix = @"UnityAdsCache-";
55
NSString * const kUnityAdsLocalStorageFilePrefix = @"UnityAdsStorage-";
6-
NSString * const kUnityAdsVersionName = @"2.0.2";
6+
NSString * const kUnityAdsVersionName = @"2.0.3";
77
NSString * const kUnityAdsFlavorDebug = @"debug";
88
NSString * const kUnityAdsFlavorRelease = @"release";
9-
int const kUnityAdsVersionCode = 2002;
9+
int const kUnityAdsVersionCode = 2003;
1010

1111
@implementation UADSSdkProperties
1212

‎UnityAds/Request/UADSWebRequestOperation.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ - (void)main {
2222
NSData *data = [self.request makeRequest];
2323
NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
2424

25+
if (!responseString) {
26+
responseString = [NSString stringWithFormat:@""];
27+
}
28+
2529
[self stopObserving];
2630

2731
if (self.completeBlock && self.request && !self.request.canceled) {

‎UnityAds/Video/UADSAVPlayer.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
251251
[[UADSWebViewApp getCurrentApp] sendEvent:NSStringFromAVPlayerError(kUnityAdsAVPlayerGenericError)
252252
category:NSStringFromWebViewEventCategory(kUnityAdsWebViewEventCategoryVideoPlayer)
253253
param1:self.url,
254+
self.currentItem.error.description,
254255
nil];
255256
});
256257
}

0 commit comments

Comments
 (0)