From 6c2479b29c93222f83a2e672531fb681143c6fd1 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 27 Jun 2017 21:11:40 +0200 Subject: revised resolver strategy --- src/main/java/de/pixart/messenger/utils/Resolver.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java index 02663b283..89961a3c3 100644 --- a/src/main/java/de/pixart/messenger/utils/Resolver.java +++ b/src/main/java/de/pixart/messenger/utils/Resolver.java @@ -13,7 +13,6 @@ import java.util.List; import de.measite.minidns.DNSClient; import de.measite.minidns.DNSName; import de.measite.minidns.dnssec.DNSSECResultNotAuthenticException; -import de.measite.minidns.dnssec.DNSSECValidationFailedException; import de.measite.minidns.hla.DnssecResolverApi; import de.measite.minidns.hla.ResolverApi; import de.measite.minidns.hla.ResolverResult; @@ -94,8 +93,13 @@ public class Resolver { private static ResolverResult resolveWithFallback(DNSName dnsName, Class type) throws IOException { try { return DnssecResolverApi.INSTANCE.resolveDnssecReliable(dnsName, type); - } catch (DNSSECValidationFailedException | DNSSECResultNotAuthenticException e) { - Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead " + e.getMessage()); + } catch (DNSSECResultNotAuthenticException e) { + Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", e); + return ResolverApi.INSTANCE.resolve(dnsName, type); + } catch (IOException e) { + throw e; + } catch (Throwable throwable) { + Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", throwable); return ResolverApi.INSTANCE.resolve(dnsName, type); } } -- cgit v1.2.3