Merge pull request #1798 from OneSignal/fix/canRequestPermission_returns_true

[5.0.0] Fix canRequestPermission always returning true

Author: emawby

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt

@@ -104,6 +104,11 @@ class PermissionsActivity : Activity() {
                     ?: throw RuntimeException("Missing handler for permissionRequestType: $permissionRequestType")
                 if (granted) {
                     callback.onAccept()
+                    _preferenceService!!.saveBool(
+                        PreferenceStores.ONESIGNAL,
+                        "${PreferenceOneSignalKeys.PREFS_OS_USER_RESOLVED_PERMISSION_PREFIX}$androidPermissionString",
+                        true,
+                    )
                 } else {
                     callback.onReject(shouldShowSettings())
                 }
@@ -132,7 +137,7 @@ class PermissionsActivity : Activity() {
             ) {
                 _preferenceService!!.saveBool(
                     PreferenceStores.ONESIGNAL,
-                    "${PreferenceOneSignalKeys.PREFS_OS_USER_REJECTED_PERMISSION_PREFIX}$androidPermissionString",
+                    "${PreferenceOneSignalKeys.PREFS_OS_USER_RESOLVED_PERMISSION_PREFIX}$androidPermissionString",
                     true,
                 )
                 return false
@@ -141,7 +146,7 @@ class PermissionsActivity : Activity() {
 
         return _preferenceService!!.getBool(
             PreferenceStores.ONESIGNAL,
-            "${PreferenceOneSignalKeys.PREFS_OS_USER_REJECTED_PERMISSION_PREFIX}$androidPermissionString",
+            "${PreferenceOneSignalKeys.PREFS_OS_USER_RESOLVED_PERMISSION_PREFIX}$androidPermissionString",
             false,
         )!!
     }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/preferences/IPreferencesService.kt

@@ -156,7 +156,7 @@ object PreferenceOneSignalKeys {
      * (Boolean) A prefix key for the permission state. When true, the user has rejected this
      * permission too many times and will not be prompted again.
      */
-    const val PREFS_OS_USER_REJECTED_PERMISSION_PREFIX = "USER_REJECTED_PERMISSION_"
+    const val PREFS_OS_USER_RESOLVED_PERMISSION_PREFIX = "USER_RESOLVED_PERMISSION_"
 
     // HTTP
     /**

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/permissions/impl/NotificationPermissionController.kt

@@ -58,7 +58,7 @@ internal class NotificationPermissionController(
     override val canRequestPermission: Boolean
         get() = !_preferenceService.getBool(
             PreferenceStores.ONESIGNAL,
-            "${PreferenceOneSignalKeys.PREFS_OS_USER_REJECTED_PERMISSION_PREFIX}$ANDROID_PERMISSION_STRING",
+            "${PreferenceOneSignalKeys.PREFS_OS_USER_RESOLVED_PERMISSION_PREFIX}$ANDROID_PERMISSION_STRING",
             false,
         )!!