From b30fb1d9c7d7f168e99db4942477b5df7d1f398d Mon Sep 17 00:00:00 2001
From: John Economou <hsoc@cheeky.irc.gr>
Date: Mon, 20 Mar 2023 13:43:25 +0200
Subject: [PATCH] User-Agent fix

include client version in user-agent
---
 .../java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt | 3 ++-
 .../amethyst/service/lnurl/LightningAddressResolver.kt       | 5 +++--
 .../java/com/vitorpamplona/amethyst/service/relays/Relay.kt  | 3 ++-
 .../java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt | 5 +++--
 .../com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt   | 3 ++-
 5 files changed, 12 insertions(+), 7 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 81edc34ae..5b52cc858 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.BuildConfig
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -43,7 +44,7 @@ class Nip05Verifier {
         withContext(Dispatchers.IO) {
             try {
                 val request = Request.Builder()
-                    .header("User-Agent", "Amethyst")
+                    .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 801f9e30c..d05d71f4a 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,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.lnurl
 
+import com.vitorpamplona.amethyst.BuildConfig
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -52,7 +53,7 @@ class LightningAddressResolver {
 
         withContext(Dispatchers.IO) {
             val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME)
                 .url(url)
                 .build()
 
@@ -95,7 +96,7 @@ class LightningAddressResolver {
             }
 
             val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .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 309badbf0..8a99b89fa 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,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.relays
 
+import com.vitorpamplona.amethyst.BuildConfig
 import android.util.Log
 import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.service.model.Event
@@ -56,7 +57,7 @@ class Relay(
 
         try {
             val request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .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 ef763f8e6..9437b8694 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,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import com.vitorpamplona.amethyst.BuildConfig
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Context
@@ -30,7 +31,7 @@ object ImageSaver {
         val client = OkHttpClient.Builder().build()
 
         val request = Request.Builder()
-            .header("User-Agent", "Amethyst")
+            .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME)
             .get()
             .url(url)
             .build()
@@ -137,5 +138,5 @@ object ImageSaver {
         MediaScannerConnection.scanFile(context, arrayOf(outputFile.toString()), null, null)
     }
 
-    private const val PICTURES_SUBDIRECTORY = "Amethyst"
+    private const val PICTURES_SUBDIRECTORY = "Amethyst " + BuildConfig.VERSION_NAME
 }
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 8e23f66a6..d5de61d9f 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,5 +1,6 @@
 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
@@ -44,7 +45,7 @@ object ImageUploader {
 
         val request: Request = Request.Builder()
             .header("Authorization", "Client-ID e6aea87296f3f96")
-            .header("User-Agent", "Amethyst")
+            .header("User-Agent", "Amethyst " + BuildConfig.VERSION_NAME)
             .url("https://api.imgur.com/3/image")
             .post(requestBody)
             .build()