From 7689905c78e9312dc43b9927d523bbe14e707698 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 24 Jul 2018 13:39:50 +0530 Subject: config: Remove Locale based string format The configurations are supposed to be in a very specific format which is not user-facing and hence doesn't have to be adjusted for locale avoiding both the redundancy as well as potential breakages in the configuration file format from different locales. Fixes: 71c67aa24ae2 ("config: Minor cleanup") Reported-by: Samuel Holland Signed-off-by: Harsh Shandilya --- app/src/main/java/com/wireguard/config/Peer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app/src/main/java/com/wireguard/config/Peer.java') diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/app/src/main/java/com/wireguard/config/Peer.java index b3532eeb..2a4f4465 100644 --- a/app/src/main/java/com/wireguard/config/Peer.java +++ b/app/src/main/java/com/wireguard/config/Peer.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Locale; import java9.lang.Iterables; @@ -72,7 +71,7 @@ public class Peer { private String getEndpointString() { if (endpoint == null) return null; - return String.format(Locale.getDefault(), "%s:%d", endpoint.getHostString(), endpoint.getPort()); + return String.format("%s:%d", endpoint.getHostString(), endpoint.getPort()); } public int getPersistentKeepalive() { @@ -104,12 +103,10 @@ public class Peer { if (endpoint.isUnresolved()) throw new UnknownHostException(endpoint.getHostString()); if (endpoint.getAddress() instanceof Inet6Address) - return String.format(Locale.getDefault(), - "[%s]:%d", + return String.format("[%s]:%d", endpoint.getAddress().getHostAddress(), endpoint.getPort()); - return String.format(Locale.getDefault(), - "%s:%d", + return String.format("%s:%d", endpoint.getAddress().getHostAddress(), endpoint.getPort()); } -- cgit v1.2.3