Skip to content

Commit cd0a4b7

Browse files
committed
Code review changes
1 parent 76c2cf3 commit cd0a4b7

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

FIRDynamicLinkTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ - (void)setUp {
5050
- (void)testDynamicLinkParameters_InitWithParameters {
5151
FIRDynamicLink *dynamicLink = [[FIRDynamicLink alloc] initWithParametersDictionary:fdlParameters];
5252
XCTAssertEqual([fdlParameters count], [[dynamicLink parametersDictionary] count]);
53-
for (id key in fdlParameters) {
53+
for (NSString *key in fdlParameters) {
5454
NSString *expectedValue = [fdlParameters valueForKey:key];
5555
NSString *derivedValue = [[dynamicLink parametersDictionary] valueForKey:key];
5656
XCTAssertNotNil(derivedValue, @"Cannot be null!");
@@ -61,7 +61,7 @@ - (void)testDynamicLinkParameters_InitWithParameters {
6161
- (void)testDynamicLinkUtmParameters_InitWithParameters {
6262
FIRDynamicLink *dynamicLink = [[FIRDynamicLink alloc] initWithParametersDictionary:fdlParameters];
6363
XCTAssertEqual([[dynamicLink utmParametersDictionary] count], [utmParameters count]);
64-
for (id key in utmParameters) {
64+
for (NSString *key in utmParameters) {
6565
NSString *expectedValue = [utmParameters valueForKey:key];
6666
NSString *derivedValue = [[dynamicLink utmParametersDictionary] valueForKey:key];
6767
XCTAssertNotNil(derivedValue, @"Cannot be null!");

FirebaseDynamicLinks/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# v7.7.0
2-
- [added] Adding "utmParametersDictionary" api to FIRDynamicLink. (#6730)
2+
- [added] Added `utmParametersDictionary` property to `DynamicLink`. (#6730)
33

44
# v7.6.0
55
- [fixed] Fixed build warnings introduced with Xcode 12.5. (#7434)

FirebaseDynamicLinks/Sources/FIRDynamicLink.m

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
@implementation FIRDynamicLink
2525

26-
NSString *const UTM_PARAM_PREFIX = @"utm_";
26+
NSString *const FDLUTMParamPrefix = @"utm_";
2727

2828
- (NSString *)description {
2929
return [NSString stringWithFormat:@"<%@: %p, url [%@], match type: %@, minimumAppVersion: %@, "
@@ -38,7 +38,7 @@ - (instancetype)initWithParametersDictionary:(NSDictionary<NSString *, id> *)par
3838

3939
if (self = [super init]) {
4040
_parametersDictionary = [parameters copy];
41-
_utmParametersDictionary = [[self class] extractUtmParams:parameters];
41+
_utmParametersDictionary = [[self class] extractUTMParams:parameters];
4242
NSString *urlString = parameters[kFIRDLParameterDeepLinkIdentifier];
4343
_url = [NSURL URLWithString:urlString];
4444
_inviteId = parameters[kFIRDLParameterInviteId];
@@ -136,18 +136,16 @@ + (FIRDLMatchType)matchTypeWithString:(NSString *)string {
136136
return [matchMap[string] integerValue] ?: FIRDLMatchTypeNone;
137137
}
138138

139-
+ (NSDictionary<NSString *, id> *)extractUtmParams:(NSDictionary<NSString *, id> *)parameters {
139+
+ (NSDictionary<NSString *, id> *)extractUTMParams:(NSDictionary<NSString *, id> *)parameters {
140140
NSMutableDictionary<NSString *, id> *utmParamsDictionary = [[NSMutableDictionary alloc] init];
141141

142-
if (parameters) {
143-
for (id key in parameters) {
144-
if ([key hasPrefix:UTM_PARAM_PREFIX]) {
145-
[utmParamsDictionary setObject:[parameters valueForKey:key] forKey:key];
146-
}
142+
for (NSString *key in parameters) {
143+
if ([key hasPrefix:FDLUTMParamPrefix]) {
144+
[utmParamsDictionary setObject:[parameters valueForKey:key] forKey:key];
147145
}
148146
}
149147

150-
return utmParamsDictionary;
148+
return [[NSDictionary alloc] initWithDictionary:utmParamsDictionary];
151149
}
152150

153151
@end

FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FIRDynamicLink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ NS_SWIFT_NAME(DynamicLink)
6969

7070
/**
7171
* @property utmParametersDictionary
72-
* @abstract UTM parameters associated with a firebase dynamic link.
72+
* @abstract UTM parameters associated with a Firebase Dynamic Link.
7373
*/
7474
@property(nonatomic, copy, readonly) NSDictionary<NSString *, id> *utmParametersDictionary;
7575

0 commit comments

Comments
 (0)