From 561eb26edf5e23aaa4da1770d69c04a7614eb3ab Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 19 Oct 2019 01:28:19 +0200 Subject: VpnProfiles are equal if they have the same ip and transport --- app/src/main/java/de/blinkt/openvpn/VpnProfile.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/de/blinkt/openvpn/VpnProfile.java') diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java index f139fdc9..50362085 100644 --- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java +++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java @@ -70,6 +70,7 @@ import se.leap.bitmaskclient.R; import static de.blinkt.openvpn.core.connection.Connection.TransportType.OBFS4; import static se.leap.bitmaskclient.Constants.PROVIDER_PROFILE; +import static se.leap.bitmaskclient.utils.ConfigHelper.stringEqual; public class VpnProfile implements Serializable, Cloneable { // Note that this class cannot be moved to core where it belongs since @@ -259,11 +260,11 @@ public class VpnProfile implements Serializable, Cloneable { @Override public boolean equals(Object obj) { if (obj instanceof VpnProfile) { - VpnProfile vpnProfile = (VpnProfile) obj; - return mUuid.equals(vpnProfile.mUuid); - } else { - return false; + VpnProfile vp = (VpnProfile) obj; + return stringEqual(vp.mGatewayIp, mGatewayIp) && + vp.mUsePluggableTransports == mUsePluggableTransports; } + return false; } public void clearDefaults() { -- cgit v1.2.3