summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-10-29 11:55:24 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-10-29 14:18:30 +0100
commit7d8c15ce9a56a03134fa455915c501cdc3666258 (patch)
tree403b4282a06a1f8371b192000adbebe1afe6c521 /android/lib
parent22e22776e9cde219235e347a3913e802f69a732a (diff)
downloadmullvadvpn-7d8c15ce9a56a03134fa455915c501cdc3666258.tar.xz
mullvadvpn-7d8c15ce9a56a03134fa455915c501cdc3666258.zip
Update grpc to 1.68.1 and grpc-protobuf to 4.28.3
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt11
1 files changed, 7 insertions, 4 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt
index 37a3c9cdc0..d77a9ba6c7 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/resolver/DummyNameResolver.kt
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.lib.daemon.grpc.resolver
import io.grpc.EquivalentAddressGroup
import io.grpc.NameResolver
+import io.grpc.StatusOr
import java.net.InetSocketAddress
class DummyNameResolver : NameResolver() {
@@ -11,10 +12,12 @@ class DummyNameResolver : NameResolver() {
override fun start(listener: Listener2) {
val resolutionResult =
ResolutionResult.newBuilder()
- .setAddresses(
- listOf(
- EquivalentAddressGroup(
- InetSocketAddress.createUnresolved(DUMMY_HOST, DUMMY_PORT)
+ .setAddressesOrError(
+ StatusOr.fromValue(
+ listOf(
+ EquivalentAddressGroup(
+ InetSocketAddress.createUnresolved(DUMMY_HOST, DUMMY_PORT)
+ )
)
)
)