mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Put DNS for active network first

Browse source 
(cherry picked from commit 0403df8be7e8601fe2014ace68fb2fbe3b4ef0a5)
This commit is contained in:
Stephen Paul Weber 2024-10-30 10:45:43 -05:00 committed by Arne
parent 8af4ea8619
commit 4878146862
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/utils/AndroidUsingLinkProperties.java
View file

@ -13,6 +13,7 @@ import java.net.Inet4Address;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.minidns.dnsserverlookup.AbstractDnsServerLookupMechanism;
import org.minidns.dnsserverlookup.AndroidUsingExec;
@ -41,7 +42,7 @@ public class AndroidUsingLinkProperties extends AbstractDnsServerLookupMechanism
}
final Network activeNetwork = getActiveNetwork(connectivityManager);
final List<String> servers = new ArrayList<>();
int vpnOffset = 0;
int offset = 0;
for(Network network : networks) {
LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
if (linkProperties == null) {
@ -50,15 +51,15 @@ public class AndroidUsingLinkProperties extends AbstractDnsServerLookupMechanism
final NetworkInfo networkInfo = connectivityManager.getNetworkInfo(network);
final boolean isActiveNetwork = network.equals(activeNetwork);
final boolean isVpn = networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_VPN;
if (isActiveNetwork && isVpn) {
if (isActiveNetwork) {
final List<String> tmp = getIPv4First(linkProperties.getDnsServers());
servers.addAll(0, tmp);
vpnOffset += tmp.size();
offset += tmp.size();
} else if (hasDefaultRoute(linkProperties) || isActiveNetwork || activeNetwork == null || isVpn) {
servers.addAll(vpnOffset, getIPv4First(linkProperties.getDnsServers()));
servers.addAll(offset, getIPv4First(linkProperties.getDnsServers()));
}
}
return servers;
return servers.stream().distinct().collect(Collectors.toList());
}
@TargetApi(23)