Skip to content

Commit f59b00e

Browse files
ahmednawarahmednawar
authored
Merge pull request #411 from BranchMetrics/nullability-and-nonnull
Nullability and nonnull support for Swift
2 parents 8ef8c6e + c3ebac0 commit f59b00e

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

‎Branch-SDK/Branch-SDK/BNCCallbacks.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
@class BranchUniversalObject, BranchLinkProperties;
1313

14-
typedef void (^callbackWithParams) (NSDictionary *params, NSError *error);
15-
typedef void (^callbackWithUrl) (NSString *url, NSError *error);
16-
typedef void (^callbackWithStatus) (BOOL changed, NSError *error);
17-
typedef void (^callbackWithList) (NSArray *list, NSError *error);
18-
typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString *url, NSString *spotlightIdentifier, NSError *error);
19-
typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error);
14+
typedef void (^callbackWithParams) (NSDictionary * _Nonnull params, NSError * _Nullable error);
15+
typedef void (^callbackWithUrl) (NSString * _Nonnull url, NSError * _Nullable error);
16+
typedef void (^callbackWithStatus) (BOOL changed, NSError * _Nullable error);
17+
typedef void (^callbackWithList) (NSArray * _Nullable list, NSError * _Nullable error);
18+
typedef void (^callbackWithUrlAndSpotlightIdentifier) (NSString * _Nullable url, NSString * _Nullable spotlightIdentifier, NSError * _Nullable error);
19+
typedef void (^callbackWithBranchUniversalObject) (BranchUniversalObject * _Nonnull universalObject, BranchLinkProperties * _Nonnull linkProperties, NSError * _Nullable error);
2020

2121
#endif /* BNCCallbacks_h */

‎Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// Copyright © 2015 Branch Metrics. All rights reserved.
77
//
88

