fix: update renamed APIs (trustAllCerts→usePinnedTrustStore, IRequestListener→SubscriptionListener)
Adapt cherry-picked PR commits to current main where: - ElectrumxServer.trustAllCerts was renamed to usePinnedTrustStore - IRequestListener was renamed to SubscriptionListener
This commit is contained in:
+2
-2
@@ -66,7 +66,7 @@ data class NamecoinSettings(
|
|||||||
* TLS is the default protocol. Append `:tcp` for plaintext
|
* TLS is the default protocol. Append `:tcp` for plaintext
|
||||||
* (useful for `.onion` addresses and local servers).
|
* (useful for `.onion` addresses and local servers).
|
||||||
*
|
*
|
||||||
* `.onion` addresses automatically get `trustAllCerts = true`
|
* `.onion` addresses automatically get `usePinnedTrustStore = true`
|
||||||
* since certificate verification is meaningless over Tor.
|
* since certificate verification is meaningless over Tor.
|
||||||
*/
|
*/
|
||||||
fun parseServerString(s: String): ElectrumxServer? {
|
fun parseServerString(s: String): ElectrumxServer? {
|
||||||
@@ -81,7 +81,7 @@ data class NamecoinSettings(
|
|||||||
host = host,
|
host = host,
|
||||||
port = port,
|
port = port,
|
||||||
useSsl = useSsl,
|
useSsl = useSsl,
|
||||||
trustAllCerts = isOnion || !useSsl,
|
usePinnedTrustStore = true,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -71,7 +71,7 @@ import com.vitorpamplona.amethyst.desktop.network.DesktopRelayConnectionManager
|
|||||||
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinService
|
import com.vitorpamplona.amethyst.desktop.service.namecoin.LocalNamecoinService
|
||||||
import com.vitorpamplona.quartz.nip01Core.core.Event
|
import com.vitorpamplona.quartz.nip01Core.core.Event
|
||||||
import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
|
import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.IRequestListener
|
import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
|
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
||||||
import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
|
import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
|
||||||
@@ -209,7 +209,7 @@ fun ImportFollowListDialog(
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
relays = relays,
|
relays = relays,
|
||||||
listener = object : IRequestListener {
|
listener = object : SubscriptionListener {
|
||||||
override fun onEvent(
|
override fun onEvent(
|
||||||
event: Event,
|
event: Event,
|
||||||
isLive: Boolean,
|
isLive: Boolean,
|
||||||
@@ -257,7 +257,7 @@ fun ImportFollowListDialog(
|
|||||||
limit = follows.size,
|
limit = follows.size,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
listener = object : IRequestListener {
|
listener = object : SubscriptionListener {
|
||||||
override fun onEvent(
|
override fun onEvent(
|
||||||
event: Event,
|
event: Event,
|
||||||
isLive: Boolean,
|
isLive: Boolean,
|
||||||
|
|||||||
Reference in New Issue
Block a user