From be479a89ee0408f73ac16feeef842c88c8a10353 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 12 Jul 2018 02:08:46 +0200 Subject: Version bump --- app/build.gradle | 4 ++-- app/src/main/java/com/wireguard/config/Peer.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 56ea50a2..b0bcc3b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId 'com.wireguard.android' minSdkVersion 21 targetSdkVersion 27 - versionCode 430 - versionName '0.0.20180710' + versionCode 432 + versionName '0.0.20180711' } // If the keystore file exists if (keystorePropertiesFile.exists()) { diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/app/src/main/java/com/wireguard/config/Peer.java index 6e8d5a89..371072de 100644 --- a/app/src/main/java/com/wireguard/config/Peer.java +++ b/app/src/main/java/com/wireguard/config/Peer.java @@ -26,6 +26,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; +import java9.lang.Iterables; + /** * Represents the configuration for a WireGuard peer (a [Peer] block). */ @@ -262,7 +264,7 @@ public class Peer { final boolean hasDefaultRouteModRFC1918 = ips.containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4); if ((!hasDefaultRoute && !hasDefaultRouteModRFC1918) || numSiblings > 0) return; - ips.clear(); + Iterables.removeIf(ips, ip -> !ip.contains(":")); if (hasDefaultRoute) { ips.addAll(DEFAULT_ROUTE_MOD_RFC1918_V4); ips.addAll(interfaceDNSRoutes); -- cgit v1.2.3-59-g8ed1b