mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "DNS retry custom" 

This reverts commit 689c557a02.
This commit is contained in:
M66B 2024-01-30 19:17:33 +01:00
parent 372a6826f3
commit 12d8de8b54
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/DnsHelper.java
View File

@ -55,7 +55,6 @@ import org.minidns.record.Record;
import org.minidns.record.SRV; import org.minidns.record.SRV;
import org.minidns.record.TXT; import org.minidns.record.TXT;
import org.minidns.source.AbstractDnsDataSource; import org.minidns.source.AbstractDnsDataSource;
import org.minidns.source.DnsDataSource;
import org.minidns.util.MultipleIoException; import org.minidns.util.MultipleIoException;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -185,8 +184,6 @@ public class DnsHelper {
ResolverApi resolver = DnssecResolverApi.INSTANCE; ResolverApi resolver = DnssecResolverApi.INSTANCE;
AbstractDnsClient client = resolver.getClient(); AbstractDnsClient client = resolver.getClient();
DnsDataSource dataSource = client.getDataSource();
if (false) { if (false) {
String private_dns = ConnectionHelper.getPrivateDnsServerName(context); String private_dns = ConnectionHelper.getPrivateDnsServerName(context);
Log.w("DNS private=" + private_dns); Log.w("DNS private=" + private_dns);
@ -202,17 +199,7 @@ public class DnsHelper {
((DnssecClient) client).setUseHardcodedDnsServers(false); ((DnssecClient) client).setUseHardcodedDnsServers(false);
Log.i("DNS query name=" + type + ":" + name); Log.i("DNS query name=" + type + ":" + name);
ResolverResult<? extends Data> data; ResolverResult<? extends Data> data = resolver.resolve(name, clazz);
try {
data = resolver.resolve(name, clazz);
} catch (Throwable ex) {
Log.w(ex);
if (dataSource == null || dataSource == client.getDataSource())
throw ex;
Log.i("DNS retry custom");
client.setDataSource(dataSource);
data = resolver.resolve(name, clazz);
}
Log.i("DNS resolved name=" + type + ":" + name + Log.i("DNS resolved name=" + type + ":" + name +
" success=" + data.wasSuccessful() + " success=" + data.wasSuccessful() +
" rcode=" + data.getResponseCode()); " rcode=" + data.getResponseCode());
@ -220,7 +207,8 @@ public class DnsHelper {
try { try {
data.throwIfErrorResponse(); data.throwIfErrorResponse();
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w("DNS error message=" + ex.getMessage()); Log.e("DNS error message=" + ex.getMessage());
Log.e(ex);
throw ex; throw ex;
} }