thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests Wiki Activity Actions

Use only active network dns if there is any

Browse source 
(cherry picked from commit e6534b61bdd255a118b562d9840193f3f721b624)
This commit is contained in:
Stephen Paul Weber 2024-12-09 10:52:42 -05:00 committed by Arne
parent 8d29f71c92
commit 724bfc508e
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,8 +41,8 @@ public class AndroidUsingLinkProperties extends AbstractDnsServerLookupMechanism
return new ArrayList<>();
}
final Network activeNetwork = getActiveNetwork(connectivityManager);
final List<String> servers = new ArrayList<>();
int offset = 0;
final List<String> networkServers = new ArrayList<>();
final List<String> otherServers = new ArrayList<>();
for(Network network : networks) {
LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
if (linkProperties == null) {
@ -51,15 +51,13 @@ 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) {
final List<String> tmp = getIPv4First(linkProperties.getDnsServers());
servers.addAll(0, tmp);
offset += tmp.size();
} else if (hasDefaultRoute(linkProperties) || isActiveNetwork || activeNetwork == null || isVpn) {
servers.addAll(offset, getIPv4First(linkProperties.getDnsServers()));
final List<String> servers = getIPv4First(linkProperties.getDnsServers());
if (hasDefaultRoute(linkProperties) || isActiveNetwork || activeNetwork == null || isVpn) {
if (isActiveNetwork || isVpn) networkServers.addAll(servers);
otherServers.addAll(servers);
}
}
return servers.stream().distinct().collect(Collectors.toList());
return (networkServers.isEmpty() ? otherServers : networkServers).stream().distinct().collect(Collectors.toList());
}
@TargetApi(23)