Only handle accessibility notifications from the correct RCTAccessibilityManager

ide · facebook-github-bot-9 · commit cb8b656a82ad · 2015-10-08T04:00:41.000-07:00
Summary: When you reload and create a new bridge, one of the things that happens during setup is that the RCTAccessibilityManager fires a notification. The old bridge would receive this notification from the new bridge's RCTAccessibilityManager, which we don't want, especially because the two are running on different shadow queues. I believe this led to a gnarly crash in NSConcreteTextStorage because RCTMeasure in RCTShadowText.m was getting called for the old RCTText (getting destroyed) from a notification fired from the new shadow queue. The fix is for the UIManager to handle notifications only from its bridge's RCTAccessibilityManager. See #2001 for the kinds of crashes we were seeing. Closes react/react-native#3279 Reviewed By: @​svcscm Differential Revision: D2521652 Pulled By: @nicklockwood fb-gh-sync-id: a4ffe3ef8304667727e573e2a2e8b716e1d2f3e1
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
@@ -229,20 +229,10 @@ - (instancetype)init
     _rootViewTags = [NSMutableSet new];
 
     _bridgeTransactionListeners = [NSMutableSet new];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(didReceiveNewContentSizeMultiplier)
-                                                 name:RCTAccessibilityManagerDidUpdateMultiplierNotification
-                                               object:nil];
   }
   return self;
 }
 
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 - (void)didReceiveNewContentSizeMultiplier
 {
   __weak RCTUIManager *weakSelf = self;
@@ -276,6 +266,8 @@ - (void)invalidate
     [_pendingUIBlocksLock lock];
     _pendingUIBlocks = nil;
     [_pendingUIBlocksLock unlock];
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
   });
 }
 
@@ -296,6 +288,11 @@ - (void)setBridge:(RCTBridge *)bridge
   }
 
   _componentDataByName = [componentDataByName copy];
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(didReceiveNewContentSizeMultiplier)
+                                               name:RCTAccessibilityManagerDidUpdateMultiplierNotification
+                                             object:_bridge.accessibilityManager];
 }
 
 - (dispatch_queue_t)methodQueue
