mitigates potential dismiss button related crashes for inapps

CleverTap · Apr 2, 2024 · ee52f07 · ee52f07
1 parent 94db7cf
commit ee52f07
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/CleverTapSDK/CTInAppDisplayViewController.m b/CleverTapSDK/CTInAppDisplayViewController.m
@@ -159,22 +159,26 @@ - (void)showFromWindow:(BOOL)animated {
 }
 
 - (void)hideFromWindow:(BOOL)animated {
-    void (^completionBlock)(void) = ^ {
-        [self.window removeFromSuperview];
-        self.window = nil;
-        if (self.delegate && [self.delegate respondsToSelector:@selector(notificationDidDismiss:fromViewController:)]) {
-            [self.delegate notificationDidDismiss:self.notification fromViewController:self];
+    __weak typeof(self) weakSelf = self;
+    void (^completionBlock)(void) = ^{
+        typeof(self) strongSelf = weakSelf;
+        if (!strongSelf) {
+            return;
+        }
+        [strongSelf.window removeFromSuperview];
+        strongSelf.window = nil;
+        if (strongSelf.delegate && [strongSelf.delegate respondsToSelector:@selector(notificationDidDismiss:fromViewController:)]) {
+            [strongSelf.delegate notificationDidDismiss:strongSelf.notification fromViewController:strongSelf];
         }
     };
 
     if (animated) {
         [UIView animateWithDuration:0.25 animations:^{
-            self.window.alpha = 0;
+            weakSelf.window.alpha = 0;
         } completion:^(BOOL finished) {
             completionBlock();
         }];
-    }
-    else {
+    } else {
         completionBlock();
     }
 }

diff --git a/CleverTapSDK/InApps/CTInAppHTMLViewController.m b/CleverTapSDK/InApps/CTInAppHTMLViewController.m
@@ -520,28 +520,6 @@ - (void)showFromWindow:(BOOL)animated {
     }
 }
 
-- (void)hideFromWindow:(BOOL)animated {
-    void (^completionBlock)(void) = ^ {
-        [self.window removeFromSuperview];
-        self.window = nil;
-        if (self.delegate && [self.delegate respondsToSelector:@selector(notificationDidDismiss:fromViewController:)]) {
-            [self.delegate notificationDidDismiss:self.notification fromViewController:self];
-        }
-    };
-
-    if (animated) {
-        [UIView animateWithDuration:0.25 animations:^{
-            self.window.alpha = 0;
-        } completion:^(BOOL finished) {
-            completionBlock();
-        }];
-    }
-    else {
-        completionBlock();
-    }
-}
-
-
 #pragma mark - Public
 
 - (void)show:(BOOL)animated {