From 7d8c15ce9a56a03134fa455915c501cdc3666258 Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Tue, 29 Oct 2024 11:55:24 +0100
Subject: [PATCH] Update grpc to 1.68.1 and grpc-protobuf to 4.28.3

---
 android/gradle/libs.versions.toml             |   5 +-
 android/gradle/verification-metadata.xml      | 130 +++++++++---------
 .../daemon/grpc/resolver/DummyNameResolver.kt |  11 +-
 3 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 54471d38c0ec..afbb849858f2 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -30,11 +30,10 @@ compose-destinations = "2.1.0-beta13"
 compose-constraintlayout = "1.0.1"
 compose-material3 = "1.3.0"
 
-# Await resolution of https://github.com/grpc/grpc-java/issues/11550 before updating.
-grpc = "1.67.1"
+grpc = "1.68.1"
 grpc-kotlin = "1.4.1"
 grpc-kotlin-jar = "1.4.1:jdk8@jar"
-grpc-protobuf = "4.28.2"
+grpc-protobuf = "4.28.3"
 
 # Koin
 koin = "4.0.0"
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index d37205c4c16d..f279134a5abf 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -3364,43 +3364,43 @@
             <sha256 value="c615f76879dc5c303e4df5b94a6afa39534058c7545db2d483fd95d9f63c8bfe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-javalite" version="4.28.2">
-         <artifact name="protobuf-javalite-4.28.2.jar">
-            <sha256 value="dcbac0ae7a6ff7a751ca426bc49008f80c7a5d4ecde9d84750ca86dd2f614db3" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protobuf-javalite" version="4.28.3">
+         <artifact name="protobuf-javalite-4.28.3.jar">
+            <sha256 value="900f12e5c96540cbb5c6bc7bb5d4cbd0d4f0a30fb23d7300244e93943a16f838" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-kotlin-lite" version="4.28.2">
-         <artifact name="protobuf-kotlin-lite-4.28.2.jar">
-            <sha256 value="d5b0d0a06fa2dd4917716fa5ca327a50f4921ab00266547b8f6b5f79995e2e63" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protobuf-kotlin-lite" version="4.28.3">
+         <artifact name="protobuf-kotlin-lite-4.28.3.jar">
+            <sha256 value="5cfafeb13ebd76fbfdcbb98c95016810d32c37f214570ee3b8731dd45c942ffc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protoc" version="4.28.2">
-         <artifact name="protoc-4.28.2-linux-aarch_64.exe">
-            <sha256 value="b3e419ae03f32ee2879a453b5750a624997435c781f0c84fb640b86072837066" origin="Generated by Gradle"/>
+      <component group="com.google.protobuf" name="protoc" version="4.28.3">
+         <artifact name="protoc-4.28.3-linux-aarch_64.exe">
+            <sha256 value="fac5818bce92cfd652264514c0663173643752f6ab6dc83a44b268da880a5cec" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-linux-ppcle_64.exe">
-            <sha256 value="ae83e6d4a00de923842e3111776fcf5a10d322d2a5193bd4d9932547ace0d15b" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-linux-ppcle_64.exe">
+            <sha256 value="d7f53b97d8bdfb8d7ab7c2c664ad08d69f7c1d2060fb54f44d5e307acc0f9907" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-linux-s390_64.exe">
-            <sha256 value="db3d6b087a5e70792bbdd59ad4898deea6ed185e2c2fdb5efeb47440c0eb0943" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-linux-s390_64.exe">
+            <sha256 value="f9e178b088f94d310d525b0a859b59eab45d673989a88aa45fb9415848dc8f92" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-linux-x86_32.exe">
-            <sha256 value="e0f2a2233887af7c92b2fc9dbf4ed99b66093291660bc1c9da0e68e6f3b6f6aa" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-linux-x86_32.exe">
+            <sha256 value="ff2848bbf73e216054097d67f4a17d2bfae8d673ea9e92771140d9102549494f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-linux-x86_64.exe">
-            <sha256 value="c280b6c0bec0c30b1b6127ed7f53488971efadfb249d7776331b9d63bc78f917" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-linux-x86_64.exe">
+            <sha256 value="0e8c86f9b69b2b0fff91d56d8906a846ad89ce56dfeb1b673287b61c959bd633" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-osx-aarch_64.exe">
-            <sha256 value="0819440a4ebeb343eb7bbdd8f5bef5e3ebfc4794274a353b350afa4ab6c56437" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-osx-aarch_64.exe">
+            <sha256 value="32fa62ce249135f37eaf93f1556329b22d608a62901e8b1f3bfde4d6e0c2c7b6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-osx-x86_64.exe">
-            <sha256 value="3682b9e8cbf64479c0d1b953387672bc110ec06079a398c523d00bba2662267d" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-osx-x86_64.exe">
+            <sha256 value="70171c15d173b3d0a5d06766c51f35e09a5be858910b10a737c943a19094b437" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-windows-x86_32.exe">
-            <sha256 value="f1f4ac3d659f73ea37d7470b19c23b4a1e82e3abc6f5a8a59faeb3d868ef1820" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-windows-x86_32.exe">
+            <sha256 value="3740fe398fb9a265a1fcc998b7160ff431bd2ad50ea89c23a36d0ce7e5fe4caa" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-4.28.2-windows-x86_64.exe">
-            <sha256 value="7bf33e0b00a7bc1dc672a385ea0dae2f86cfd2a52adb97719b083d00a212adf6" origin="Generated by Gradle"/>
+         <artifact name="protoc-4.28.3-windows-x86_64.exe">
+            <sha256 value="38f442c16d2d681a321dabe9c2ddc5600d3def337d68e2b7a632f253cda6e39d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.9-alpha02">
@@ -4193,9 +4193,9 @@
             <sha256 value="2167c3642cd8f62c02b4b90b7d9b1a7b7acd43b742cf2cf92772e113c6025329" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-android" version="1.67.1">
