diff options
Diffstat (limited to 'main/src/main/java')
3 files changed, 3 insertions, 4 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java index d13ac7fa..af65873d 100644 --- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java +++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java @@ -386,7 +386,7 @@ public class VpnProfile implements Serializable, Cloneable { if (mUseLegacyProvider) cfg.append("provider legacy:default\n"); - if (!TextUtils.isEmpty(mTlSCertProfile)) + if (!TextUtils.isEmpty(mTlSCertProfile) && mAuthenticationType != TYPE_STATICKEYS) cfg.append(String.format("tls-cert-profile %s\n", mTlSCertProfile)); } else { cfg.append("# Config for OpenVPN 3 C++\n"); 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 cb78784c..09730245 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -614,7 +614,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac // Open the Management Interface if (!useOpenVPN3) { - // start a Thread that handles incoming messages of the managment socket + // start a Thread that handles incoming messages of the management socket OpenVpnManagementThread ovpnManagementThread = new OpenVpnManagementThread(mProfile, this); if (ovpnManagementThread.openManagementInterface(this)) { Thread mSocketManagerThread = new Thread(ovpnManagementThread, "OpenVPNManagementThread"); diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java index f72c759f..e32aabe3 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java +++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java @@ -131,6 +131,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { } catch (IOException e) {
// wait 300 ms before retrying
try {
+ //noinspection BusyWait
Thread.sleep(300);
} catch (InterruptedException ignored) {
}
@@ -216,8 +217,6 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement { pendingInput += input;
pendingInput = processInput(pendingInput);
-
-
}
} catch (IOException e) {
if (!e.getMessage().equals("socket closed") && !e.getMessage().equals("Connection reset by peer"))
|