Skip to content

Commit 31fed86

Browse files
committed
SDK-605 add optional config to set the blacklist url
1 parent 9d847ed commit 31fed86

File tree

4 files changed

+29
-16
lines changed

4 files changed

+29
-16
lines changed

Branch-SDK-Tests/BNCPreferenceHelperTests.m

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,41 @@
1212
#import "BNCTestCase.h"
1313

1414
@interface BNCPreferenceHelperTests : BNCTestCase
15+
@property (nonatomic, strong, readwrite) BNCPreferenceHelper *prefHelper;
1516
@end
1617

1718
@implementation BNCPreferenceHelperTests
1819

19-
#pragma mark - Default storage tests
20+
- (void)setUp {
21+
self.prefHelper = [BNCPreferenceHelper new];
22+
}
23+
24+
- (void)tearDown {
25+
26+
}
27+
2028
- (void)testPreferenceDefaults {
21-
BNCPreferenceHelper *prefHelper = [[BNCPreferenceHelper alloc] init];
22-
23-
// Defaults
24-
XCTAssertEqual(prefHelper.timeout, 5.5);
25-
XCTAssertEqual(prefHelper.retryInterval, 0);
26-
XCTAssertEqual(prefHelper.retryCount, 3);
29+
XCTAssertEqual(self.prefHelper.timeout, 5.5);
30+
XCTAssertEqual(self.prefHelper.retryInterval, 0);
31+
XCTAssertEqual(self.prefHelper.retryCount, 3);
2732
}
2833

2934
- (void)testPreferenceSets {
30-
BNCPreferenceHelper *prefHelper = [[BNCPreferenceHelper alloc] init];
35+
self.prefHelper.retryCount = NSIntegerMax;
36+
self.prefHelper.retryInterval = NSIntegerMax;
37+
self.prefHelper.timeout = NSIntegerMax;
3138

32-
prefHelper.retryCount = NSIntegerMax;
33-
prefHelper.retryInterval = NSIntegerMax;
34-
prefHelper.timeout = NSIntegerMax;
39+
XCTAssertEqual(self.prefHelper.retryCount, NSIntegerMax);
40+
XCTAssertEqual(self.prefHelper.retryInterval, NSIntegerMax);
41+
XCTAssertEqual(self.prefHelper.timeout, NSIntegerMax);
42+
}
43+
44+
- (void)testBlacklistURL {
45+
XCTAssertTrue([@"https://cdn.branch.io" isEqualToString:self.prefHelper.branchBlacklistURL]);
3546

36-
XCTAssertEqual(prefHelper.retryCount, NSIntegerMax);
37-
XCTAssertEqual(prefHelper.retryInterval, NSIntegerMax);
38-
XCTAssertEqual(prefHelper.timeout, NSIntegerMax);
47+
NSString *customBlacklistURL = @"https://blacklist.branch.io";
48+
self.prefHelper.branchBlacklistURL = customBlacklistURL;
49+
XCTAssertTrue([customBlacklistURL isEqualToString:self.prefHelper.branchBlacklistURL]);
3950
}
4051

4152
@end

Branch-SDK/Branch-SDK/BNCPreferenceHelper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
4646
@property (strong, nonatomic) NSString *browserUserAgentString;
4747
@property (strong, atomic) NSString *referringURL;
4848
@property (strong, atomic) NSString *branchAPIURL;
49+
@property (nonatomic, strong, readwrite) NSString *branchBlacklistURL;
4950
@property (assign, atomic) BOOL limitFacebookTracking;
5051
@property (strong, atomic) NSDate *previousAppBuildDate;
5152

Branch-SDK/Branch-SDK/BNCPreferenceHelper.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ - (id)init {
108108
_persistPrefsQueue = [[NSOperationQueue alloc] init];
109109
_persistPrefsQueue.maxConcurrentOperationCount = 1;
110110

111+
self.branchBlacklistURL = @"https://cdn.branch.io";
112+
111113
return self;
112114
}
113115

Branch-SDK/Branch-SDK/BNCURLBlackList.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ - (void) refreshBlackListFromServerWithCompletion:(void (^) (NSError*error, NSAr
123123
self.error = nil;
124124
NSString *urlString = [self.blackListJSONURL absoluteString];
125125
if (!urlString) {
126-
urlString = [NSString stringWithFormat:@"https://cdn.branch.io/sdk/uriskiplist_v%ld.json",
127-
(long) self.blackListVersion+1];
126+
urlString = [NSString stringWithFormat:@"%@/sdk/uriskiplist_v%ld.json", [BNCPreferenceHelper preferenceHelper].branchBlacklistURL, (long) self.blackListVersion+1];
128127
}
129128
NSMutableURLRequest *request =
130129
[NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString]

0 commit comments

Comments
 (0)