Skip to content

Commit 3927fa5

Browse files
committed
Reuse the same host as the original in gravatarImageUrlToGravatarImageUrl
1 parent 1a526f6 commit 3927fa5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

gravatar/src/main/java/com/gravatar/GravatarConstants.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ object GravatarConstants {
55
const val GRAVATAR_IMAGE_BASE_URL = "https://www.gravatar.com/"
66
const val GRAVATAR_IMAGE_HOST = "www.gravatar.com"
77
const val GRAVATAR_IMAGE_PATH = "avatar"
8+
const val GRAVATAR_IMAGE_RAW_HOST = "gravatar.com"
89

910
// Gravatar API
1011
const val GRAVATAR_API_BASE_URL = "https://api.gravatar.com/v1/"

gravatar/src/main/java/com/gravatar/GravatarUtils.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.net.Uri
44
import com.gravatar.GravatarConstants.AVATAR_SIZE_RANGE
55
import com.gravatar.GravatarConstants.GRAVATAR_IMAGE_HOST
66
import com.gravatar.GravatarConstants.GRAVATAR_IMAGE_PATH
7+
import com.gravatar.GravatarConstants.GRAVATAR_IMAGE_RAW_HOST
78
import java.security.MessageDigest
89

910
private fun ByteArray.toHex(): String {
@@ -84,10 +85,10 @@ fun gravatarImageUrlToGravatarImageUri(
8485
forceDefaultAvatarImage: Boolean? = null,
8586
): Uri {
8687
val uri = Uri.parse(url)
87-
require(uri.host?.let { GRAVATAR_IMAGE_HOST.contains(it, true) } == true) { "Not a gravatar URL" }
88+
require(uri.host?.contains(GRAVATAR_IMAGE_RAW_HOST, true) == true) { "Not a gravatar URL: $uri.host" }
8889
return Uri.Builder()
89-
.scheme("https")
90-
.authority(GRAVATAR_IMAGE_HOST)
90+
.scheme(uri.scheme)
91+
.authority(uri.host)
9192
.appendEncodedPath(uri.pathSegments.joinToString("/"))
9293
.appendGravatarQueryParameters(size, defaultAvatarImage, rating, forceDefaultAvatarImage)
9394
.build()

0 commit comments

Comments
 (0)