Rename method to EnsureGrantedOrRestrictedAsync

xamarin · Apr 4, 2022 · a3006b0 · a3006b0
1 parent afff2ed
commit a3006b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Xamarin.Essentials/Geolocation/Geolocation.android.cs b/Xamarin.Essentials/Geolocation/Geolocation.android.cs
@@ -19,7 +19,7 @@ public static partial class Geolocation
 
         static async Task<Location> PlatformLastKnownLocationAsync()
         {
-            await Permissions.EnsureGrantedAsync<Permissions.LocationWhenInUse>(true);
+            await Permissions.EnsureGrantedOrRestrictedAsync<Permissions.LocationWhenInUse>();
 
             var lm = Platform.LocationManager;
             AndroidLocation bestLocation = null;
@@ -37,7 +37,7 @@ static async Task<Location> PlatformLastKnownLocationAsync()
 
         static async Task<Location> PlatformLocationAsync(GeolocationRequest request, CancellationToken cancellationToken)
         {
-            await Permissions.EnsureGrantedAsync<Permissions.LocationWhenInUse>(true);
+            await Permissions.EnsureGrantedOrRestrictedAsync<Permissions.LocationWhenInUse>();
 
             var locationManager = Platform.LocationManager;
 

diff --git a/Xamarin.Essentials/Permissions/Permissions.shared.cs b/Xamarin.Essentials/Permissions/Permissions.shared.cs
@@ -20,15 +20,24 @@ internal static void EnsureDeclared<TPermission>()
             where TPermission : BasePermission, new() =>
                 new TPermission().EnsureDeclared();
 
-        internal static async Task EnsureGrantedAsync<TPermission>(bool allowRestricted = false)
+        internal static async Task EnsureGrantedAsync<TPermission>()
             where TPermission : BasePermission, new()
         {
             var status = await RequestAsync<TPermission>();
 
-            if (status != PermissionStatus.Granted || (allowRestricted && status == PermissionStatus.Restricted))
+            if (status != PermissionStatus.Granted)
                 throw new PermissionException($"{typeof(TPermission).Name} permission was not granted: {status}");
         }
 
+        internal static async Task EnsureGrantedOrRestrictedAsync<TPermission>()
+            where TPermission : BasePermission, new()
+        {
+            var status = await RequestAsync<TPermission>();
+
+            if (status != PermissionStatus.Granted && status != PermissionStatus.Restricted)
+                throw new PermissionException($"{typeof(TPermission).Name} permission was not granted or restricted: {status}");
+        }
+
         public abstract partial class BasePermission
         {
             [Preserve]