-         <artifact name="grpc-android-1.67.1.aar">
-            <sha256 value="2544920ea5f46720dcf75e8200a374d0d376fdc8f294287bb57975bab382a639" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-android" version="1.68.1">
+         <artifact name="grpc-android-1.68.1.aar">
+            <sha256 value="788dde58f01a9de18395aaaacf9f97316311a63251bdbb9c2da41221a7058236" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-api" version="1.57.0">
@@ -4203,9 +4203,9 @@
             <sha256 value="8d2c384299f84ee8aa7f670f00e7cb26b87e231cf3091474307b32b76910f71c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-api" version="1.67.1">
-         <artifact name="grpc-api-1.67.1.jar">
-            <sha256 value="dfffa28ca4d2f98aeb844a185e8e6a43e53054748e75339a84a2df39e9981db6" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-api" version="1.68.1">
+         <artifact name="grpc-api-1.68.1.jar">
+            <sha256 value="d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-context" version="1.57.0">
@@ -4213,9 +4213,9 @@
             <sha256 value="953fcacd82f531e69b76e3834f5830bad4c22ae84144e058d71dc80a7430275d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-context" version="1.67.1">
-         <artifact name="grpc-context-1.67.1.jar">
-            <sha256 value="244f0ee6ea6bdd36f64a523e29f523d08466f4cf944ef5cc75d64de43e4795e8" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-context" version="1.68.1">
+         <artifact name="grpc-context-1.68.1.jar">
+            <sha256 value="1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-core" version="1.57.0">
@@ -4223,9 +4223,9 @@
             <sha256 value="3bee48c73bc4c5b55bed79be0e484adf26ba56bebbe5798ddbf34714ef1e1cea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-core" version="1.67.1">
-         <artifact name="grpc-core-1.67.1.jar">
-            <sha256 value="724cab7adab74ac5e4bc92ce14b5704fae24ebda35a58ae300ea6889fbd0e9fb" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-core" version="1.68.1">
+         <artifact name="grpc-core-1.68.1.jar">
+            <sha256 value="e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-kotlin-stub" version="1.4.1">
@@ -4241,9 +4241,9 @@
             <sha256 value="81d43f2d4ed18fa341bd840a3735f1403a70074a046e157e27f679b721b4c9ad" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-okhttp" version="1.67.1">
-         <artifact name="grpc-okhttp-1.67.1.jar">
-            <sha256 value="8c7ebae9d0210e720a1c14f59d5a7a54bbd3644a15c49a623d0181ee8ce97179" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-okhttp" version="1.68.1">
+         <artifact name="grpc-okhttp-1.68.1.jar">
+            <sha256 value="5918067982d712a552983f5c9cf95908a117ac99c43f88871e32ac6ce5830661" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-protobuf" version="1.57.0">
@@ -4256,9 +4256,9 @@
             <sha256 value="2c507c02d981b84a21763d44e09af4f279881dd3e25be3080f6361258607f198" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-protobuf-lite" version="1.67.1">
