diff options
author | Arne Schwabe <arne@rfc2549.org> | 2022-01-13 01:51:29 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2022-01-13 01:51:29 +0100 |
commit | 80c4a9660f9c345a3bc7e52ad7440cede0ad18fe (patch) | |
tree | 8a0b89cdd18a4cbb9c88f5c8eb0eef0232c8166d | |
parent | bb28013c1e9549e3229de8ba66bf508f3253adc5 (diff) |
Import new OpenVPN 3 version
m--------- | main/src/main/cpp/openvpn3 | 0 | ||||
-rw-r--r-- | main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 8 |
2 files changed, 2 insertions, 6 deletions
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3 -Subproject 7f48cd0db1ab1cf514740f2b51d1bb5bd4988a0 +Subproject dba03183ce638d57a1ec22f1ef3b2e80749c898 diff --git a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java index 3c197b25..adcf94fd 100644 --- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java +++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java @@ -47,12 +47,9 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable return; setUserPW(); - - VpnStatus.logInfo(ClientAPI_OpenVPNClientHelper.platform()); VpnStatus.logInfo(ClientAPI_OpenVPNClientHelper.copyright()); - StatusPoller statuspoller = new StatusPoller(OpenVPNManagement.mBytecountInterval * 1000); new Thread(statuspoller, "Status Poller").start(); @@ -60,9 +57,8 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable if (status.getError()) { VpnStatus.logError(String.format("connect() error: %s: %s", status.getStatus(), status.getMessage())); VpnStatus.addExtraHints(status.getMessage()); - } else { - VpnStatus.updateStateString("NOPROCESS", "OpenVPN3 thread finished", R.string.state_noprocess, ConnectionStatus.LEVEL_NOTCONNECTED); } + VpnStatus.updateStateString("NOPROCESS", "OpenVPN3 thread finished", R.string.state_noprocess, ConnectionStatus.LEVEL_NOTCONNECTED); statuspoller.stop(); } @@ -190,7 +186,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable config.setRetryOnAuthFailed(retryOnAuthFailed); config.setEnableLegacyAlgorithms(mVp.mUseLegacyProvider); if (mVp.mCompatMode > 0 && mVp.mCompatMode < 20500) - config.setEnableNonPreferredDCOAlgorithms(true); + config.setEnableNonPreferredDCAlgorithms(true); if (!TextUtils.isEmpty(mVp.mTlSCertProfile)) config.setTlsCertProfileOverride(mVp.mTlSCertProfile); |