mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash

Browse Source 
fix crash by removing observer when operation finished
This commit is contained in:
Michael Chen 2018-09-05 13:22:43 -04:00
parent 05068ec879
commit 234143a416
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
View File

@ -17,6 +17,7 @@
@interface MVMCoreNavigationOperation () @interface MVMCoreNavigationOperation ()
@property (strong, nonatomic) MVMCoreNavigationObject *navigationObject; @property (strong, nonatomic) MVMCoreNavigationObject *navigationObject;
@property (strong, nonatomic) id animatedTransitioning;
@end @end
@ -217,6 +218,10 @@
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES]; [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES];
self.navigationObject.stopLoadingOverlay = NO; self.navigationObject.stopLoadingOverlay = NO;
} }
if (self.animatedTransitioning) {
[self.animatedTransitioning removeObserver:self forKeyPath:@"interactiveTransitionCanceled"];
self.animatedTransitioning = nil;
}
[super markAsFinished]; [super markAsFinished];
} }
@ -244,6 +249,7 @@
id animatedTransitioning = [self.delegate navigationController:navigationController animationControllerForOperation:operation fromViewController:fromVC toViewController:toVC]; id animatedTransitioning = [self.delegate navigationController:navigationController animationControllerForOperation:operation fromViewController:fromVC toViewController:toVC];
if ([animatedTransitioning conformsToProtocol:@protocol(MVMCoreViewControllerAnimatedTransitioning)]) { if ([animatedTransitioning conformsToProtocol:@protocol(MVMCoreViewControllerAnimatedTransitioning)]) {
[animatedTransitioning addObserver:self forKeyPath:@"interactiveTransitionCanceled" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil]; [animatedTransitioning addObserver:self forKeyPath:@"interactiveTransitionCanceled" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
self.animatedTransitioning = animatedTransitioning;
} }
return animatedTransitioning; return animatedTransitioning;
} else { } else {
@ -261,7 +267,6 @@
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context { - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
if ([keyPath isEqualToString:@"interactiveTransitionCanceled"]) { if ([keyPath isEqualToString:@"interactiveTransitionCanceled"]) {
[object removeObserver:self forKeyPath:@"interactiveTransitionCanceled"];
BOOL transitionCanceled = ((NSNumber *)change[NSKeyValueChangeNewKey]).boolValue; BOOL transitionCanceled = ((NSNumber *)change[NSKeyValueChangeNewKey]).boolValue;
if (transitionCanceled) { if (transitionCanceled) {
//When interactive transition canceled, the destination viewController should be removed from navigationController //When interactive transition canceled, the destination viewController should be removed from navigationController