Skip to content

Commit eb113e4

Browse files
committed
Fix build absolute url
1 parent 6801f9f commit eb113e4

File tree

1 file changed

+7
-3
lines changed
  • omegatypes/src/main/java/com/omega_r/libs/omegatypes/image

1 file changed

+7
-3
lines changed

omegatypes/src/main/java/com/omega_r/libs/omegatypes/image/UrlImage.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ data class UrlImage(val baseUrl: String? = null, val relativeUrl: String) : Base
1717
companion object {
1818
private val PATTERN_ABSOLUTE_URL = Pattern.compile("\\A[a-z0-9.+-]+://.*", Pattern.CASE_INSENSITIVE)
1919

20-
var defaultBaseUrl : String? = null
20+
var defaultBaseUrl: String? = null
2121

2222
init {
2323
ImageProcessors.default.addImageProcessor(UrlImage::class, Processor())
@@ -29,9 +29,13 @@ data class UrlImage(val baseUrl: String? = null, val relativeUrl: String) : Base
2929

3030

3131
val url: String
32-
get() = if (relativeUrl.isAbsoluteUrl()) relativeUrl else (baseUrl ?: defaultBaseUrl ?: "") + relativeUrl
32+
get() = if (relativeUrl.isAbsoluteUrl()) relativeUrl else {
33+
val baseUrl = (baseUrl ?: defaultBaseUrl ?: "").removeSuffix("/")
34+
val relativeUrl = relativeUrl.removePrefix("/")
35+
"$baseUrl/$relativeUrl"
36+
}
3337

34-
constructor(url: String): this(null, url)
38+
constructor(url: String) : this(null, url)
3539

3640
class Processor : BaseBitmapImage.Processor<UrlImage>(true) {
3741

0 commit comments

Comments
 (0)