Merge branch 'master' into jordan/2023-08-24/thread-start-fix

klaviyo · Sep 5, 2023 · c0c0067 · c0c0067
2 parents 697a073 + 3081ac7
commit c0c0067
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -22,8 +22,12 @@ jobs:
     - uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        days-before-issue-stale: -1
-        days-before-issue-close: -1
+        days-before-issue-stale: 14
+        days-before-issue-close: 10
+        stale-issue-label: 'stale'
+        stale-issue-message: 'This issue is stale due to inactivity. Please let us know if you are still encountering issues, otherwise this issue will automatically close in 10 days.'
+        close-issue-message: 'This issue has seen no updates in the past 14 days and will now be closed. Please open a new issue if you wish to report an update.'
+        exempt-issue-labels: 'evergreen'
         days-before-pr-stale: 16
         days-before-pr-close: 14
         stale-pr-message: 'This PR has not seen any updates in the last 16 days. Without further action this PR will be closed in 14 days. To disable further staleness checks add the `evergreen` label.'

diff --git a/README.md b/README.md
@@ -37,15 +37,15 @@ send them timely push notifications via FCM.
    ```kotlin
    // build.gradle.kts
    dependencies {
-       implementation("com.github.klaviyo.klaviyo-android-sdk:analytics:1.3.1")
-       implementation("com.github.klaviyo.klaviyo-android-sdk:push-fcm:1.3.1")
+       implementation("com.github.klaviyo.klaviyo-android-sdk:analytics:1.3.2")
+       implementation("com.github.klaviyo.klaviyo-android-sdk:push-fcm:1.3.2")
    }
    ```
    ```groovy
    // build.gradle
    dependencies {
-       implementation "com.github.klaviyo.klaviyo-android-sdk:analytics:1.3.1"
-       implementation "com.github.klaviyo.klaviyo-android-sdk:push-fcm:1.3.1"
+       implementation "com.github.klaviyo.klaviyo-android-sdk:analytics:1.3.2"
+       implementation "com.github.klaviyo.klaviyo-android-sdk:push-fcm:1.3.2"
    }
    ```
 
@@ -351,4 +351,4 @@ This feature is supported in version 1.3.1 and above of the Klaviyo Android SDK.
 [//]: # (REMINDER: Update documentation branch with new dokka docs when updating version number)
 
 Browse complete code documentation autogenerated with
-Dokka [here](https://klaviyo.github.io/klaviyo-android-sdk/1.3.1)
+Dokka [here](https://klaviyo.github.io/klaviyo-android-sdk/1.3.2)
diff --git a/sdk/analytics/src/main/java/com/klaviyo/analytics/DeviceProperties.kt b/sdk/analytics/src/main/java/com/klaviyo/analytics/DeviceProperties.kt
@@ -62,10 +62,16 @@ internal object DeviceProperties {
     }
 
     val notificationPermission: Boolean
-        get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && ActivityCompat.checkSelfPermission(
-            Registry.config.applicationContext,
-            Manifest.permission.POST_NOTIFICATIONS
-        ) != PackageManager.PERMISSION_GRANTED
+        get() {
+            // Notification permissions only expected from Android 13 onwards
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                return ActivityCompat.checkSelfPermission(
+                    Registry.config.applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            }
+            return true
+        }
 
     val applicationId: String by lazy {
         Registry.config.applicationContext.packageName

diff --git a/versions.gradle b/versions.gradle
@@ -13,7 +13,7 @@ ext {
 
     // project versioning
     versionCode = 6
-    versionName = '1.3.1' // Reminder: Update version in README samples and update documentation branch
+    versionName = '1.3.2' // Reminder: Update version in README samples and update documentation branch
 
     // dependencies
     coreKTXVersion = '1.9.0'