From 69b959f1b252ea4e8c942061c210fb1fa6e4d649 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 6 Dec 2023 18:30:36 -0500 Subject: [PATCH 1/3] removed extra equals to correct invalid syntax --- .../main/java/com/onesignal/NotificationPermissionController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt index 1db65258a8..de74d0f733 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt @@ -43,7 +43,7 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback } @ChecksSdkIntAtLeast(api = 33) - val supportsNativePrompt: Boolean by lazy = { + val supportsNativePrompt: Boolean by lazy { Build.VERSION.SDK_INT > 32 && OSUtils.getTargetSdkVersion(OneSignal.appContext) > 32 } From 54131deb90d8200207ab85d0a648ce2c46dd6a26 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 6 Dec 2023 18:31:15 -0500 Subject: [PATCH 2/3] rm unneeded ChecksSdkIntAtLeast --- .../main/java/com/onesignal/NotificationPermissionController.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt index de74d0f733..12f938ef4a 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt @@ -28,7 +28,6 @@ package com.onesignal import android.os.Build -import androidx.annotation.ChecksSdkIntAtLeast object NotificationPermissionController : PermissionsActivity.PermissionCallback { private const val PERMISSION_TYPE = "NOTIFICATION" @@ -42,7 +41,6 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback PermissionsActivity.registerAsCallback(PERMISSION_TYPE, this) } - @ChecksSdkIntAtLeast(api = 33) val supportsNativePrompt: Boolean by lazy { Build.VERSION.SDK_INT > 32 && OSUtils.getTargetSdkVersion(OneSignal.appContext) > 32 From cc437c8fef2a7c41706038eb2a3662b99cac7b86 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Wed, 6 Dec 2023 18:32:42 -0500 Subject: [PATCH 3/3] make supportsNativePrompt private it's only used internally to the class --- .../main/java/com/onesignal/NotificationPermissionController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt index 12f938ef4a..5b7f41ff36 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationPermissionController.kt @@ -41,7 +41,7 @@ object NotificationPermissionController : PermissionsActivity.PermissionCallback PermissionsActivity.registerAsCallback(PERMISSION_TYPE, this) } - val supportsNativePrompt: Boolean by lazy { + private val supportsNativePrompt: Boolean by lazy { Build.VERSION.SDK_INT > 32 && OSUtils.getTargetSdkVersion(OneSignal.appContext) > 32 }