Permission updates

shinyorg · Dec 20, 2023 · d91bd4f · d91bd4f
1 parent a2f3c99
commit d91bd4f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/src/Shiny.Beacons/Platforms/Android/BeaconMonitoringManager.cs b/src/Shiny.Beacons/Platforms/Android/BeaconMonitoringManager.cs
@@ -91,7 +91,7 @@ public async Task<AccessState> RequestAccess()
             var result = await this.platform
                 .RequestFilteredPermissions(
                     new(P.ForegroundService, 31, null),
-                    new(AndroidPermissions.PostNotifications, 33, null) // this isn't required - we ask to be nice
+                    new(P.PostNotifications, 33, null) // this isn't required - we ask to be nice
                 )
                 .ToTask();
 

diff --git a/src/Shiny.Core/Platforms/Android/AndroidPermission.cs b/src/Shiny.Core/Platforms/Android/AndroidPermission.cs
@@ -12,6 +12,7 @@ public record AndroidPermission(
 /// </summary>
 public static class AndroidPermissions
 {
-        //Manifest.Permission.PostNotifications
-    public const string PostNotifications = "android.permission.POST_NOTIFICATIONS";
+    //Manifest.Permission.PostNotifications
+    //public const string PostNotifications = "android.permission.POST_NOTIFICATIONS";
+    public const string ForegroundServiceLocation = "android.permission.FOREGROUND_SERVICE_LOCATION";
 }
diff --git a/src/Shiny.Core/Platforms/Android/AndroidPlatform.cs b/src/Shiny.Core/Platforms/Android/AndroidPlatform.cs
@@ -110,7 +110,7 @@ public async Task<AccessState> RequestForegroundServicePermissions()
         {
             var results = await this.RequestPermissions(
                 Manifest.Permission.ForegroundService,
-                AndroidPermissions.PostNotifications
+                Manifest.Permission.PostNotifications
             );
             if (results.IsSuccess())
                 return AccessState.Available;

diff --git a/src/Shiny.Locations/Platforms/Android/AbstractGpsManager.cs b/src/Shiny.Locations/Platforms/Android/AbstractGpsManager.cs
@@ -109,10 +109,10 @@ protected virtual List<string> GetPermissionSet(GpsRequest request)
                     permissionSet.Add(P.ForegroundService);
 
                 if (OperatingSystemShim.IsAndroidVersionAtLeast(33))
-                    permissionSet.Add(AndroidPermissions.PostNotifications);
+                    permissionSet.Add(P.PostNotifications);
 
                 if (OperatingSystemShim.IsAndroidVersionAtLeast(34))
-                    permissionSet.Add(P.ForegroundServiceLocation);
+                    permissionSet.Add(AndroidPermissions.ForegroundServiceLocation);
                 break;
         }
         if (requestBg && OperatingSystemShim.IsAndroidVersionAtLeast(29))

diff --git a/src/Shiny.Notifications/Platforms/Android/NotificationManager.cs b/src/Shiny.Notifications/Platforms/Android/NotificationManager.cs
@@ -100,7 +100,7 @@ public async Task<AccessState> RequestAccess(AccessRequestFlags access)
         var list = new List<string>();
 
         if (OperatingSystemShim.IsAndroidVersionAtLeast(33))
-            list.Add(AndroidPermissions.PostNotifications); // required
+            list.Add(P.PostNotifications); // required
 
         if (OperatingSystemShim.IsAndroidVersionAtLeast(31) && access.HasFlag(AccessRequestFlags.TimeSensitivity))
             list.Add(P.ScheduleExactAlarm); // if denied, restricted
@@ -109,7 +109,7 @@ public async Task<AccessState> RequestAccess(AccessRequestFlags access)
             list.AddRange(new[] { P.AccessCoarseLocation, P.AccessFineLocation }); // required, along with access bg
 
         var result = await this.platform.RequestPermissions(list.ToArray()).ToTask();
-        if (list.Contains(AndroidPermissions.PostNotifications) && !result.IsGranted(AndroidPermissions.PostNotifications))
+        if (list.Contains(P.PostNotifications) && !result.IsGranted(P.PostNotifications))
             return AccessState.Denied;
 
         if (access.HasFlag(AccessRequestFlags.LocationAware))

diff --git a/src/Shiny.Push/Platforms/Android/PushManager.cs b/src/Shiny.Push/Platforms/Android/PushManager.cs
@@ -3,6 +3,7 @@
 using System.Reactive.Threading.Tasks;
 using System.Threading;
 using System.Threading.Tasks;
+using Android;
 using Android.App;
 using Android.Content;
 using Android.Gms.Extensions;
@@ -111,7 +112,7 @@ public async Task<PushAccessState> RequestAccess(CancellationToken cancelToken =
         if (OperatingSystemShim.IsAndroidVersionAtLeast(33))
         {
             var access = await this.platform
-                .RequestAccess(AndroidPermissions.PostNotifications)
+                .RequestAccess(Manifest.Permission.PostNotifications)
                 .ToTask(cancelToken);
 
             if (access != AccessState.Available)