From a2616b595dbfb5a2d2969fef57a2f346c0d1c3fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20Gibern=C3=A9?= <ulrich.giberne@airship.com>
Date: Tue, 6 Aug 2024 17:40:47 -0400
Subject: [PATCH] [MOBILE-4634] Fix test device check (#1489)

* fix test device check

* fixing holdout groups

* prepare patch version 18.1.5
---
 CHANGELOG.md                                              | 7 +++++++
 build.gradle                                              | 2 +-
 .../urbanairship/iam/InAppMessageAutomationExecutor.kt    | 8 ++++----
 .../java/com/urbanairship/audience/DeviceInfoProvider.kt  | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d6e94ecb..9d026e310 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 [Migration Guides](https://github.com/urbanairship/android-library/tree/main/documentation/migration)
 
+## Version 18.1.5, August 06, 2024
+Patch release that fixes test devices audience check and holdout group experiments displays.
+
+### Changes
+- Fixed test devices audience check.
+- Fixed holdout group experiment displays.
+
 ## Version 18.1.4, July 31, 2024
 Patch release that includes bug fixes for Embedded Content.
 
diff --git a/build.gradle b/build.gradle
index b86672449..52ec589ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // Airship Version - major.minor.patch
-        airshipVersion = '18.1.4'
+        airshipVersion = '18.1.5'
 
         // Airship Version Qualifier beta, release, etc...
         // airshipVersionQualifier = "alpha"
diff --git a/urbanairship-automation/src/main/java/com/urbanairship/iam/InAppMessageAutomationExecutor.kt b/urbanairship-automation/src/main/java/com/urbanairship/iam/InAppMessageAutomationExecutor.kt
index ccf049107..510325a45 100644
--- a/urbanairship-automation/src/main/java/com/urbanairship/iam/InAppMessageAutomationExecutor.kt
+++ b/urbanairship-automation/src/main/java/com/urbanairship/iam/InAppMessageAutomationExecutor.kt
@@ -118,13 +118,13 @@ internal class InAppMessageAutomationExecutor(
             } catch (ex: Exception) {
                 UALog.e(ex) { "Failed to display message" }
                 result = ScheduleExecuteResult.RETRY
-            } finally {
-                // Finished
-                data.displayCoordinator.messageFinishedDisplaying(data.message)
-                displayDelegate?.messageFinishedDisplaying(data.message, preparedScheduleInfo.scheduleId)
             }
         }
 
+        // Finished
+        data.displayCoordinator.messageFinishedDisplaying(data.message)
+        displayDelegate?.messageFinishedDisplaying(data.message, preparedScheduleInfo.scheduleId)
+
         // Clean up assets
         if (result != ScheduleExecuteResult.RETRY) {
             assetManager.clearCache(preparedScheduleInfo.scheduleId)
diff --git a/urbanairship-core/src/main/java/com/urbanairship/audience/DeviceInfoProvider.kt b/urbanairship-core/src/main/java/com/urbanairship/audience/DeviceInfoProvider.kt
index 2902d598b..f9c264b73 100644
--- a/urbanairship-core/src/main/java/com/urbanairship/audience/DeviceInfoProvider.kt
+++ b/urbanairship-core/src/main/java/com/urbanairship/audience/DeviceInfoProvider.kt
@@ -69,7 +69,7 @@ internal class DeviceInfoProviderImpl(private val contactId: String? = null) : D
         get() = PlatformUtils.asString(UAirship.shared().platformType)
 
     override val channelCreated: Boolean
-        get() = UAirship.shared().channel.id == null
+        get() = UAirship.shared().channel.id != null
     override val analyticsEnabled: Boolean
         get() = UAirship.shared().analytics.isEnabled