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

zhongwuzw · gabrieldonadel · commit 9db3eb686201 · 2024-07-01T14:15:28.000-03:00
Summary: Previous fix brings in #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: #43737 Test Plan: Fix for #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
@@ -89,6 +89,9 @@ - (void)initialize
 
 - (void)invalidate
 {
+  if (_invalidated) {
+    return;
+  }
   _invalidated = YES;
   [self _cleanupObservers];
 }
@@ -109,10 +112,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
`@@ -89,6 +89,9 @@ - (void)initialize`
`89`	`89`
`90`	`90`	`- (void)invalidate`
`91`	`91`	`{`
	`92`	`+ if (_invalidated) {`
	`93`	`+ return;`
	`94`	`+ }`
`92`	`95`	`_invalidated = YES;`
`93`	`96`	`[self _cleanupObservers];`
`94`	`97`	`}`
`@@ -109,10 +112,7 @@ - (void)_cleanupObservers`
`109`	`112`
`110`	`113`	`[[NSNotificationCenter defaultCenter] removeObserver:self name:RCTWindowFrameDidChangeNotification object:nil];`
`111`	`114`
`112`		`- [[NSNotificationCenter defaultCenter] addObserver:self`
`113`		`- selector:@selector(invalidate)`
`114`		`- name:RCTBridgeWillInvalidateModulesNotification`
`115`		`- object:nil];`
	`115`	`+ [[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`static BOOL RCTIsIPhoneNotched()`