[GeoLocation] invalidate timer after success or error callback

henter · henter · commit 2a76ca635e65 · 2015-05-26T14:59:14.000-08:00
Summary: Just trying to [getCurrentPosition](https://github.com/facebook/react-native/blob/master/Libraries/Geolocation/Geolocation.js#L45) , and found the `errorBlock` of location request in timeout handler would cause red error like this: ``` 2015-05-10 17:50:39.607 [warn][tid:com.facebook.React.JavaScript] "Warning: Cannot find callback with CBID 5. Native module may have invoked both the success callback and the error callback." 2015-05-10 17:50:39.610 [error][tid:com.facebook.React.JavaScript] "Error: null is not an object (evaluating 'cb.apply') stack: _invokeCallback index.ios.bundle:7593 <unknown> index.ios.bundle:7656 <unknown> index.ios.bundle:7648 perform index.ios.bundle:6157 batchedUpdates index.ios.bundle:13786 batchedUpdates index.ios.bundle:4689 <unknown> index.ios.bundle:7647 applyWithGuard index.ios.bundle:882 guardReturn index.ios.bundle:7421 processBatch index.ios.bundle:7646 URL: http://192.168.100.182:8081/index Closes facebook/react-native#1226 Github Author: henter <henter@henter.me> Test Plan: Imported from GitHub, without a `Test Plan:` line.
diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m
@@ -85,7 +85,9 @@ @implementation RCTLocationRequest
 
 - (void)dealloc
 {
-  [_timeoutTimer invalidate];
+  if (_timeoutTimer.valid) {
+    [_timeoutTimer invalidate];
+  }
 }
 
 @end
@@ -273,6 +275,7 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray
   // Fire all queued callbacks
   for (RCTLocationRequest *request in _pendingRequests) {
     request.successBlock(@[_lastLocationEvent]);
+    [request.timeoutTimer invalidate];
   }
   [_pendingRequests removeAllObjects];
 
@@ -311,6 +314,7 @@ - (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *
   // Fire all queued error callbacks
   for (RCTLocationRequest *request in _pendingRequests) {
     request.errorBlock(@[jsError]);
+    [request.timeoutTimer invalidate];
   }
   [_pendingRequests removeAllObjects];
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,9 @@ @implementation RCTLocationRequest`
`85`	`85`
`86`	`86`	`- (void)dealloc`
`87`	`87`	`{`
`88`		`- [_timeoutTimer invalidate];`
	`88`	`+ if (_timeoutTimer.valid) {`
	`89`	`+ [_timeoutTimer invalidate];`
	`90`	`+ }`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`@end`
`@@ -273,6 +275,7 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray`
`273`	`275`	`// Fire all queued callbacks`
`274`	`276`	`for (RCTLocationRequest *request in _pendingRequests) {`
`275`	`277`	`request.successBlock(@[_lastLocationEvent]);`
	`278`	`+ [request.timeoutTimer invalidate];`
`276`	`279`	`}`
`277`	`280`	`[_pendingRequests removeAllObjects];`
`278`	`281`
`@@ -311,6 +314,7 @@ - (void)locationManager:(CLLocationManager )manager didFailWithError:(NSError `
`311`	`314`	`// Fire all queued error callbacks`
`312`	`315`	`for (RCTLocationRequest *request in _pendingRequests) {`
`313`	`316`	`request.errorBlock(@[jsError]);`
	`317`	`+ [request.timeoutTimer invalidate];`
`314`	`318`	`}`
`315`	`319`	`[_pendingRequests removeAllObjects];`
`316`	`320`