diff options
author | cyberta <cyberta@riseup.net> | 2022-08-08 23:30:32 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2022-08-08 23:30:32 +0000 |
commit | 8e0fa913e098087d73f8ce63888b2213c2c63741 (patch) | |
tree | 1f5865a9e30286f726ee0751e535572f3c4fee2d /app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | |
parent | 8d06c86a2fedf7a758801ac0b029b53b54977bd7 (diff) | |
parent | 6d705263bf0fd616926d2c64ada98e2ee7740024 (diff) |
Merge branch 'update_dependencies' into 'master'
update API version and dependencies
Closes #9057
See merge request leap/bitmask_android!206
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java index 00147828..0edfeaeb 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -457,7 +457,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { } // atuo detection of proxy - if (proxyType == Connection.ProxyType.NONE) { + if (proxyType == Connection.ProxyType.NONE && mProfile != null) { SocketAddress proxyaddr = ProxyDetection.detectProxy(mProfile); if (proxyaddr instanceof InetSocketAddress) { InetSocketAddress isa = (InetSocketAddress) proxyaddr; |