Merge pull request #2787 from srahim/timob-10041.addition-2_1_X

[Timob-10041]Ensure trackSignificatLocationUpdate is only used on devices that support it.
tidev · Aug 21, 2012 · 3046311 · 3046311
2 parents 3fb158e + 50cd81e
commit 3046311
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/iphone/Classes/GeolocationModule.mm b/iphone/Classes/GeolocationModule.mm
@@ -622,22 +622,27 @@ -(NSNumber*)trackSignificantLocationChange
 
 -(void)setTrackSignificantLocationChange:(id)value
 {
-    BOOL newval = [TiUtils boolValue:value def:YES];
-
-    if (newval != trackSignificantLocationChange) {
-        if ( trackingLocation && locationManager != nil ) {
-            [lock lock];
-            [self shutdownLocationManager];
-            trackingHeading = NO;
-            trackingLocation = NO;
-            trackSignificantLocationChange = newval;
-            [lock unlock];
-            TiThreadPerformOnMainThread(^{[self startStopLocationManagerIfNeeded];}, NO);
-            return ;
+    if ([CLLocationManager significantLocationChangeMonitoringAvailable]) {
+        BOOL newval = [TiUtils boolValue:value def:YES];
+
+        if (newval != trackSignificantLocationChange) {
+            if ( trackingLocation && locationManager != nil ) {
+                [lock lock];
+                [self shutdownLocationManager];
+                trackingHeading = NO;
+                trackingLocation = NO;
+                trackSignificantLocationChange = newval;
+                [lock unlock];
+                TiThreadPerformOnMainThread(^{[self startStopLocationManagerIfNeeded];}, NO);
+                return ;
+            }
         }
+        trackSignificantLocationChange = newval;
+    }
+    else{
+        trackSignificantLocationChange = NO;
+        DebugLog(@"[WARN] Ti.Geolocation.setTrackSignificantLocationChange is not supported on this device.");
     }
-
-    trackSignificantLocationChange = newval;
 }
 
 -(void)restart:(id)arg