Skip to content

[5.0.0] Fix canRequestPermission always returning true #1798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emawby merged 1 commit into from
Aug 10, 2023
Merged

[5.0.0] Fix canRequestPermission always returning true #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...gnalSDK/onesignal/core/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down Expand Up @@ -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
Expand All @@ -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,
)!!
}
Expand Down
2 changes: 1 addition & 1 deletion ...esignal/core/src/main/java/com/onesignal/core/internal/preferences/IPreferencesService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
/**
Expand Down
2 changes: 1 addition & 1 deletion ...com/onesignal/notifications/internal/permissions/impl/NotificationPermissionController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)!!

Expand Down