diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2016-05-04 19:09:53 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2016-05-04 19:09:53 +0200 |
| commit | c126740f463582545afcd27b7725fc84b2d0907c (patch) | |
| tree | bfefbac9108f60291a6c8bea91b8ea9c1e3611fa | |
| parent | ad494bd239f898f32e97820bcf31d9420bff0106 (diff) | |
| parent | 8e84c38a3e650af61cd2548d931ed617e4af0069 (diff) | |
Merge commit '8e84c38a3e650af61cd2548d931ed617e4af0069'
| m--------- | main/openssl | 0 | ||||
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/VpnProfile.java | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/openssl b/main/openssl -Subproject f6da7c53fd01990e8e039dbfd5e9ea87e50d1d4 +Subproject c4feda0b636aa397cf4e731d3aef91948c3fc2b diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java index 11656ee3..31a52ec0 100644 --- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java +++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java @@ -272,7 +272,7 @@ public class VpnProfile implements Serializable, Cloneable { if (!configForOvpn3) { cfg += String.format("setenv IV_GUI_VER %s \n", openVpnEscape(getVersionEnvString(context))); - String versionString = String.format("%d %s %s %s %s %s", Build.VERSION.SDK_INT, Build.VERSION.RELEASE, + String versionString = String.format(Locale.US, "%d %s %s %s %s %s", Build.VERSION.SDK_INT, Build.VERSION.RELEASE, NativeUtils.getNativeAPI(), Build.BRAND, Build.BOARD, Build.MODEL); cfg += String.format("setenv IV_PLAT_VER %s\n", openVpnEscape(versionString)); } @@ -450,7 +450,7 @@ public class VpnProfile implements Serializable, Cloneable { if (mMssFix != 0) { if (mMssFix != 1450) { - cfg += String.format("mssfix %d\n", mMssFix, Locale.US); + cfg += String.format(Locale.US, "mssfix %d\n", mMssFix); } else cfg += "mssfix\n"; } |