Refactor permissions library (#535)

Softeq · Oct 25, 2023 · 27f1b7a · 27f1b7a
1 parent 2505c34
commit 27f1b7a
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 63 deletions.
diff --git a/Softeq.XToolkit.Permissions.Droid/PermissionsManager.cs b/Softeq.XToolkit.Permissions.Droid/PermissionsManager.cs
@@ -2,12 +2,12 @@
 // http://www.softeq.com
 
 using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.Maui.Storage;
 using BasePermission = Microsoft.Maui.ApplicationModel.Permissions.BasePermission;
-using XToolkitPermissions = Softeq.XToolkit.Permissions.Permissions;
-using XToolkitPermissionsDroid = Softeq.XToolkit.Permissions.Droid.Permissions;
+using CustomPermissions = Softeq.XToolkit.Permissions.Permissions;
+using PlatformCustomPermissions = Softeq.XToolkit.Permissions.Droid.Permissions;
 
 namespace Softeq.XToolkit.Permissions.Droid
 {
@@ -31,15 +31,15 @@ public virtual Task<PermissionStatus> CheckAsync<T>()
             where T : BasePermission, new()
         {
             var permissionType = typeof(T);
-            if (permissionType == typeof(XToolkitPermissions.Notifications))
+            if (permissionType == typeof(CustomPermissions.Notifications))
             {
-                return _permissionsService.CheckPermissionsAsync<XToolkitPermissionsDroid.Notifications>();
+                return _permissionsService.CheckPermissionsAsync<PlatformCustomPermissions.Notifications>();
             }
-            else if (permissionType == typeof(XToolkitPermissions.Bluetooth))
+            else if (permissionType == typeof(CustomPermissions.Bluetooth))
             {
-                return _permissionsService.CheckPermissionsAsync<XToolkitPermissionsDroid.Bluetooth>();
+                return _permissionsService.CheckPermissionsAsync<PlatformCustomPermissions.Bluetooth>();
             }
-            else
+            else
             {
                 return _permissionsService.CheckPermissionsAsync<T>();
             }
@@ -50,15 +50,15 @@ public Task<PermissionStatus> CheckWithRequestAsync<T>()
             where T : BasePermission, new()
         {
             var permissionType = typeof(T);
-            if (permissionType == typeof(XToolkitPermissions.Notifications))
+            if (permissionType == typeof(CustomPermissions.Notifications))
             {
-                return CommonCheckWithRequestAsync<XToolkitPermissionsDroid.Notifications>();
+                return CommonCheckWithRequestAsync<PlatformCustomPermissions.Notifications>();
             }
-            else if (permissionType == typeof(XToolkitPermissions.Bluetooth))
+            else if (permissionType == typeof(CustomPermissions.Bluetooth))
             {
-                return CommonCheckWithRequestAsync<XToolkitPermissionsDroid.Bluetooth>();
+                return CommonCheckWithRequestAsync<PlatformCustomPermissions.Bluetooth>();
             }
-            else
+            else
             {
                 return CommonCheckWithRequestAsync<T>();
             }
@@ -76,31 +76,31 @@ private void OpenSettings()
             _permissionsService.OpenSettings();
         }
 
-        private void RemoveOldKeys<T>()
-            where T : BasePermission, new()
-        {
-            var requestedKey = GetPermissionRequestedKey<T>();
+        private void RemoveOldKeys<T>()
+            where T : BasePermission, new()
+        {
+            var requestedKey = GetPermissionRequestedKey<T>();
             if (Preferences.ContainsKey(requestedKey))
-            {
-                Preferences.Remove(requestedKey);
-            }
-
-            var deniedEverKey = GetPermissionDeniedEverKey<T>();
+            {
+                Preferences.Remove(requestedKey);
+            }
+
+            var deniedEverKey = GetPermissionDeniedEverKey<T>();
             if (Preferences.ContainsKey(deniedEverKey))
-            {
-                Preferences.Remove(deniedEverKey);
-            }
-
-            string GetPermissionRequestedKey<TPermission>()
-                where TPermission : BasePermission
-            {
-                return $"{nameof(PermissionsManager)}_IsPermissionRequested_{typeof(T).Name}";
-            }
-
+            {
+                Preferences.Remove(deniedEverKey);
+            }
+
+            string GetPermissionRequestedKey<TPermission>()
+                where TPermission : BasePermission
+            {
+                return $"{nameof(PermissionsManager)}_IsPermissionRequested_{typeof(T).Name}";
+            }
+
             string GetPermissionDeniedEverKey<T>()
-                where T : BasePermission
-            {
-                return $"{nameof(PermissionsManager)}_IsPermissionDeniedEver_{typeof(T).Name}";
+                where T : BasePermission
+            {
+                return $"{nameof(PermissionsManager)}_IsPermissionDeniedEver_{typeof(T).Name}";
             }
         }
 
@@ -115,7 +115,7 @@ private async Task<PermissionStatus> CommonCheckWithRequestAsync<T>()
 
             RemoveOldKeys<T>();
 
-            // Timer are used for confirm a fact of showing a request of permission access popup
+            // Timer are used for confirm a fact of showing a request of permission access popup
             // in another case user should see screen with settings for changing permission state
             var timer = new Stopwatch();
             timer.Start();
@@ -126,7 +126,7 @@ private async Task<PermissionStatus> CommonCheckWithRequestAsync<T>()
                 permissionStatus = await _permissionsService.RequestPermissionsAsync<T>().ConfigureAwait(false);
             }
 
-            if (permissionStatus == PermissionStatus.Denied
+            if (permissionStatus == PermissionStatus.Denied
                 && timer.Elapsed < _showPermissionDialogThreshold)
             {
                 await OpenSettingsWithConfirmationAsync<T>().ConfigureAwait(false);
@@ -147,4 +147,4 @@ private async Task OpenSettingsWithConfirmationAsync<T>()
             }
         }
     }
-}
+}
diff --git a/Softeq.XToolkit.Permissions.iOS/Permissions/Bluetooth.cs b/Softeq.XToolkit.Permissions.iOS/Permissions/Bluetooth.cs
@@ -3,9 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
 using CoreBluetooth;
 using BasePlatformPermission = Microsoft.Maui.ApplicationModel.Permissions.BasePlatformPermission;
@@ -15,21 +12,24 @@ namespace Softeq.XToolkit.Permissions.iOS.Permissions
 {
     public class Bluetooth : BasePlatformPermission
     {
+        /// <inheritdoc />
         protected override Func<IEnumerable<string>> RequiredInfoPlistKeys =>
             () => new string[] { "NSBluetoothAlwaysUsageDescription" };
 
+        /// <inheritdoc />
         public override Task<EssentialsPermissionStatus> CheckStatusAsync()
         {
             EnsureDeclared();
 
             return Task.FromResult(ParseAuthorization(CBManager.Authorization));
         }
 
+        /// <inheritdoc />
         public override async Task<EssentialsPermissionStatus> RequestAsync()
         {
             EnsureDeclared();
 
-            var status = await CheckStatusAsync();
+            var status = await CheckStatusAsync().ConfigureAwait(false);
 
             if (status == EssentialsPermissionStatus.Granted)
             {
@@ -39,7 +39,7 @@ public override async Task<EssentialsPermissionStatus> RequestAsync()
             if (CBManager.Authorization == CBManagerAuthorization.NotDetermined)
             {
                 var centralManagerDelegate = new CentralManagerDelegate();
-                await centralManagerDelegate.RequestAccessAsync();
+                await centralManagerDelegate.RequestAccessAsync().ConfigureAwait(false);
             }
 
             return ParseAuthorization(CBManager.Authorization);
@@ -61,7 +61,7 @@ private class CentralManagerDelegate : CBCentralManagerDelegate
         {
             private readonly CBCentralManager _centralManager;
 
-            private TaskCompletionSource<CBManagerState> _statusRequest =
+            private readonly TaskCompletionSource<CBManagerState> _statusRequest =
                 new TaskCompletionSource<CBManagerState>();
 
             public CentralManagerDelegate()
@@ -71,7 +71,7 @@ public CentralManagerDelegate()
 
             public async Task<CBManagerState> RequestAccessAsync()
             {
-                var state = await _statusRequest.Task;
+                var state = await _statusRequest.Task.ConfigureAwait(false);
                 return state;
             }
 
@@ -84,4 +84,4 @@ public override void UpdatedState(CBCentralManager centralManager)
             }
         }
     }
-}
+}
diff --git a/Softeq.XToolkit.Permissions.iOS/Permissions/Notifications.cs b/Softeq.XToolkit.Permissions.iOS/Permissions/Notifications.cs
@@ -2,9 +2,7 @@
 // http://www.softeq.com
 
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using CoreBluetooth;
 using UserNotifications;
 using BasePlatformPermission = Microsoft.Maui.ApplicationModel.Permissions.BasePlatformPermission;
 using EssentialsPermissionStatus = Microsoft.Maui.ApplicationModel.PermissionStatus;
@@ -16,6 +14,7 @@ public class Notifications : BasePlatformPermission
         public static UNAuthorizationOptions AuthorizationOptions =
             UNAuthorizationOptions.Alert | UNAuthorizationOptions.Sound;
 
+        /// <inheritdoc />
         public override async Task<EssentialsPermissionStatus> CheckStatusAsync()
         {
             var notificationSettings = await UNUserNotificationCenter.Current
@@ -24,10 +23,13 @@ public override async Task<EssentialsPermissionStatus> CheckStatusAsync()
             return ParseAuthorization(notificationSettings.AuthorizationStatus);
         }
 
+        /// <inheritdoc />
         public override async Task<EssentialsPermissionStatus> RequestAsync()
         {
             var notificationCenter = UNUserNotificationCenter.Current;
-            var (isGranted, _) = await notificationCenter.RequestAuthorizationAsync(AuthorizationOptions);
+            var (isGranted, _) = await notificationCenter
+                .RequestAuthorizationAsync(AuthorizationOptions)
+                .ConfigureAwait(false);
             return isGranted
                 ? EssentialsPermissionStatus.Granted
                 : EssentialsPermissionStatus.Denied;
@@ -45,4 +47,4 @@ private static EssentialsPermissionStatus ParseAuthorization(UNAuthorizationStat
             };
         }
     }
