Fix CDN image resizer host matching and dimension edge cases

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/extensions/StringExtensions.kt

@@ -43,18 +43,14 @@ public val STREAM_CDN_HOST_PATTERN: Regex =
 /**
  * Returns whether this URL is served from a Stream CDN host that understands resizing query parameters.
  *
- * @param cdnHost An optional custom Stream CDN host (e.g. a proxied domain). When provided, the URL host is
- * matched against it with a substring check, mirroring iOS' `StreamCDNRequester(cdnHost:)`; when null, the
- * default [STREAM_CDN_HOST_PATTERN] is used.
+ * @param cdnHost An optional custom Stream CDN host (e.g. a proxied domain), matched with a substring check
+ * in addition to the default [STREAM_CDN_HOST_PATTERN], mirroring iOS' `StreamCDNRequester(cdnHost:)`.
  */
 @InternalStreamChatApi
 public fun String.isStreamCdnHosted(cdnHost: String? = null): Boolean {
     val host = this.toUri().host ?: return false
-    return if (cdnHost != null) {
-        host.contains(cdnHost, ignoreCase = true)
-    } else {
-        STREAM_CDN_HOST_PATTERN.matches(host)
-    }
+    return STREAM_CDN_HOST_PATTERN.matches(host) ||
+        (cdnHost != null && host.contains(cdnHost, ignoreCase = true))
 }
 
 /**
@@ -223,8 +219,9 @@ public fun String.createResizedStreamCdnImageUrl(
     if (maxImagePixels <= 0L) return this
     if (!isStreamCdnHosted(cdnHost)) return this
     val dimensions = getStreamCdnHostedImageDimensions() ?: return this
+    if (dimensions.originalWidth <= 0 || dimensions.originalHeight <= 0) return this
     val totalPixels = dimensions.originalWidth.toLong() * dimensions.originalHeight.toLong()
-    if (totalPixels <= 0L || totalPixels <= maxImagePixels) return this
+    if (totalPixels <= maxImagePixels) return this
     val scale = sqrt(maxImagePixels.toDouble() / totalPixels.toDouble()).toFloat()
     return createResizedStreamCdnImageUrl(
         resizedWidthPercentage = scale,

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/StringExtensionsKtTest.kt

@@ -239,6 +239,26 @@ internal class StringExtensionsKtTest {
         (resized.toUri().getQueryParameter(QUERY_PARAMETER_KEY_RESIZED_WIDTH) != null) shouldBeEqualTo true
     }
 
+    @Test
+    fun `custom cdn host matching is additive - default Stream hosts still resize`() {
+        val streamUrl = createStreamCdnImageLink(originalWidth = 4000, originalHeight = 2000)
+
+        // With a custom host configured, default Stream CDN images must still be resized.
+        val resized = streamUrl.createResizedStreamCdnImageUrl(
+            maxImagePixels = 2_000_000L,
+            cdnHost = "images.example.com",
+        )
+        (resized != streamUrl) shouldBeEqualTo true
+        (resized.toUri().getQueryParameter(QUERY_PARAMETER_KEY_RESIZED_WIDTH) != null) shouldBeEqualTo true
+    }
+
+    @Test
+    fun `Given non-positive original dimensions Should return the url unchanged`() {
+        val negativeDimsUrl = createStreamCdnImageLink(originalWidth = -4000, originalHeight = -2000)
+
+        negativeDimsUrl.createResizedStreamCdnImageUrl(maxImagePixels = 2_000_000L) shouldBeEqualTo negativeDimsUrl
+    }
+
     @Test
     fun `Given a non-positive max pixel budget Should return the url unchanged`() {
         val originalUrl = createStreamCdnImageLink(originalWidth = 4000, originalHeight = 2000)

stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/ChatUI.kt

@@ -263,8 +263,8 @@ public object ChatUI {
      */
     @Deprecated(
         "Use streamCdnImageResizer (defaults to a StreamCdnMaxPixelsImageResizer capping images to 2MP). " +
-            "For custom behavior, provide your own StreamCdnImageResizer.",
-        ReplaceWith("streamCdnImageResizer"),
+            "For custom behavior, provide your own StreamCdnImageResizer. This percentage-based config has no " +
+            "one-token replacement — migrate manually.",
     )
     @JvmStatic
     public var streamCdnImageResizing: StreamCdnImageResizing = StreamCdnImageResizing.defaultStreamCdnImageResizing()