Version 1.6.10

3 files changed, 42 insertions, 45 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index 835b9bf6c..42c57b24f 100644
--- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
@@ -262,7 +262,7 @@ public class IqGenerator extends AbstractGenerator {
 		request.addChild("filename").setContent(file.getName());
 		request.addChild("size").setContent(String.valueOf(file.getExpectedSize()));
 		if (mime != null) {
-			request.addChild("content-type", mime);
+			request.addChild("content-type").setContent(mime);
 		}
 		return packet;
 	}
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index 863cfb66b..f3c4f79a2 100644
--- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
@@ -7,6 +7,7 @@ import android.net.LinkProperties;
 import android.net.Network;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.util.Log;
 
 import java.io.IOException;
@@ -46,13 +47,19 @@ public class DNSHelper {
 	public static Bundle getSRVRecord(final Jid jid, Context context) throws IOException {
         final String host = jid.getDomainpart();
 		final List<InetAddress> servers = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? getDnsServers(context) : getDnsServersPreLollipop();
-		Bundle b = null;
+		Bundle b = new Bundle();
 		for(InetAddress server : servers) {
 			b = queryDNS(host, server);
 			if (b.containsKey("values")) {
 				return b;
 			}
 		}
+		if (!b.containsKey("values")) {
+			Log.d(Config.LOGTAG,"all dns queries failed. provide fallback A record");
+			ArrayList<Parcelable> values = new ArrayList<>();
+			values.add(createNamePortBundle(host,5222));
+			b.putParcelableArrayList("values",values);
+		}
 		return b;
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 870f50d5d..fd6465021 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -160,52 +160,43 @@ public class XmppConnection implements Runnable {
 				}
 			} else {
 				final Bundle result = DNSHelper.getSRVRecord(account.getServer(),mXmppConnectionService);
-				if (result == null) {
-					throw new IOException("unhandled exception in DNS resolver");
-				}
 				final ArrayList<Parcelable> values = result.getParcelableArrayList("values");
-				if ("timeout".equals(result.getString("error"))) {
-					throw new DnsTimeoutException();
-				} else if (values != null) {
-					int i = 0;
-					boolean socketError = true;
-					while (socketError && values.size() > i) {
-						final Bundle namePort = (Bundle) values.get(i);
+				int i = 0;
+				boolean socketError = true;
+				while (socketError && values.size() > i) {
+					final Bundle namePort = (Bundle) values.get(i);
+					try {
+						String srvRecordServer;
 						try {
-							String srvRecordServer;
-							try {
-								srvRecordServer = IDN.toASCII(namePort.getString("name"));
-							} catch (final IllegalArgumentException e) {
-								// TODO: Handle me?`
-								srvRecordServer = "";
-							}
-							final int srvRecordPort = namePort.getInt("port");
-							final String srvIpServer = namePort.getString("ip");
-							final InetSocketAddress addr;
-							if (srvIpServer != null) {
-								addr = new InetSocketAddress(srvIpServer, srvRecordPort);
-								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
-										+ ": using values from dns " + srvRecordServer
-										+ "[" + srvIpServer + "]:" + srvRecordPort);
-							} else {
-								addr = new InetSocketAddress(srvRecordServer, srvRecordPort);
-								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
-										+ ": using values from dns "
-										+ srvRecordServer + ":" + srvRecordPort);
-							}
-							socket = new Socket();
-							socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
-							socketError = false;
-						} catch (final Throwable e) {
-							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
-							i++;
+							srvRecordServer = IDN.toASCII(namePort.getString("name"));
+						} catch (final IllegalArgumentException e) {
+							// TODO: Handle me?`
+							srvRecordServer = "";
 						}
+						final int srvRecordPort = namePort.getInt("port");
+						final String srvIpServer = namePort.getString("ip");
+						final InetSocketAddress addr;
+						if (srvIpServer != null) {
+							addr = new InetSocketAddress(srvIpServer, srvRecordPort);
+							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+									+ ": using values from dns " + srvRecordServer
+									+ "[" + srvIpServer + "]:" + srvRecordPort);
+						} else {
+							addr = new InetSocketAddress(srvRecordServer, srvRecordPort);
+							Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
+									+ ": using values from dns "
+									+ srvRecordServer + ":" + srvRecordPort);
+						}
+						socket = new Socket();
+						socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
+						socketError = false;
+					} catch (final Throwable e) {
+						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
+						i++;
 					}
-					if (socketError) {
-						throw new UnknownHostException();
-					}
-				} else {
-					throw new IOException("unhandled exception in DNS resolver");
+				}
+				if (socketError) {
+					throw new UnknownHostException();
 				}
 			}
 			final OutputStream out = socket.getOutputStream();
@@ -913,7 +904,6 @@ public class XmppConnection implements Runnable {
 
 	private void sendStartStream() throws IOException {
 		final Tag stream = Tag.start("stream:stream");
-		stream.setAttribute("from", account.getJid().toBareJid().toString());
 		stream.setAttribute("to", account.getServer().toString());
 		stream.setAttribute("version", "1.0");
 		stream.setAttribute("xml:lang", "en");