Internal fix

JazysYu · Nov 24, 2017 · cfc0ac4 · cfc0ac4
1 parent 43f4c6e
commit cfc0ac4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/JZNavigationExtension/Private/_JZ-objc-internal.m b/JZNavigationExtension/Private/_JZ-objc-internal.m
@@ -44,7 +44,10 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event {
 }
 
 - (UIView *)jz_backgroundView {
-    return [self valueForKeyPath:@"_backgroundView._backgroundEffectView"];
+    if (@available(iOS 10, *)) {
+        return [self valueForKeyPath:@"_backgroundView._backgroundEffectView"];
+    }
+    return [self valueForKeyPath:@"_backgroundView"];
 }
 
 @end

diff --git a/JZNavigationExtension/Private/_JZNavigationDelegating.h b/JZNavigationExtension/Private/_JZNavigationDelegating.h
@@ -10,6 +10,8 @@
 
 @interface _JZNavigationDelegating : NSObject <UINavigationControllerDelegate, UIGestureRecognizerDelegate>
 
+- (instancetype)initWithActionsPerformInDealloc:(dispatch_block_t)actionsPerformInDealloc;
+
 - (instancetype)initWithNavigationController:(UINavigationController *)navigationController;
 
 @end
diff --git a/JZNavigationExtension/Private/_JZNavigationDelegating.m b/JZNavigationExtension/Private/_JZNavigationDelegating.m
@@ -13,10 +13,23 @@
 
 @interface _JZNavigationDelegating()
 @property (nonatomic, weak) UINavigationController *navigationController;
+@property (nonatomic, copy) dispatch_block_t actionsPerformInDealloc;
 @end
 
 @implementation _JZNavigationDelegating
 
+- (void)dealloc {
+    !self.actionsPerformInDealloc ?: self.actionsPerformInDealloc();
+}
+
+- (instancetype)initWithActionsPerformInDealloc:(dispatch_block_t)actionsPerformInDealloc {
+    self = [super init];
+    if (self) {
+        self.actionsPerformInDealloc = actionsPerformInDealloc;
+    }
+    return self;
+}
+
 - (instancetype)initWithNavigationController:(UINavigationController *)navigationController {
     self = [super init];
     if (self) {

diff --git a/JZNavigationExtension/UINavigationController+JZExtension.m b/JZNavigationExtension/UINavigationController+JZExtension.m
@@ -67,7 +67,10 @@ - (void)jz_setDelegate:(NSObject <UINavigationControllerDelegate> *)delegate {
     static NSString *_JZNavigationDelegatingTrigger = @"_JZNavigationDelegatingTrigger";
 
     if (![self.delegate isEqual:self.jz_navigationDelegate]) {
-        [(NSObject *)self.delegate removeObserver:self forKeyPath:_JZNavigationDelegatingTrigger context:_cmd];
+        objc_setAssociatedObject(self.delegate, _cmd, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        @try { [(NSObject *)self.delegate removeObserver:self.delegate forKeyPath:_JZNavigationDelegatingTrigger context:_cmd]; }
+        @catch (NSException *exception) {
+        }
     }
 
     if (!delegate) {
@@ -78,7 +81,14 @@ - (void)jz_setDelegate:(NSObject <UINavigationControllerDelegate> *)delegate {
 
         NSAssert([delegate isKindOfClass:[NSObject class]], @"Must inherit form NSObject!");
 
-        [delegate addObserver:self forKeyPath:_JZNavigationDelegatingTrigger options:NSKeyValueObservingOptionNew context:_cmd];
+        [delegate addObserver:delegate forKeyPath:_JZNavigationDelegatingTrigger options:NSKeyValueObservingOptionNew context:_cmd];
+
+        __unsafe_unretained typeof(delegate) unretained_delegate = delegate;
+        objc_setAssociatedObject(delegate, _cmd, [[_JZNavigationDelegating alloc] initWithActionsPerformInDealloc:^{
+            @try { [unretained_delegate removeObserver:unretained_delegate forKeyPath:_JZNavigationDelegatingTrigger context:_cmd]; }
+            @catch (NSException *exception) {
+            }
+        }], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 
         void (^jz_add_replace_method)(id, SEL, IMP) = ^(id object, SEL sel, IMP imp) {