Merge remote-tracking branch 'origin/develop' into develop

anton-knyazev · anton-knyazev · commit 7a6d80c1afd1 · 2024-08-08T16:26:14.000+03:00
diff --git a/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/UrlImage.kt b/omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/UrlImage.kt
@@ -28,7 +28,7 @@ data class UrlImage(val baseUrl: String? = null, val relativeUrl: String) : Base
     }
     
     val url: String
-        get() = if (relativeUrl.isAbsoluteUrl()) relativeUrl else {
+        get() = if ((baseUrl == null && defaultBaseUrl == null) || relativeUrl.isAbsoluteUrl() ) relativeUrl else {
             val baseUrl = (baseUrl ?: defaultBaseUrl ?: "").removeSuffix("/")
             val relativeUrl = relativeUrl.removePrefix("/")
             "$baseUrl/$relativeUrl"

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ data class UrlImage(val baseUrl: String? = null, val relativeUrl: String) : Base`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`val url: String`
`31`		`- get() = if (relativeUrl.isAbsoluteUrl()) relativeUrl else {`
	`31`	`+ get() = if ((baseUrl == null && defaultBaseUrl == null) \|\| relativeUrl.isAbsoluteUrl() ) relativeUrl else {`
`32`	`32`	`val baseUrl = (baseUrl ?: defaultBaseUrl ?: "").removeSuffix("/")`
`33`	`33`	`val relativeUrl = relativeUrl.removePrefix("/")`
`34`	`34`	`"$baseUrl/$relativeUrl"`