Merge branch 'master' into InApp-Display-E2E

Author: Ayyanchira

.github/workflows/codeql.yml

@@ -0,0 +1,65 @@
+name: "CodeQL Scan"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  analyze:
+    name: Analyze Java
+    runs-on: ubuntu-latest
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packsCodeQ
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: java-kotlin
+            build-mode: autobuild
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          queries: ${{ matrix.language == 'java-kotlin' && 'security-extended, security-and-quality' }}
+
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

CHANGELOG.md

@@ -2,7 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [3.6.1]
+### Added
+- Added edge-to-edge support for in-app messages to ensure proper display on devices with notches, cutouts, and system bars. Test your in-app messages on various devices to ensure optimal display.
+
+### Note
+> **⚠️ Important**: The system applies white insets by default, which may contrast with dark-themed apps. Marketers can control the visual appearance using the background overlay option in the Iterable UI to choose appropriate background colors that work well with their app's theme.
 
 ## [3.6.0]
 #### Added

README.md

@@ -37,6 +37,34 @@ To learn more about various SDK features, read:
 - [Embedded Messages with Iterable's Android SDK](https://support.iterable.com/hc/articles/23061877893652)
 - [Unknown User Activation: Developer Docs](https://support.iterable.com/hc/sections/40078809116180)
 
+## Background Initialization (Recommended)
+
+To prevent ANRs during app startup, use background initialization instead of the standard `initialize()` method:
+
+```kotlin
+// In Application.onCreate()
+IterableApi.initializeInBackground(this,  "your-api-key", config) {
+   // SDK is ready - this callback is optional
+}
+```
+
+**For subscribing to initialization completion from multiple places:**
+
+```kotlin
+IterableApi.onSDKInitialized {
+    // This callback will be invoked when initialization completes
+    // If already initialized, it's called immediately
+}
+```
+
+Background initialization prevents ANRs by:
+- Running all initialization work on a background thread
+- Automatically queuing API calls until initialization completes
+- Ensuring no data is lost during startup
+- Providing callbacks on the main thread when ready
+
+**⚠️ Important:** Always wait for initialization completion before accessing SDK internals. Accessing the SDK internals before initialization completes can cause crashes. Use the callback methods above to ensure the SDK is ready before use.
+
 ## Sample projects
 
 For sample code, take a look at:

iterableapi-ui/build.gradle

@@ -61,7 +61,7 @@ dependencies {
 
 ext {
     libraryName = 'iterableapi-ui'
-    libraryVersion = '3.6.0'
+    libraryVersion = '3.6.1'
 }
 
 if (hasProperty("mavenPublishEnabled")) {

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxMessageFragment.java

@@ -14,6 +14,7 @@
 import com.iterable.iterableapi.IterableApi;
 import com.iterable.iterableapi.IterableInAppLocation;
 import com.iterable.iterableapi.IterableInAppMessage;
+import com.iterable.iterableapi.IterableUtil;
 import com.iterable.iterableapi.ui.R;
 
 import java.util.List;
@@ -76,7 +77,8 @@ private IterableInAppMessage getMessageById(String messageId) {
     private void loadMessage() {
         message = getMessageById(messageId);
         if (message != null) {
-            webView.loadDataWithBaseURL("", message.getContent().html, "text/html", "UTF-8", "");
+            // Use configured base URL to enable CORS for external resources (e.g., custom fonts)
+            webView.loadDataWithBaseURL(IterableUtil.getWebViewBaseUrl(), message.getContent().html, "text/html", "UTF-8", "");
             webView.setWebViewClient(webViewClient);
             if (!loaded) {
                 IterableApi.getInstance().trackInAppOpen(message, IterableInAppLocation.INBOX);

iterableapi/build.gradle

@@ -21,7 +21,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 34
 
-        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.6.0\""
+        buildConfigField "String", "ITERABLE_SDK_VERSION", "\"3.6.1\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -89,7 +89,7 @@ dependencies {
 
 ext {
     libraryName = 'iterableapi'
-    libraryVersion = '3.6.0'
+    libraryVersion = '3.6.1'
 }
 
 if (hasProperty("mavenPublishEnabled")) {