9+
#import "BNCPreferenceHelper.h"
910
#import "BNCContentDiscoveryManager.h"
1011
#import "BNCSystemObserver.h"
1112
#import "BNCError.h"
@@ -309,7 +310,7 @@ - (void)indexContentWithTitle:(NSString *)title
309310
if ([BNCSystemObserver getOSVersion].integerValue < 9) {
310311
NSError *error = [NSError errorWithDomain:BNCErrorDomain code:BNCVersionError userInfo:@{ NSLocalizedDescriptionKey: @"Cannot use CoreSpotlight indexing service prior to iOS 9" }];
311312
if (callback) {
312-
callback(nil, error);
313+
callback([BNCPreferenceHelper preferenceHelper].userUrl, error);
313314
}
314315
else if (spotlightCallback) {
315316
spotlightCallback(nil, nil, error);
@@ -319,7 +320,7 @@ - (void)indexContentWithTitle:(NSString *)title
319320
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 90000
320321
NSError *error = [NSError errorWithDomain:BNCErrorDomain code:BNCBadRequestError userInfo:@{ NSLocalizedDescriptionKey: @"CoreSpotlight is not available because the base SDK for this project is less than 9.0" }];
321322
if (callback) {
322-
callback(nil, error);
323+
callback([BNCPreferenceHelper preferenceHelper].userUrl, error);
323324
}
324325
else if (spotlightCallback) {
325326
spotlightCallback(nil, nil, error);
@@ -334,7 +335,7 @@ - (void)indexContentWithTitle:(NSString *)title
334335
if (!isIndexingAvailable) {
335336
NSError *error = [NSError errorWithDomain:BNCErrorDomain code:BNCVersionError userInfo:@{ NSLocalizedDescriptionKey: @"Cannot use CoreSpotlight indexing service on this device/OS" }];
336337
if (callback) {
337-
callback(nil, error);
338+
callback([BNCPreferenceHelper preferenceHelper].userUrl, error);
338339
}
339340
else if (spotlightCallback) {
340341
spotlightCallback(nil, nil, error);
@@ -345,7 +346,7 @@ - (void)indexContentWithTitle:(NSString *)title
345346
if (!title) {
346347
NSError *error = [NSError errorWithDomain:BNCErrorDomain code:BNCBadRequestError userInfo:@{ NSLocalizedDescriptionKey: @"Spotlight Indexing requires a title" }];
347348
if (callback) {
348-
callback(nil, error);
349+
callback([BNCPreferenceHelper preferenceHelper].userUrl, error);
349350
}
350351
else if (spotlightCallback) {
351352
spotlightCallback(nil, nil, error);
@@ -397,7 +398,7 @@ - (void)indexContentWithTitle:(NSString *)title
397398
[[Branch getInstance] getSpotlightUrlWithParams:spotlightLinkData callback:^(NSDictionary *data, NSError *urlError) {
398399
if (urlError) {
399400
if (callback) {
400-
callback(nil, urlError);
401+
callback([BNCPreferenceHelper preferenceHelper].userUrl, urlError);
401402
}
402403
else if (spotlightCallback) {
403404
spotlightCallback(nil, nil, urlError);
@@ -481,7 +482,7 @@ - (void)indexContentWithUrl:(NSString *)url spotlightIdentifier:(NSString *)spot
481482
if (callback || spotlightCallback) {
482483
if (indexError) {
483484
if (callback) {
484-
callback(nil, indexError);
485+
callback([BNCPreferenceHelper preferenceHelper].userUrl, indexError);
485486
}
486487
else if (spotlightCallback) {
487488
spotlightCallback(nil, nil, indexError);

‎Branch-SDK/Branch-SDK/Branch.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ - (void)createDiscoverableContentWithTitle:(NSString *)title description:(NSStri
871871
[self.contentDiscoveryManager indexContentWithTitle:title description:description publiclyIndexable:publiclyIndexable type:type thumbnailUrl:thumbnailUrl keywords:keywords userInfo:linkParams expirationDate:expirationDate callback:callback];
872872
}
873873

874-
//Use this with iOS 9+ only
874+
// Use this with iOS 9+ only
875875
- (void)createDiscoverableContentWithTitle:(NSString *)title description:(NSString *)description thumbnailUrl:(NSURL *)thumbnailUrl linkParams:(NSDictionary *)linkParams type:(NSString *)type publiclyIndexable:(BOOL)publiclyIndexable keywords:(NSSet *)keywords expirationDate:(NSDate *)expirationDate spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback {
876876
[self.contentDiscoveryManager indexContentWithTitle:title description:description publiclyIndexable:publiclyIndexable type:type thumbnailUrl:thumbnailUrl keywords:keywords userInfo:linkParams expirationDate:expirationDate callback:nil spotlightCallback:spotlightCallback];
877877
}

‎Branch-SDK/Branch-SDK/BranchUniversalObject.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ - (void)registerView {
6161
- (void)registerViewWithCallback:(callbackWithParams)callback {
6262
if (!self.canonicalIdentifier && !self.title) {
6363
if (callback) {
64-
callback(nil, [NSError errorWithDomain:BNCErrorDomain
64+
callback([[NSDictionary alloc] init], [NSError errorWithDomain:BNCErrorDomain
6565
code:BNCInitError
6666
userInfo:@{ NSLocalizedDescriptionKey: @"A canonicalIdentifier or title are required to uniquely identify content, so could not register view." }]);
6767
}
@@ -94,7 +94,7 @@ - (NSString *)getShortUrlWithLinkProperties:(BranchLinkProperties *)linkProperti
9494
- (void)getShortUrlWithLinkProperties:(BranchLinkProperties *)linkProperties andCallback:(callbackWithUrl)callback {
9595
if (!self.canonicalIdentifier && !self.title) {
9696
if (callback) {
97-
callback(nil, [NSError errorWithDomain:BNCErrorDomain code:BNCInitError userInfo:@{ NSLocalizedDescriptionKey: @"A canonicalIdentifier or title are required to uniquely identify content, so could not generate a URL." }]);
97+
callback([BNCPreferenceHelper preferenceHelper].userUrl, [NSError errorWithDomain:BNCErrorDomain code:BNCInitError userInfo:@{ NSLocalizedDescriptionKey: @"A canonicalIdentifier or title are required to uniquely identify content, so could not generate a URL." }]);
9898
}
9999
else {
100100
[_preferenceHelper logWarning:@"A canonicalIdentifier or title are required to uniquely identify content, so could not generate a URL."];

‎Branch-SDK/Branch-SDK/Requests/BranchRegisterViewRequest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key ca
5353
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
5454
if (error) {
5555
if (self.callback) {
56-
self.callback(nil, error);
56+
self.callback([[NSDictionary alloc] init], error);
5757
}
5858
return;
5959
}

‎Branch-SDK/Branch-SDK/Requests/BranchSetIdentityRequest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key ca
4646
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
4747
if (error) {
4848
if (self.callback && self.shouldCallCallback) {
49-
self.callback(nil, error);
49+
self.callback([[NSDictionary alloc] init], error);
5050
}
5151

5252
self.shouldCallCallback = NO; // don't call the callback next time around

‎Branch-SDK/Branch-SDK/Requests/BranchSpotlightUrlRequest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ - (id)initWithParams:(NSDictionary *)params callback:(callbackWithParams)callbac
3131
- (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
3232
if (error) {
3333
if (self.spotlightCallback) {
34-
self.spotlightCallback(nil, error);
34+
self.spotlightCallback([[NSDictionary alloc] init], error);
3535
}
3636
}
3737
else if (self.spotlightCallback) {

0 commit comments

Comments
 (0)