From 2d693145d9ba0d7b1b3a9619797240d1b5a58232 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 20 Mar 2023 08:41:03 -0400 Subject: [PATCH] Follows UserAgent version syntax: User-Agent: / --- .../com/vitorpamplona/amethyst/service/Nip05Verifier.kt | 4 ++-- .../amethyst/service/lnurl/LightningAddressResolver.kt | 6 +++--- .../java/com/vitorpamplona/amethyst/service/relays/Relay.kt | 4 ++-- .../com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt | 4 ++-- .../com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt index 5b52cc858..2a0ee3240 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt @@ -1,7 +1,7 @@ package com.vitorpamplona.amethyst.service -import com.vitorpamplona.amethyst.BuildConfig import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper +import com.vitorpamplona.amethyst.BuildConfig import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -44,7 +44,7 @@ class Nip05Verifier { withContext(Dispatchers.IO) { try { val request = Request.Builder() - .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME) + .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .url(url) .build() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt index d05d71f4a..c9ac7b34c 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt @@ -1,7 +1,7 @@ package com.vitorpamplona.amethyst.service.lnurl -import com.vitorpamplona.amethyst.BuildConfig import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper +import com.vitorpamplona.amethyst.BuildConfig import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -53,7 +53,7 @@ class LightningAddressResolver { withContext(Dispatchers.IO) { val request: Request = Request.Builder() - .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME) + .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .url(url) .build() @@ -96,7 +96,7 @@ class LightningAddressResolver { } val request: Request = Request.Builder() - .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME) + .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .url(url) .build() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt index 8a99b89fa..33d45cb4d 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt @@ -1,8 +1,8 @@ package com.vitorpamplona.amethyst.service.relays -import com.vitorpamplona.amethyst.BuildConfig import android.util.Log import com.google.gson.JsonElement +import com.vitorpamplona.amethyst.BuildConfig import com.vitorpamplona.amethyst.service.model.Event import com.vitorpamplona.amethyst.service.model.EventInterface import okhttp3.OkHttpClient @@ -57,7 +57,7 @@ class Relay( try { val request = Request.Builder() - .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME) + .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .url(url.trim()) .build() val listener = object : WebSocketListener() { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt index 9437b8694..61b73bb73 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt @@ -1,6 +1,5 @@ package com.vitorpamplona.amethyst.ui.actions -import com.vitorpamplona.amethyst.BuildConfig import android.content.ContentResolver import android.content.ContentValues import android.content.Context @@ -9,6 +8,7 @@ import android.os.Build import android.os.Environment import android.provider.MediaStore import androidx.annotation.RequiresApi +import com.vitorpamplona.amethyst.BuildConfig import okhttp3.* import okio.BufferedSource import okio.IOException @@ -31,7 +31,7 @@ object ImageSaver { val client = OkHttpClient.Builder().build() val request = Request.Builder() - .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME) + .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .get() .url(url) .build() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt index d5de61d9f..7518d15a3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt @@ -1,9 +1,9 @@ package com.vitorpamplona.amethyst.ui.actions -import com.vitorpamplona.amethyst.BuildConfig import android.content.ContentResolver import android.net.Uri import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper +import com.vitorpamplona.amethyst.BuildConfig import okhttp3.* import okhttp3.MediaType.Companion.toMediaType import okio.BufferedSink @@ -45,7 +45,7 @@ object ImageUploader { val request: Request = Request.Builder() .header("Authorization", "Client-ID e6aea87296f3f96") - .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME) + .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .url("https://api.imgur.com/3/image") .post(requestBody) .build()