diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-12 02:08:46 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-12 02:14:25 +0200 |
| commit | be479a89ee0408f73ac16feeef842c88c8a10353 (patch) | |
| tree | 795c0037e2f19bf6e6d97b34c0f0d12f469e5b59 | |
| parent | Address lint issues in TunnelListFragment (diff) | |
| download | wireguard-android-be479a89ee0408f73ac16feeef842c88c8a10353.tar.xz wireguard-android-be479a89ee0408f73ac16feeef842c88c8a10353.zip | |
Version bump
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | 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); |