-         <artifact name="grpc-protobuf-lite-1.67.1.jar">
-            <sha256 value="e6494656187b8948349632c146431e5a75e8307ae491c7c8426c577628c3020a" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-protobuf-lite" version="1.68.1">
+         <artifact name="grpc-protobuf-lite-1.68.1.jar">
+            <sha256 value="f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-stub" version="1.57.0">
@@ -4271,38 +4271,38 @@
             <sha256 value="84d2af12719168f76375f2afdfd6eb5133a865edba9244d40e6b968e3adde1d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="grpc-util" version="1.67.1">
-         <artifact name="grpc-util-1.67.1.jar">
-            <sha256 value="297f6600b8651a3990efcefd53c5e98bd369badbdc2444d789adc7af14236494" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="grpc-util" version="1.68.1">
+         <artifact name="grpc-util-1.68.1.jar">
+            <sha256 value="d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.grpc" name="protoc-gen-grpc-java" version="1.67.1">
-         <artifact name="protoc-gen-grpc-java-1.67.1-linux-aarch_64.exe">
-            <sha256 value="cb5e04fc832655829af4c79744b69ffd8b1d3122a945ca51d1638b3a0686bddc" origin="Generated by Gradle"/>
+      <component group="io.grpc" name="protoc-gen-grpc-java" version="1.68.1">
+         <artifact name="protoc-gen-grpc-java-1.68.1-linux-aarch_64.exe">
+            <sha256 value="9a5ac82afa45aa3a855b1674d661f12accc677b253709c2e6fd126ad587d025b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-linux-ppcle_64.exe">
-            <sha256 value="5861fd81d9e4310b090f83757f65315bf17e7b965db43e0f34b9aa3abe15c59c" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-linux-ppcle_64.exe">
+            <sha256 value="b92a58a017a012b18abb7346001e7b09c8e7c2fd288de96941ae07e1fda4ef25" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-linux-s390_64.exe">
-            <sha256 value="cf0398e7643d13c465c5a62e457509b02a2ca33e8aa07fb9d7b08a66d04dd529" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-linux-s390_64.exe">
+            <sha256 value="528bad54c81fdb40279326ddd76cc15ce94680def7d45b800a519e64e37c47bc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-linux-x86_32.exe">
-            <sha256 value="44dd4e3b92c4c2b3509a6b06f3d8fd5805194983fe467ad45147e42b459e87de" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-linux-x86_32.exe">
+            <sha256 value="4836fd19bc380d7dace3952fe68c368ff7338eb33137a38d7ded0dcd6a99c87b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-linux-x86_64.exe">
-            <sha256 value="fd290e2a58812531aea5bfae9e3ac5996ebf340623f16a629618ceb1c3b9bf35" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-linux-x86_64.exe">
+            <sha256 value="6eb5bfb8dde3d4b657920dbb42dd2f8ed2e36a3ffd5f46128a4f7f0e2c181c40" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-osx-aarch_64.exe">
-            <sha256 value="a2aec8c7781d2441b256920a1852788601ce7188de348e5840daf5e31ea85518" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-osx-aarch_64.exe">
+            <sha256 value="c2fb72eaefd4824833007b51ae49ab16f9157bbba98fdae0e379035a4e3fa7c9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-osx-x86_64.exe">
-            <sha256 value="a2aec8c7781d2441b256920a1852788601ce7188de348e5840daf5e31ea85518" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-osx-x86_64.exe">
+            <sha256 value="c2fb72eaefd4824833007b51ae49ab16f9157bbba98fdae0e379035a4e3fa7c9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-windows-x86_32.exe">
-            <sha256 value="e77468bf3ec32f16b6865ae9dc65906e4ce2afa1102af34bd46f9c10fef20810" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-windows-x86_32.exe">
+            <sha256 value="47a7f858cf7e2c31905e6fbcad6fa6d25229436ec7573c8c4fbf9c6c95e7fbba" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="protoc-gen-grpc-java-1.67.1-windows-x86_64.exe">
-            <sha256 value="476b7b36d5393a66628a9a107105a40b2e488b9e37f26dab25035bdd4952c8ee" origin="Generated by Gradle"/>
+         <artifact name="protoc-gen-grpc-java-1.68.1-windows-x86_64.exe">
+            <sha256 value="d34c6dd11d307660bf34fb9aca6381cb8d2c77019c9e4b6e2a9fd0494badc4d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="protoc-gen-grpc-kotlin" version="1.4.1">
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 37a3c9cdc07f..d77a9ba6c791 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)
+                            )
                         )
                     )
                 )