Skip to content

Commit 00d61a5

Browse files
fix: Prevent Integration Attribute Override with NSNull values (#25)
* fix: Prevent Integration Attribute Override with NSNull values
1 parent 6bb6f7d commit 00d61a5

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

mParticle-Adobe/MPIAdobe.m

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636

3737
static NSString *const errorResponseKey = @"error_msg";
3838

39-
static NSString *const invalidMarketingCloudId = @"<null>";
40-
4139
static NSString *const errorDomain = @"mParticle-Adobe";
4240
static NSString *const serverErrorDomain = @"mParticle-Adobe Server Response";
4341

@@ -172,13 +170,9 @@ - (void)sendRequestWithMarketingCloudId:(NSString *)marketingCloudId advertiserI
172170
return callbackWithCode(MPIAdobeErrorCodeServerError, @"Server returned an error", error);
173171
}
174172

175-
NSString *marketingCloudId = dictionary[marketingCloudIdKey];
176-
if ([marketingCloudId isEqualToString:invalidMarketingCloudId]) {
177-
marketingCloudId = nil;
178-
}
179-
180-
NSString *region = [NSString stringWithFormat:@"%@", dictionary[regionKey]];
181-
NSString *blob = dictionary[blobKey];
173+
NSString *marketingCloudId = [dictionary[marketingCloudIdKey] isKindOfClass:[NSString class]] ? dictionary[marketingCloudIdKey] : nil;
174+
NSString *region = [dictionary[regionKey] isKindOfClass:[NSString class]] ? dictionary[regionKey] : nil;
175+
NSString *blob = [dictionary[blobKey] isKindOfClass:[NSString class]] ? dictionary[blobKey] : nil;
182176

183177
weakSelf.region = region;
184178
weakSelf.blob = blob;

0 commit comments

Comments
 (0)