Remove invalidate observer instead of re-adding observer in DeviceInfo module (facebook#43737)

zhongwuzw · Saadnajmi · commit 24e46673f599 · 2024-05-24T15:12:14.000-05:00
Summary: Previous fix brings in facebook#42396. Seems it's a mistake to re-add observer? So let's remove it and also not `invalidate` method not be called twice. [IOS] [FIXED] - Remove invalidate observer instead of re-adding observer in DeviceInfo module Pull Request resolved: facebook#43737 Test Plan: Fix for facebook#42120 also works. Reviewed By: javache Differential Revision: D55692219 Pulled By: cipolleschi fbshipit-source-id: dba1ddc39a9f2611fc2b84fadf8c23827891379a
diff --git a/packages/react-native/React/CoreModules/RCTDeviceInfo.mm b/packages/react-native/React/CoreModules/RCTDeviceInfo.mm
@@ -98,6 +98,9 @@ - (void)initialize
 
 - (void)invalidate
 {
+  if (_invalidated) {
+    return;
+  }
   _invalidated = YES;
   [self _cleanupObservers];
 }
@@ -118,10 +121,7 @@ - (void)_cleanupObservers
 
   [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];
 
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(invalidate)
-                                               name:RCTBridgeWillInvalidateModulesNotification
-                                             object:nil];
+  [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
 }
 
 static BOOL RCTIsIPhoneNotched()

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ - (void)initialize`
`98`	`98`
`99`	`99`	`- (void)invalidate`
`100`	`100`	`{`
	`101`	`+ if (_invalidated) {`
	`102`	`+ return;`
	`103`	`+ }`
`101`	`104`	`_invalidated = YES;`
`102`	`105`	`[self _cleanupObservers];`
`103`	`106`	`}`
`@@ -118,10 +121,7 @@ - (void)_cleanupObservers`
`118`	`121`
`119`	`122`	`[[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];`
`120`	`123`
`121`		`- [[NSNotificationCenter defaultCenter] addObserver:self`
`122`		`- selector:@selector(invalidate)`
`123`		`- name:RCTBridgeWillInvalidateModulesNotification`
`124`		`- object:nil];`
	`124`	`+ [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`static BOOL RCTIsIPhoneNotched()`