-}
+}
diff --git a/Softeq.XToolkit.Permissions.iOS/PermissionsManager.cs b/Softeq.XToolkit.Permissions.iOS/PermissionsManager.cs
@@ -5,8 +5,8 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Storage;
 using BasePermission = Microsoft.Maui.ApplicationModel.Permissions.BasePermission;
-using XToolkitPermissions = Softeq.XToolkit.Permissions.Permissions;
-using XToolkitPermissionsIos = Softeq.XToolkit.Permissions.iOS.Permissions;
+using CustomPermissions = Softeq.XToolkit.Permissions.Permissions;
+using PlatformCustomPermissions = Softeq.XToolkit.Permissions.iOS.Permissions;
 
 namespace Softeq.XToolkit.Permissions.iOS
 {
@@ -39,15 +39,15 @@ public virtual Task<PermissionStatus> CheckWithRequestAsync<T>()
         {
             var permissionType = typeof(T);
 
-            if (permissionType == typeof(XToolkitPermissions.Notifications))
+            if (permissionType == typeof(CustomPermissions.Notifications))
             {
-                return CommonCheckWithRequestAsync<XToolkitPermissionsIos.Notifications>();
+                return CommonCheckWithRequestAsync<PlatformCustomPermissions.Notifications>();
             }
-            else if (permissionType == typeof(XToolkitPermissions.Bluetooth))
+            else if (permissionType == typeof(CustomPermissions.Bluetooth))
             {
-                return CommonCheckWithRequestAsync<XToolkitPermissionsIos.Bluetooth>();
+                return CommonCheckWithRequestAsync<PlatformCustomPermissions.Bluetooth>();
             }
-            else
+            else
             {
                 return CommonCheckWithRequestAsync<T>();
             }
@@ -59,15 +59,15 @@ public Task<PermissionStatus> CheckAsync<T>()
         {
             var permissionType = typeof(T);
 
-            if (permissionType == typeof(XToolkitPermissions.Notifications))
+            if (permissionType == typeof(CustomPermissions.Notifications))
             {
-                return _permissionsService.CheckPermissionsAsync<XToolkitPermissionsIos.Notifications>();
+                return _permissionsService.CheckPermissionsAsync<PlatformCustomPermissions.Notifications>();
             }
-            else if (permissionType == typeof(XToolkitPermissions.Bluetooth))
+            else if (permissionType == typeof(CustomPermissions.Bluetooth))
             {
-                return _permissionsService.CheckPermissionsAsync<XToolkitPermissionsIos.Bluetooth>();
+                return _permissionsService.CheckPermissionsAsync<PlatformCustomPermissions.Bluetooth>();
             }
-            else
+            else
             {
                 return _permissionsService.CheckPermissionsAsync<T>();
             }
@@ -124,4 +124,4 @@ private async Task<PermissionStatus> OpenSettingsWithConfirmationAsync<T>()
             return PermissionStatus.Unknown;
         }
     }
-}
+}