Add mroe null checks in LocationAuthCallback Should Fix xamarin#740 (x…

…amarin#748)
Mrnikbobjeff · Aug 28, 2019 · c7fa246 · c7fa246
1 parent 7cd61c4
commit c7fa246
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Xamarin.Essentials/Permissions/Permissions.ios.cs b/Xamarin.Essentials/Permissions/Permissions.ios.cs
@@ -95,12 +95,14 @@ static Task<PermissionStatus> RequestLocationAsync()
 
             void LocationAuthCallback(object sender, CLAuthorizationChangedEventArgs e)
             {
-                if (e.Status == CLAuthorizationStatus.NotDetermined)
+                if (e?.Status == null || e.Status == CLAuthorizationStatus.NotDetermined)
                     return;
 
-                locationManager.AuthorizationChanged -= LocationAuthCallback;
-                tcs.TrySetResult(GetLocationStatus());
-                locationManager.Dispose();
+                if (locationManager != null)
+                    locationManager.AuthorizationChanged -= LocationAuthCallback;
+
+                tcs?.TrySetResult(GetLocationStatus());
+                locationManager?.Dispose();
                 locationManager = null;
             }
         }