Merge pull request #1976 from aritchie/issue-1972

Fix #1972 - allow restricted permissions for geolocation on android
xamarin · Apr 5, 2022 · 70ae013 · 70ae013
2 parents 101971f + 1d09035
commit 70ae013
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 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>();
+            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>();
+            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
@@ -29,6 +29,15 @@ internal static async Task EnsureGrantedAsync<TPermission>()
                 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]