Skip to content

Forward route completion handler #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 31, 2016
Merged

Forward route completion handler #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7c9f54
Instead of storing the completion handler, we forward it instead. Als…
lxcid Feb 19, 2015
4e2aec9
update PR#31
Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions DeepLinkKit/Router/DPLDeepLinkRouter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@interface DPLDeepLinkRouter ()

@property (nonatomic, copy) DPLApplicationCanHandleDeepLinksBlock applicationCanHandleDeepLinksBlock;
@property (nonatomic, copy) DPLRouteCompletionBlock routeCompletionHandler;

@property (nonatomic, strong) NSMutableOrderedSet *routes;
@property (nonatomic, strong) NSMutableDictionary *classesByRoute;
Expand Down Expand Up @@ -106,13 +105,12 @@ - (void)setObject:(id)obj forKeyedSubscript:(NSString *)key {
#pragma mark - Routing Deep Links

- (BOOL)handleURL:(NSURL *)url withCompletion:(DPLRouteCompletionBlock)completionHandler {
self.routeCompletionHandler = completionHandler;
if (!url) {
return NO;
}

if (![self applicationCanHandleDeepLinks]) {
[self completeRouteWithSuccess:NO error:nil];
[self completeRouteWithSuccess:NO error:nil completionHandler:completionHandler];
return NO;
}

Expand All @@ -133,7 +131,7 @@ - (BOOL)handleURL:(NSURL *)url withCompletion:(DPLRouteCompletionBlock)completio
error = [NSError errorWithDomain:DPLErrorDomain code:DPLRouteNotFoundError userInfo:userInfo];
}

[self completeRouteWithSuccess:isHandled error:error];
[self completeRouteWithSuccess:isHandled error:error completionHandler:completionHandler];

return isHandled;
}
Expand Down Expand Up @@ -186,13 +184,12 @@ - (BOOL)handleRoute:(NSString *)route withDeepLink:(DPLDeepLink *)deepLink error
}


- (void)completeRouteWithSuccess:(BOOL)handled error:(NSError *)error {

dispatch_async(dispatch_get_main_queue(), ^{
if (self.routeCompletionHandler) {
self.routeCompletionHandler(handled, error);
}
});
- (void)completeRouteWithSuccess:(BOOL)handled error:(NSError *)error completionHandler:(DPLRouteCompletionBlock)completionHandler {
if (completionHandler) {
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(handled, error);
});
}
}

@end