Merge pull request #4536 from vishalduggal/timob-14292-31X

[TIMOB-14292] (3_1_X) Avoid race condition on view detach
tidev · Aug 6, 2013 · 78d4077 · 78d4077
2 parents 6e75100 + 8c20992
commit 78d4077
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/iphone/Classes/TiUITableView.h b/iphone/Classes/TiUITableView.h
@@ -70,8 +70,11 @@
 	NSInteger frameChanges;
     TiViewProxy* headerViewProxy;
     TiViewProxy* footerViewProxy;
+    BOOL viewWillDetach;
 }
 
+@property (nonatomic, assign) BOOL viewWillDetach;
+
 #pragma mark Framework
 -(CGFloat)tableRowHeight:(CGFloat)height;
 -(NSInteger)indexForRow:(TiUITableViewRowProxy*)row;

diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -293,7 +293,7 @@ -(void) setSelectedBackgroundGradient_:(TiGradient *)newGradient
 
 @implementation TiUITableView
 #pragma mark Internal 
-@synthesize searchString;
+@synthesize searchString, viewWillDetach;
 
 -(id)init
 {
@@ -1260,7 +1260,11 @@ -(CGFloat)contentHeightForWidth:(CGFloat)suggestedWidth
 
 -(void)hideSearchScreen:(id)sender
 {
-	// check to make sure we're not in the middle of a layout, in which case we 
+    if (viewWillDetach) {
+        return;
+    }
+
+	// check to make sure we're not in the middle of a layout, in which case we
 	// want to try later or we'll get weird drawing animation issues
 	if (tableview.frame.size.width==0)
 	{
@@ -1290,6 +1294,10 @@ -(void)hideSearchScreen:(id)sender
     // because of where the hide might be triggered from.
 
 
+    if (viewWillDetach) {
+        return;
+    }
+    searchActivated = NO;
     NSArray* visibleRows = [tableview indexPathsForVisibleRows];
     [tableview reloadRowsAtIndexPaths:visibleRows withRowAnimation:UITableViewRowAnimationNone];
 
@@ -2428,6 +2436,10 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 
 - (void) searchDisplayControllerDidEndSearch:(UISearchDisplayController *)controller
 {
+    if (viewWillDetach) {
+        return;
+    }
+
     animateHide = YES;
     [self performSelector:@selector(hideSearchScreen:) withObject:nil afterDelay:0.2];
 }

diff --git a/iphone/Classes/TiUITableViewProxy.m b/iphone/Classes/TiUITableViewProxy.m
@@ -66,6 +66,7 @@ -(TiUITableView*)tableView
 
 -(void)viewWillDetach
 {
+    ((TiUITableView*)[self view]).viewWillDetach = YES;
     for (TiUITableViewSectionProxy* section in sections) {
         for (TiUITableViewRowProxy* row in [section rows]) {
             [row detachView];
@@ -77,7 +78,8 @@ -(void)viewWillDetach
 
 -(void)viewDidAttach
 {
-	TiUITableView * ourView = (TiUITableView *)[self view];
+    TiUITableView * ourView = (TiUITableView *)[self view];
+    ourView.viewWillDetach = NO;
     for (TiUITableViewSectionProxy* section in sections) {
 		[section setTable:ourView];
     }