Need to cache locationmanager or dialog dissapears (#1072)

xamarin · Jan 31, 2020 · 72447a0 · 72447a0
1 parent c7b4a54
commit 72447a0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Xamarin.Essentials/Permissions/Permissions.ios.tvos.watchos.cs b/Xamarin.Essentials/Permissions/Permissions.ios.tvos.watchos.cs
@@ -125,9 +125,11 @@ internal static PermissionStatus GetLocationStatus(bool whenInUse)
                 };
             }
 
+            static CLLocationManager locationManager;
+
             internal static Task<PermissionStatus> RequestLocationAsync(bool whenInUse, Action<CLLocationManager> invokeRequest)
             {
-                var locationManager = new CLLocationManager();
+                locationManager = new CLLocationManager();
 
                 var tcs = new TaskCompletionSource<PermissionStatus>(locationManager);
 
@@ -155,6 +157,8 @@ void LocationAuthCallback(object sender, CLAuthorizationChangedEventArgs e)
                                 {
                                     locationManager.AuthorizationChanged -= LocationAuthCallback;
                                     tcs.TrySetResult(GetLocationStatus(whenInUse));
+                                    locationManager.Dispose();
+                                    locationManager = null;
                                 }
                             });
                             return;
@@ -164,6 +168,8 @@ void LocationAuthCallback(object sender, CLAuthorizationChangedEventArgs e)
                     locationManager.AuthorizationChanged -= LocationAuthCallback;
 
                     tcs.TrySetResult(GetLocationStatus(whenInUse));
+                    locationManager.Dispose();
+                    locationManager = null;
                 }
             }
         }