diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2021-06-15 16:45:45 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2021-06-15 16:45:45 +0200 |
| commit | 0d5277d7380ed5ae61216c7041bbafe934827613 (patch) | |
| tree | 239e7b6daa3017a213be72b93a7e47826aac8b43 /main/src/main/java | |
| parent | 8e42e5cbc54c820f2b39082289d7257413eeafc3 (diff) | |
Number of miscellenous fixes and clean ups
Diffstat (limited to 'main/src/main/java')
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java index d37f34ed..22d451eb 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -891,7 +891,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac VpnStatus.logInfo(R.string.dns_server_info, TextUtils.join(", ", mDnslist), mDomain); VpnStatus.logInfo(R.string.routes_info_incl, TextUtils.join(", ", mRoutes.getNetworks(true)), TextUtils.join(", ", mRoutesv6.getNetworks(true))); VpnStatus.logInfo(R.string.routes_info_excl, TextUtils.join(", ", mRoutes.getNetworks(false)), TextUtils.join(", ", mRoutesv6.getNetworks(false))); - if (mProxyInfo != null) { + if (mProxyInfo != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { VpnStatus.logInfo(R.string.proxy_info, mProxyInfo.getHost(), mProxyInfo.getPort()); } VpnStatus.logDebug(R.string.routes_debug, TextUtils.join(", ", positiveIPv4Routes), TextUtils.join(", ", positiveIPv6Routes)); @@ -1087,6 +1087,9 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac } public boolean addHttpProxy(String proxy, int port) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) + return false; + try { mProxyInfo = ProxyInfo.buildDirectProxy(proxy, port); } catch (Exception e) |