Merge branch 'master' into development

src/main/java/eu/siacs/conversations/parser/IqParser.java

@@ -236,7 +236,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 
 	@Override
 	public void onIqPacketReceived(final Account account, final IqPacket packet) {
-		if (packet.getType() == IqPacket.TYPE.ERROR) {
+		if (packet.getType() == IqPacket.TYPE.ERROR || packet.getType() == IqPacket.TYPE.TIMEOUT) {
 			return;
 		} else if (packet.hasChild("query", Xmlns.ROSTER) && packet.fromServer(account)) {
 			final Element query = packet.findChild("query");

src/main/java/eu/siacs/conversations/services/MessageArchiveService.java

@@ -111,7 +111,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			this.mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
 				@Override
 				public void onIqPacketReceived(Account account, IqPacket packet) {
-					if (packet.getType() == IqPacket.TYPE.ERROR) {
+					if (packet.getType() != IqPacket.TYPE.RESULT) {
 						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
 						finalizeQuery(query);
 					}

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -224,7 +224,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private OnIqPacketReceived mDefaultIqHandler = new OnIqPacketReceived() {
 		@Override
 		public void onIqPacketReceived(Account account, IqPacket packet) {
-			if (packet.getType() == IqPacket.TYPE.ERROR) {
+			if (packet.getType() != IqPacket.TYPE.RESULT) {
 				Element error = packet.findChild("error");
 				String text = error != null ? error.findChildContent("text") : null;
 				if (text != null) {
@@ -1675,7 +1675,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() != IqPacket.TYPE.ERROR) {
+				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					ArrayList<String> features = new ArrayList<>();
 					for (Element child : packet.query().getChildren()) {
 						if (child != null && child.getName().equals("feature")) {
@@ -1699,7 +1699,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() != IqPacket.TYPE.ERROR) {
+				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					Data data = Data.parse(packet.query().findChild("x", "jabber:x:data"));
 					for (Field field : data.getFields()) {
 						if (options.containsKey(field.getName())) {
@@ -1713,12 +1713,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					sendIqPacket(account, set, new OnIqPacketReceived() {
 						@Override
 						public void onIqPacketReceived(Account account, IqPacket packet) {
+							if (callback != null) {
 								if (packet.getType() == IqPacket.TYPE.RESULT) {
-								if (callback != null) {
 									callback.onPushSucceeded();
-								}
 								} else {
-								if (callback != null) {
 									callback.onPushFailed();
 								}
 							}

src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -728,7 +728,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void clearIqCallbacks() {
-		final IqPacket failurePacket = new IqPacket(IqPacket.TYPE.ERROR);
+		final IqPacket failurePacket = new IqPacket(IqPacket.TYPE.TIMEOUT);
 		final ArrayList<OnIqPacketReceived> callbacks = new ArrayList<>();
 		synchronized (this.packetCallbacks) {
 			if (this.packetCallbacks.size() == 0) {

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java

@@ -85,7 +85,7 @@ public class JingleConnection implements Transferable {
 
 		@Override
 		public void onIqPacketReceived(Account account, IqPacket packet) {
-			if (packet.getType() == IqPacket.TYPE.ERROR) {
+			if (packet.getType() != IqPacket.TYPE.RESULT) {
 				fail();
 			}
 		}
@@ -449,7 +449,7 @@ public class JingleConnection implements Transferable {
 
 				@Override
 				public void onIqPacketReceived(Account account, IqPacket packet) {
-					if (packet.getType() != IqPacket.TYPE.ERROR) {
+					if (packet.getType() == IqPacket.TYPE.RESULT) {
 						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": other party received offer");
 						mJingleStatus = JINGLE_STATUS_INITIATED;
 						mXmppConnectionService.markMessage(message, Message.STATUS_OFFERED);
@@ -634,12 +634,11 @@ public class JingleConnection implements Transferable {
 								@Override
 								public void onIqPacketReceived(Account account,
 										IqPacket packet) {
-									if (packet.getType() == IqPacket.TYPE.ERROR) {
+									if (packet.getType() != IqPacket.TYPE.RESULT) {
 										onProxyActivated.failed();
 									} else {
 										onProxyActivated.success();
-										sendProxyActivated(connection
+										sendProxyActivated(connection.getCandidate().getCid());
-												.getCandidate().getCid());
 									}
 								}
 							});

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java

@@ -74,7 +74,7 @@ public class JingleInbandTransport extends JingleTransport {
 					@Override
 					public void onIqPacketReceived(Account account,
 							IqPacket packet) {
-						if (packet.getType() == IqPacket.TYPE.ERROR) {
+						if (packet.getType() != IqPacket.TYPE.RESULT) {
 							callback.failed();
 						} else {
 							callback.established();

src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java

@@ -9,7 +9,8 @@ public class IqPacket extends AbstractAcknowledgeableStanza {
 		SET,
 		RESULT,
 		GET,
-		INVALID
+		INVALID,
+		TIMEOUT
 	}
 
 	public IqPacket(final TYPE type) {