diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-02-25 09:54:28 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-02-25 09:54:28 +0100 |
| commit | f06f8116d717d23af540062861e3c5bae29b4fc3 (patch) | |
| tree | 072b9de716845638c3bcb2c8626e4dd454df96c9 /android/lib | |
| parent | 3d264be4e22da7aefa72432db9684b8b5930a64d (diff) | |
| parent | af08e14db1028a3482ef8e646d79ce9185d42641 (diff) | |
| download | mullvadvpn-f06f8116d717d23af540062861e3c5bae29b4fc3.tar.xz mullvadvpn-f06f8116d717d23af540062861e3c5bae29b4fc3.zip | |
Merge branch 'app-is-broken-when-using-wifi-proxy-droid-1803'
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt index d4cedd1e61..e529f29ae5 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt @@ -152,6 +152,9 @@ class ManagementService( rpcSocketFile.absolutePath, LocalSocketAddress.Namespace.FILESYSTEM, ) + // Workaround for handling WiFi with proxy + // https://github.com/grpc/grpc-java/issues/11922 + .proxyDetector { null } .build() val connectionState: StateFlow<GrpcConnectivityState> = |