Add NotGranted item to PermissionState

This fixes the issue with [deny and don't ask again] returning an incorrect state. Unfortunately, it's not possible on Android to determine the difference. One has to keep track of whether a permission has been requested in the app already, so that's up to consumers.
icerockdev · Feb 29, 2024 · c528d79 · c528d79
1 parent 7a9df21
commit c528d79
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/permissions/src/androidMain/kotlin/dev/icerock/moko/permissions/PermissionsControllerImpl.kt b/permissions/src/androidMain/kotlin/dev/icerock/moko/permissions/PermissionsControllerImpl.kt
@@ -91,10 +91,10 @@ class PermissionsControllerImpl(
         val resolverFragment: ResolverFragment = getOrCreateResolverFragment(fragmentManager)
 
         val isAllRequestRationale: Boolean = permissions.all {
-            !resolverFragment.shouldShowRequestPermissionRationale(it)
+            resolverFragment.shouldShowRequestPermissionRationale(it)
         }
-        return if (isAllRequestRationale) PermissionState.NotDetermined
-        else PermissionState.Denied
+        return if (isAllRequestRationale) PermissionState.Denied
+        else PermissionState.NotGranted
     }
 
     override fun openAppSettings() {

diff --git a/permissions/src/commonMain/kotlin/dev/icerock/moko/permissions/PermissionState.kt b/permissions/src/commonMain/kotlin/dev/icerock/moko/permissions/PermissionState.kt
@@ -5,8 +5,27 @@
 package dev.icerock.moko.permissions
 
 enum class PermissionState {
+
+    /**
+     * Starting state for each permission.
+     */
     NotDetermined,
+
+    /**
+     * Android-only. This could mean [NotDetermined] or [DeniedAlways], but the OS doesn't
+     * expose which of the two it is in all scenarios.
+     */
+    NotGranted,
+
     Granted,
+
+    /**
+     * Android-only.
+     */
     Denied,
+
+    /**
+     * On Android only applicable to Push Notifications.
+     */
     DeniedAlways
-}
+}
diff --git a/permissions/src/commonMain/kotlin/dev/icerock/moko/permissions/PermissionsController.kt b/permissions/src/commonMain/kotlin/dev/icerock/moko/permissions/PermissionsController.kt
@@ -24,12 +24,13 @@ expect interface PermissionsController {
 
     /**
      * Returns current state of permission. Can be suspended because on
-     * android detection of Denied/NotDetermined case require binded FragmentManager.
+     * Android detection of `Denied`/`NotDetermined` requires a bound FragmentManager.
      *
      * @param permission state of what permission we want
      *
-     * @return current state. On Android can't be DeniedAlways (except push notifications).
-     * On iOS can't be Denied.
+     * @return current state. On Android can't be `DeniedAlways` (except push notifications).
+     * On iOS can't be `Denied`.
+     * @see PermissionState for a detailed description.
      */
     suspend fun getPermissionState(permission: Permission): PermissionState