Move httpclient to another package

2024-06-24 07:13:06 -03:00
parent 985274980a
commit a6bc40515b
33 changed files with 235 additions and 20 deletions
@@ -165,6 +165,7 @@ dependencies {

    implementation project(path: ':quartz')
    implementation project(path: ':commons')
+    implementation project(path: ':ammolite')
    implementation libs.androidx.core.ktx
    implementation libs.androidx.activity.compose

@@ -70,6 +70,7 @@ class Amethyst : Application() {

    override fun onCreate() {
        super.onCreate()
+
        instance = this

        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
@@ -33,9 +33,9 @@ import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.Settings
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
@@ -30,7 +30,6 @@ import coil.decode.SvgDecoder
 import coil.size.Precision
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
@@ -48,6 +47,7 @@ import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import com.vitorpamplona.quartz.encoders.toHexKey
@@ -60,6 +60,10 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import java.io.IOException

@Stable
 class ServiceManager {
@@ -86,6 +90,7 @@ class ServiceManager {

        // Resets Proxy Use
        HttpClientManager.setDefaultProxy(account?.proxy)
+        HttpClientManager.setDefaultInterceptor(DefaultContentTypeInterceptor())
        LocalCache.antiSpam.active = account?.filterSpamFromStrangers ?: true
        Coil.setImageLoader {
            Amethyst.instance
@@ -249,3 +254,16 @@ class ServiceManager {
        forceRestart(null, false, true)
    }
 }
+
+class DefaultContentTypeInterceptor : Interceptor {
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest: Request = chain.request()
+        val requestWithUserAgent: Request =
+            originalRequest
+                .newBuilder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .build()
+        return chain.proceed(requestWithUserAgent)
+    }
+}
@@ -29,6 +29,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.events.Event
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
@@ -1,137 +0,0 @@
-/**
- * Copyright (c) 2024 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst.service
-
-import android.util.Log
-import com.vitorpamplona.amethyst.BuildConfig
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import java.io.IOException
-import java.net.InetSocketAddress
-import java.net.Proxy
-import java.time.Duration
-import kotlin.properties.Delegates
-
-object HttpClientManager {
-    val DEFAULT_TIMEOUT_ON_WIFI: Duration = Duration.ofSeconds(10L)
-    val DEFAULT_TIMEOUT_ON_MOBILE: Duration = Duration.ofSeconds(30L)
-
-    var proxyChangeListeners = ArrayList<() -> Unit>()
-    private var defaultTimeout = DEFAULT_TIMEOUT_ON_WIFI
-    private var defaultHttpClient: OkHttpClient? = null
-    private var defaultHttpClientWithoutProxy: OkHttpClient? = null
-
-    // fires off every time value of the property changes
-    private var internalProxy: Proxy? by
-        Delegates.observable(null) { _, oldValue, newValue ->
-            if (oldValue != newValue) {
-                proxyChangeListeners.forEach { it() }
-            }
-        }
-
-    fun setDefaultProxy(proxy: Proxy?) {
-        if (internalProxy != proxy) {
-            Log.d("HttpClient", "Changing proxy to: ${proxy != null}")
-            this.internalProxy = proxy
-
-            // recreates singleton
-            this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
-        }
-    }
-
-    fun getDefaultProxy(): Proxy? {
-        return this.internalProxy
-    }
-
-    fun setDefaultTimeout(timeout: Duration) {
-        Log.d("HttpClient", "Changing timeout to: $timeout")
-        if (this.defaultTimeout.seconds != timeout.seconds) {
-            this.defaultTimeout = timeout
-
-            // recreates singleton
-            this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
-        }
-    }
-
-    private fun buildHttpClient(
-        proxy: Proxy?,
-        timeout: Duration,
-    ): OkHttpClient {
-        val seconds = if (proxy != null) timeout.seconds * 3 else timeout.seconds
-        val duration = Duration.ofSeconds(seconds)
-        return OkHttpClient.Builder()
-            .proxy(proxy)
-            .readTimeout(duration)
-            .connectTimeout(duration)
-            .writeTimeout(duration)
-            .addInterceptor(DefaultContentTypeInterceptor())
-            .followRedirects(true)
-            .followSslRedirects(true)
-            .build()
-    }
-
-    class DefaultContentTypeInterceptor : Interceptor {
-        @Throws(IOException::class)
-        override fun intercept(chain: Interceptor.Chain): Response {
-            val originalRequest: Request = chain.request()
-            val requestWithUserAgent: Request =
-                originalRequest
-                    .newBuilder()
-                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                    .build()
-            return chain.proceed(requestWithUserAgent)
-        }
-    }
-
-    fun getHttpClientForUrl(url: String): OkHttpClient {
-        // TODO: How to identify relays on the local network?
-        val isLocalHost = url.startsWith("ws://127.0.0.1") || url.startsWith("ws://localhost")
-        return if (isLocalHost) {
-            getHttpClient(false)
-        } else {
-            getHttpClient()
-        }
-    }
-
-    fun getHttpClient(useProxy: Boolean = true): OkHttpClient {
-        return if (useProxy) {
-            if (this.defaultHttpClient == null) {
-                this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
-            }
-            defaultHttpClient!!
-        } else {
-            if (this.defaultHttpClientWithoutProxy == null) {
-                this.defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
-            }
-            defaultHttpClientWithoutProxy!!
-        }
-    }
-
-    fun initProxy(
-        useProxy: Boolean,
-        hostname: String,
-        port: Int,
-    ): Proxy? {
-        return if (useProxy) Proxy(Proxy.Type.SOCKS, InetSocketAddress(hostname, port)) else null
-    }
-}
@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.service

 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.service

 import android.util.Log
 import android.util.LruCache
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
 import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -24,6 +24,7 @@ import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import okhttp3.Request

@@ -30,6 +30,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
@@ -24,6 +24,7 @@ import android.util.Log
 import android.util.LruCache
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import okhttp3.EventListener
 import okhttp3.Protocol
@@ -24,9 +24,9 @@ import android.content.Context
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
 import com.vitorpamplona.quartz.encoders.Lud06
 import okhttp3.Request
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.events.RelayAuthEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -23,7 +23,7 @@ package com.vitorpamplona.amethyst.service.ots
 import android.util.Log
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.ots.BitcoinExplorer
 import com.vitorpamplona.quartz.ots.BlockHeader
 import com.vitorpamplona.quartz.ots.exceptions.UrlException
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.ots

 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.ots.ICalendar
 import com.vitorpamplona.quartz.ots.StreamDeserializationContext
@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.ots

 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
 import com.vitorpamplona.quartz.ots.StreamDeserializationContext
 import com.vitorpamplona.quartz.ots.Timestamp
@@ -33,7 +33,7 @@ import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
 import com.vitorpamplona.amethyst.Amethyst
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager

 /**
 * HLS LiveStreams cannot use cache.
@@ -22,8 +22,8 @@ package com.vitorpamplona.amethyst.service.previews

 import com.vitorpamplona.amethyst.commons.preview.MetaTag
 import com.vitorpamplona.amethyst.commons.preview.MetaTagsParser
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType
@@ -234,6 +234,7 @@ object Client : RelayPool.Listener {
        GlobalScope.launch(Dispatchers.Default) { listeners.forEach { it.onAuth(relay, challenge) } }
    }

+    @OptIn(DelicateCoroutinesApi::class)
    override fun onNotify(
        relay: Relay,
        description: String,
@@ -245,6 +246,38 @@ object Client : RelayPool.Listener {
        }
    }

+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onSend(
+        relay: Relay,
+        msg: String,
+        success: Boolean,
+    ) {
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onSend(relay, msg, success) }
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onBeforeSend(
+        relay: Relay,
+        event: EventInterface,
+    ) {
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onBeforeSend(relay, event) }
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onError(
+        error: Error,
+        subscriptionId: String,
+        relay: Relay,
+    ) {
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onError(error, subscriptionId, relay) }
+        }
+    }
+
    fun subscribe(listener: Listener) {
        listeners = listeners.plus(listener)
    }
@@ -298,5 +331,22 @@ object Client : RelayPool.Listener {
            relay: Relay,
            description: String,
        ) = Unit
+
+        open fun onSend(
+            relay: Relay,
+            msg: String,
+            success: Boolean,
+        ) = Unit
+
+        open fun onBeforeSend(
+            relay: Relay,
+            event: EventInterface,
+        ) = Unit
+
+        open fun onError(
+            error: Error,
+            subscriptionId: String,
+            relay: Relay,
+        ) = Unit
    }
 }
@@ -24,8 +24,8 @@ import android.util.Log
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.RelayBriefInfoCache
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
@@ -452,6 +452,10 @@ class Relay(
    fun sendOverride(signedEvent: EventInterface) {
        checkNotInMainThread()

+        listeners.forEach { listener ->
+            listener.onBeforeSend(this@Relay, signedEvent)
+        }
+
        if (signedEvent is RelayAuthEvent) {
            sendAuth(signedEvent)
        } else {
@@ -462,6 +466,10 @@ class Relay(
    fun send(signedEvent: EventInterface) {
        checkNotInMainThread()

+        listeners.forEach { listener ->
+            listener.onBeforeSend(this@Relay, signedEvent)
+        }
+
        if (signedEvent is RelayAuthEvent) {
            sendAuth(signedEvent)
        } else {
@@ -496,6 +504,10 @@ class Relay(
        if (isConnected()) {
            if (isReady) {
                writeToSocket("""["EVENT",${signedEvent.toJson()}]""")
+            } else {
+                synchronized(sendWhenReady) {
+                    sendWhenReady.add(signedEvent)
+                }
            }
        } else {
            // sends all filters after connection is successful.
@@ -512,7 +524,10 @@ class Relay(
        socket?.let {
            checkNotInMainThread()

-            it.send(str)
+            val result = it.send(str)
+            listeners.forEach { listener ->
+                listener.onSend(this@Relay, str, result)
+            }
            RelayStats.addBytesSent(url, str.bytesUsedInMemory())

            if (BuildConfig.DEBUG) {
@@ -588,5 +603,16 @@ class Relay(
            relay: Relay,
            description: String,
        )
+
+        fun onSend(
+            relay: Relay,
+            msg: String,
+            success: Boolean,
+        )
+
+        fun onBeforeSend(
+            relay: Relay,
+            event: EventInterface,
+        )
    }
 }
@@ -64,6 +64,8 @@ object RelayPool : Relay.Listener {
        return relays.filter { it.url == url }
    }

+    fun getAll() = relays
+
    fun getOrCreateRelay(
        url: String,
        feedTypes: Set<FeedType>? = null,
@@ -221,6 +223,23 @@ object RelayPool : Relay.Listener {
            relay: Relay,
            description: String,
        )
+
+        fun onSend(
+            relay: Relay,
+            msg: String,
+            success: Boolean,
+        )
+
+        fun onBeforeSend(
+            relay: Relay,
+            event: EventInterface,
+        )
+
+        fun onError(
+            error: Error,
+            subscriptionId: String,
+            relay: Relay,
+        )
    }

    override fun onEvent(
@@ -237,6 +256,7 @@ object RelayPool : Relay.Listener {
        subscriptionId: String,
        error: Error,
    ) {
+        listeners.forEach { it.onError(error, subscriptionId, relay) }
        updateStatus()
    }

@@ -274,6 +294,21 @@ object RelayPool : Relay.Listener {
        listeners.forEach { it.onNotify(relay, description) }
    }

+    override fun onSend(
+        relay: Relay,
+        msg: String,
+        success: Boolean,
+    ) {
+        listeners.forEach { it.onSend(relay, msg, success) }
+    }
+
+    override fun onBeforeSend(
+        relay: Relay,
+        event: EventInterface,
+    ) {
+        listeners.forEach { it.onBeforeSend(relay, event) }
+    }
+
    private fun updateStatus() {
        val connected = connectedRelays()
        val available = availableRelays()
@@ -37,13 +37,13 @@ import androidx.compose.runtime.mutableStateOf
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
 import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
 import com.vitorpamplona.amethyst.ui.components.DEFAULT_MUTED_SETTING
 import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.navigation.debugState
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
@@ -20,7 +20,7 @@
 */
 package com.vitorpamplona.amethyst.ui.actions

-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import java.net.HttpURLConnection
@@ -32,7 +32,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import okhttp3.Call
 import okhttp3.Callback
@@ -28,9 +28,9 @@ import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.Nip05NostrAddressVerifier
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.crypto.nip06.Nip06
@@ -52,7 +52,6 @@ import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.model.observables.CreatedAtComparator
 import com.vitorpamplona.amethyst.service.CashuProcessor
 import com.vitorpamplona.amethyst.service.CashuToken
-import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.Nip05NostrAddressVerifier
 import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.amethyst.service.Nip11Retriever
@@ -70,6 +69,7 @@ import com.vitorpamplona.amethyst.ui.note.showAmount
 import com.vitorpamplona.amethyst.ui.screen.CombinedZap
 import com.vitorpamplona.amethyst.ui.screen.SettingsState
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip11RelayInformation