Merge pull request #276 from xamarin/bug/issues-272

GH-272 Fix Null Exception on Location Updates. Closes #272
xamarin · Jun 4, 2018 · 35a418e · 35a418e
2 parents 2600424 + 633ffbd
commit 35a418e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 28 deletions.
diff --git a/Xamarin.Essentials/Geolocation/Geolocation.android.cs b/Xamarin.Essentials/Geolocation/Geolocation.android.cs
@@ -30,10 +30,7 @@ static async Task<Location> PlatformLastKnownLocationAsync()
                     bestLocation = location;
             }
 
-            if (bestLocation == null)
-                return null;
-
-            return bestLocation.ToLocation();
+            return bestLocation?.ToLocation();
         }
 
         static async Task<Location> PlatformLocationAsync(GeolocationRequest request, CancellationToken cancellationToken)

diff --git a/Xamarin.Essentials/Geolocation/Geolocation.ios.cs b/Xamarin.Essentials/Geolocation/Geolocation.ios.cs
@@ -19,7 +19,7 @@ static async Task<Location> PlatformLastKnownLocationAsync()
             var manager = new CLLocationManager();
             var location = manager.Location;
 
-            return location.ToLocation();
+            return location?.ToLocation();
         }
 
         static async Task<Location> PlatformLocationAsync(GeolocationRequest request, CancellationToken cancellationToken)
@@ -49,10 +49,7 @@ static async Task<Location> PlatformLocationAsync(GeolocationRequest request, Ca
 
             var clLocation = await tcs.Task;
 
-            if (clLocation == null)
-                return null;
-
-            return clLocation.ToLocation();
+            return clLocation?.ToLocation();
 
             void HandleLocation(CLLocation location)
             {
@@ -81,7 +78,7 @@ public override void LocationsUpdated(CLLocationManager manager, CLLocation[] lo
 
             wasRaised = true;
 
-            var location = locations.LastOrDefault();
+            var location = locations?.LastOrDefault();
 
             if (location == null)
                 return;

diff --git a/Xamarin.Essentials/Geolocation/Geolocation.uwp.cs b/Xamarin.Essentials/Geolocation/Geolocation.uwp.cs
@@ -20,10 +20,7 @@ static async Task<Location> PlatformLastKnownLocationAsync()
 
             var location = await geolocator.GetGeopositionAsync().AsTask();
 
-            if (location?.Coordinate == null)
-                return null;
-
-            return location.ToLocation();
+            return location?.Coordinate?.ToLocation();
         }
 
         static async Task<Location> PlatformLocationAsync(GeolocationRequest request, CancellationToken cancellationToken)
@@ -39,16 +36,7 @@ static async Task<Location> PlatformLocationAsync(GeolocationRequest request, Ca
 
             var location = await geolocator.GetGeopositionAsync().AsTask(cancellationToken);
 
-            if (location?.Coordinate == null)
-                return null;
-
-            return new Location
-            {
-                Latitude = location.Coordinate.Point.Position.Latitude,
-                Longitude = location.Coordinate.Point.Position.Longitude,
-                TimestampUtc = location.Coordinate.Timestamp,
-                Accuracy = location.Coordinate.Accuracy
-            };
+            return location?.Coordinate?.ToLocation();
         }
     }
 }
diff --git a/Xamarin.Essentials/Types/LocationExtensions.uwp.cs b/Xamarin.Essentials/Types/LocationExtensions.uwp.cs
@@ -23,12 +23,21 @@ public static partial class LocationExtensions
             result?.ToLocations();
 
         internal static Location ToLocation(this Geoposition location) =>
+            new Location
+            {
+                Latitude = location.Coordinate.Point.Position.Latitude,
+                Longitude = location.Coordinate.Point.Position.Longitude,
+                TimestampUtc = location.Coordinate.Timestamp,
+                Accuracy = location.Coordinate.Accuracy
+            };
+
+        internal static Location ToLocation(this Geocoordinate coordinate) =>
              new Location
              {
-                 Latitude = location.Coordinate.Point.Position.Latitude,
-                 Longitude = location.Coordinate.Point.Position.Longitude,
-                 TimestampUtc = location.Coordinate.Timestamp,
-                 Accuracy = location.Coordinate.Accuracy
+                 Latitude = coordinate.Point.Position.Latitude,
+                 Longitude = coordinate.Point.Position.Longitude,
+                 TimestampUtc = coordinate.Timestamp,
+                 Accuracy = coordinate.Accuracy
              };
     }
 }