narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed rare NPE in DnsHelper. fixed spelling and added logging

Browse source
This commit is contained in:
Daniel Gultsch 2015-09-17 13:55:27 +02:00
parent b1b13ba0e5
commit 7e712d9d4c
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
View file

@ -45,7 +45,7 @@ public class DNSHelper {
public static Bundle getSRVRecord(final Jid jid, Context context) throws IOException { public static Bundle getSRVRecord(final Jid jid, Context context) throws IOException {
final String host = jid.getDomainpart(); final String host = jid.getDomainpart();
final List<InetAddress> servers = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? getDnsServers(context) : getDnsServersPreLolipop(); final List<InetAddress> servers = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? getDnsServers(context) : getDnsServersPreLollipop();
Bundle b = null; Bundle b = null;
for(InetAddress server : servers) { for(InetAddress server : servers) {
b = queryDNS(host, server); b = queryDNS(host, server);
@ -60,15 +60,23 @@ public class DNSHelper {
private static List<InetAddress> getDnsServers(Context context) { private static List<InetAddress> getDnsServers(Context context) {
List<InetAddress> servers = new ArrayList<>(); List<InetAddress> servers = new ArrayList<>();
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Network[] networks = connectivityManager.getAllNetworks(); Network[] networks = connectivityManager == null ? null : connectivityManager.getAllNetworks();
if (networks == null) {
return getDnsServersPreLollipop();
}
for(int i = 0; i < networks.length; ++i) { for(int i = 0; i < networks.length; ++i) {
LinkProperties linkProperties = connectivityManager.getLinkProperties(networks[i]); LinkProperties linkProperties = connectivityManager.getLinkProperties(networks[i]);
servers.addAll(linkProperties.getDnsServers()); if (linkProperties != null) {
servers.addAll(linkProperties.getDnsServers());
}
} }
return servers.size() > 0 ? servers : getDnsServersPreLolipop(); if (servers.size() > 0) {
Log.d(Config.LOGTAG,"used lollipop variant to discover dns servers in "+networks.length+" networks");
}
return servers.size() > 0 ? servers : getDnsServersPreLollipop();
} }
private static List<InetAddress> getDnsServersPreLolipop() { private static List<InetAddress> getDnsServersPreLollipop() {
List<InetAddress> servers = new ArrayList<>(); List<InetAddress> servers = new ArrayList<>();
String[] dns = client.findDNS(); String[] dns = client.findDNS();
for(int i = 0; i < dns.length; ++i) { for(int i = 0; i < dns.length; ++i) {