Merge branch 'master' into feature/itbl-track-anon-user

# Conflicts: # iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java # iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java # iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
Iterable · May 8, 2024 · 41f5cd6 · 41f5cd6
2 parents aa60812 + 20a9821
commit 41f5cd6
Show file tree

Hide file tree

Showing 70 changed files with 3,616 additions and 69 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
 
       - name: Configure JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
         with:
           java-version: 11
 
@@ -33,23 +33,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
 
       - name: Configure JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
         with:
-            java-version: 11
+          java-version: 11
 
       - run: touch local.properties
 
       - name: Test
         run: ./gradlew :iterableapi:jacocoTestDebugUnitTestReport :app:jacocoDebugTestReport
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: unit-tests
           path: |
@@ -58,29 +58,29 @@ jobs:
 
   instrumentation-tests:
     name: Instrumentation tests
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
 
       - name: Configure JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
         with:
-            java-version: 11
+          java-version: 11
 
       - run: touch local.properties
 
       - name: Test
-        uses: reactivecircus/android-emulator-runner@v2
+        uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1
         with:
           api-level: 28
           script: ./gradlew :iterableapi:connectedCheck :app:jacocoDebugAndroidTestReport
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: instrumentation-tests
           path: |
@@ -95,10 +95,12 @@ jobs:
       JACOCO_SOURCE_PATH: "iterableapi/src/main/java iterableapi-ui/src/main/java"
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          fetch-depth: 0
 
       - name: Configure JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
         with:
           java-version: 11
 
@@ -107,12 +109,12 @@ jobs:
       - run: ./cc-test-reporter before-build
 
       - name: Download unit tests coverage
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
           name: unit-tests
 
       - name: Download instrumentation tests coverage
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
           name: instrumentation-tests
 
@@ -123,4 +125,4 @@ jobs:
       - run: ./cc-test-reporter format-coverage app/build/reports/jacoco/jacocoDebugAndroidTestReport/jacocoDebugAndroidTestReport.xml --input-type jacoco -d
       - run: ./cc-test-reporter upload-coverage
         env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml
@@ -10,15 +10,15 @@ jobs:
     name: Create Jira Issue
     steps:
       - name: Login
-        uses: atlassian/gajira-login@v3
+        uses: atlassian/gajira-login@ca13f8850ea309cf44a6e4e0c49d9aa48ac3ca4c # v3
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_ILYA_USER_EMAIL }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_ILYA_API_TOKEN }}
 
       - name: Create
         id: create
-        uses: atlassian/gajira-create@v3
+        uses: atlassian/gajira-create@1ff0b6bd115a780592b47bfbb63fc4629132e6ec # v3
         with:
           project: MOB
           issuetype: Bug

diff --git a/.gitignore b/.gitignore
@@ -65,4 +65,6 @@ pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
-release.properties
+release.properties
+
+jacoco.exec
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
 #### Added
 - nothing yet
 
@@ -12,6 +13,28 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 #### Changed
 - nothing yet
 
+## [3.5.1]
+
+#### Fixed
+- Embedded manager syncs messages as soon as user logs in
+- Fixed a bug to prevent app crashes due to malformed authTokens
+- Fixes a bug where push notifications opens would lead to app crashes
+- Fixes a bug where crashes would occur due to SDK not being initialized
+
+#### Changed
+- Updates Glide library in embedded message OOTB views to version [4.16.0](https://github.com/bumptech/glide/releases/tag/v4.16.0)
+
+## [3.5.0]
+#### Added
+- introduces support for embedded messaging: an eligibility–based, personalized messages sent from Iterable to your mobile and web apps, which can display them inline, using native interface components.
+- To display embedded messages, you can use customizable, out-of-the-box components provided by the SDK (cards, notifications, banners), or you can build fully custom components of your own design.
+- To learn more, read [Embedded Messages with Iterable's iOS SDK](https://support.iterable.com/hc/articles/23061840746900).
+
+#### Changed
+- `IterableConfig` is updated with an `enableEmbeddedMessaging` flag that needs to be set to true to allow use of embedded messaging functionality
+
+## [3.5.0-beta1](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.0-beta1)
+
 ## [3.4.17](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.17)
 #### Added
 - when JWT is invalid, `IterableAuthManager` is updated to fetch and store a new JWT token locally 

diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ To learn more about various SDK features, read:
 - [Customizing Mobile Inbox on Android](https://support.iterable.com/hc/articles/360039189931)
 - [Android App Links](https://support.iterable.com/hc/articles/360035127392)
 - [Deep Links in Push Notifications](https://support.iterable.com/hc/articles/360035453971)
+- [Embedded Messages with Iterable's Android SDK](https://support.iterable.com/hc/articles/23061877893652)
 
 ## Sample projects
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Apr 28 13:23:09 PDT 2020
+#Tue Oct 10 10:01:47 MDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/iterableapi-ui/build.gradle b/iterableapi-ui/build.gradle
@@ -7,7 +7,7 @@ android {
     namespace 'com.iterable.iterableapi.ui'
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 28
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -37,17 +37,21 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation "com.github.bumptech.glide:glide:4.16.0"
+    implementation 'com.google.android.material:material:1.2.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
-
 }
 
 ext {
     libraryName = 'iterableapi-ui'
-    libraryVersion = '3.4.17'
+    libraryVersion = '3.5.1'
 }
 
 if (hasProperty("mavenPublishEnabled")) {
@@ -57,6 +61,8 @@ if (hasProperty("mavenPublishEnabled")) {
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+
+    exclude '**/*.kt'
 }
 
 // A hack to import the classpath and BuildConfig into the javadoc task