Merge branch 'depend_on_sm' into development

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

@@ -149,14 +149,25 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 		@Override
 		public void onBind(final Account account) {
+			resetSendingToWaiting(account);
 			account.getRoster().clearPresences();
-			account.pendingConferenceJoins.clear();
-			account.pendingConferenceLeaves.clear();
 			fetchRosterFromServer(account);
 			fetchBookmarks(account);
 			sendPresence(account);
 			connectMultiModeConversations(account);
-			updateConversationUi();
+			for (Conversation conversation : account.pendingConferenceLeaves) {
+				leaveMuc(conversation);
+			}
+			account.pendingConferenceLeaves.clear();
+			for (Conversation conversation : account.pendingConferenceJoins) {
+				joinMuc(conversation);
+			}
+			account.pendingConferenceJoins.clear();
+			mMessageArchiveService.executePendingQueries(account);
+			mJingleConnectionManager.cancelInTransmission();
+			syncDirtyContacts(account);
+			account.getAxolotlService().publishOwnDeviceIdIfNeeded();
+			account.getAxolotlService().publishBundlesIfNeeded();
 		}
 	};
 	private final OnMessageAcknowledged mOnMessageAcknowledgedListener = new OnMessageAcknowledged() {
@@ -248,14 +259,15 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				mOnAccountUpdate.onAccountUpdate();
 			}
 			if (account.getStatus() == Account.State.ONLINE) {
-				for (Conversation conversation : account.pendingConferenceLeaves) {
+				if (connection != null && connection.getFeatures().csi()) {
-					leaveMuc(conversation);
+					if (checkListeners()) {
+						Log.d(Config.LOGTAG, account.getJid().toBareJid()+ " sending csi//inactive");
+						connection.sendInactive();
+					} else {
+						Log.d(Config.LOGTAG, account.getJid().toBareJid()+ " sending csi//active");
+						connection.sendActive();
+					}
 				}
-				for (Conversation conversation : account.pendingConferenceJoins) {
-					joinMuc(conversation);
-				}
-				mMessageArchiveService.executePendingQueries(account);
-				mJingleConnectionManager.cancelInTransmission();
 				List<Conversation> conversations = getConversations();
 				for (Conversation conversation : conversations) {
 					if (conversation.getAccount() == account) {
@@ -263,21 +275,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						sendUnsentMessages(conversation);
 					}
 				}
-				if (connection != null && connection.getFeatures().csi()) {
-					if (checkListeners()) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid()
-								+ " sending csi//inactive");
-						connection.sendInactive();
-					} else {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid()
-								+ " sending csi//active");
-						connection.sendActive();
-					}
-				}
-				syncDirtyContacts(account);
-				account.getAxolotlService().publishOwnDeviceIdIfNeeded();
-				account.getAxolotlService().publishBundlesIfNeeded();
-
 				scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode());
 			} else if (account.getStatus() == Account.State.OFFLINE) {
 				if (!account.isOptionSet(Account.OPTION_DISABLED)) {
@@ -859,7 +856,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
 		}
 		iqPacket.query(Xmlns.ROSTER).setAttribute("ver", account.getRosterVersion());
-		sendIqPacket(account,iqPacket,mIqParser);
+		sendIqPacket(account, iqPacket, mIqParser);
 	}
 
 	public void fetchBookmarks(final Account account) {
@@ -1478,6 +1475,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
+
 	public void joinMuc(Conversation conversation) {
 		Account account = conversation.getAccount();
 		account.pendingConferenceJoins.remove(conversation);

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

@@ -1,13 +1,10 @@
 package eu.siacs.conversations.xmpp;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
@@ -65,6 +62,7 @@ import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived;
 import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
+import eu.siacs.conversations.xmpp.stanzas.AbstractAcknowledgeableStanza;
 import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
@@ -94,7 +92,7 @@ public class XmppConnection implements Runnable {
 
 	private String streamId = null;
 	private int smVersion = 3;
-	private final SparseArray<String> mStanzaReceipts = new SparseArray<>();
+	private final SparseArray<AbstractAcknowledgeableStanza> mStanzaQueue = new SparseArray<>();
 
 	private int stanzasReceived = 0;
 	private int stanzasSent = 0;
@@ -342,22 +340,19 @@ public class XmppConnection implements Runnable {
 										Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": session resumed");
 									}
 									acknowledgeStanzaUpTo(serverCount);
-									ArrayList<IqPacket> failedIqPackets = new ArrayList<>();
+									ArrayList<AbstractAcknowledgeableStanza> failedStanzas = new ArrayList<>();
-									for(int i = 0; i < this.mStanzaReceipts.size(); ++i) {
+									for(int i = 0; i < this.mStanzaQueue.size(); ++i) {
-										String id = mStanzaReceipts.valueAt(i);
+										failedStanzas.add(mStanzaQueue.valueAt(i));
-										Pair<IqPacket,OnIqPacketReceived> pair = id == null ? null : this.packetCallbacks.get(id);
-										if (pair != null) {
-											failedIqPackets.add(pair.first);
-										}
 									}
-									mStanzaReceipts.clear();
+									mStanzaQueue.clear();
-									Log.d(Config.LOGTAG,"resending "+failedIqPackets.size()+" iq stanza");
+									Log.d(Config.LOGTAG,"resending "+failedStanzas.size()+" stanzas");
-									for(IqPacket packet : failedIqPackets) {
+									for(AbstractAcknowledgeableStanza packet : failedStanzas) {
-										sendUnmodifiedIqPacket(packet,null);
+										sendPacket(packet);
 									}
 								} catch (final NumberFormatException ignored) {
 								}
-								sendInitialPing();
+								Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": online with resource " + account.getResource());
+								changeStatus(Account.State.ONLINE);
 							} else if (nextTag.isStart("r")) {
 								tagReader.readElement(nextTag);
 								if (Config.EXTENDED_SM_LOGGING) {
@@ -399,36 +394,22 @@ public class XmppConnection implements Runnable {
 	}
 
 	private void acknowledgeStanzaUpTo(int serverCount) {
-		for (int i = 0; i < mStanzaReceipts.size(); ++i) {
+		for (int i = 0; i < mStanzaQueue.size(); ++i) {
-			if (serverCount >= mStanzaReceipts.keyAt(i)) {
+			if (serverCount >= mStanzaQueue.keyAt(i)) {
 				if (Config.EXTENDED_SM_LOGGING) {
-					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": server acknowledged stanza #" + mStanzaReceipts.keyAt(i));
+					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": server acknowledged stanza #" + mStanzaQueue.keyAt(i));
 				}
-				String id = mStanzaReceipts.valueAt(i);
+				AbstractAcknowledgeableStanza stanza = mStanzaQueue.valueAt(i);
-				if (acknowledgedListener != null) {
+				if (stanza instanceof MessagePacket && acknowledgedListener != null) {
-					acknowledgedListener.onMessageAcknowledged(account, id);
+					MessagePacket packet = (MessagePacket) stanza;
+					acknowledgedListener.onMessageAcknowledged(account, packet.getId());
 				}
-				mStanzaReceipts.removeAt(i);
+				mStanzaQueue.removeAt(i);
 				i--;
 			}
 		}
 	}
 
-	private void sendInitialPing() {
-		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": sending intial ping");
-		final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
-		iq.setFrom(account.getJid());
-		iq.addChild("ping", "urn:xmpp:ping");
-		this.sendIqPacket(iq, new OnIqPacketReceived() {
-			@Override
-			public void onIqPacketReceived(final Account account, final IqPacket packet) {
-				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
-						+ ": online with resource " + account.getResource());
-				changeStatus(Account.State.ONLINE);
-			}
-		});
-	}
-
 	private Element processPacket(final Tag currentTag, final int packetType)
 		throws XmlPullParserException, IOException {
 		Element element;
@@ -775,7 +756,7 @@ public class XmppConnection implements Runnable {
 			final EnablePacket enable = new EnablePacket(smVersion);
 			tagWriter.writeStanzaAsync(enable);
 			stanzasSent = 0;
-			mStanzaReceipts.clear();
+			mStanzaQueue.clear();
 		}
 		features.carbonsEnabled = false;
 		features.blockListRequested = false;
@@ -783,10 +764,11 @@ public class XmppConnection implements Runnable {
 		sendServiceDiscoveryInfo(account.getServer());
 		sendServiceDiscoveryInfo(account.getJid().toBareJid());
 		sendServiceDiscoveryItems(account.getServer());
+		Log.d(Config.LOGTAG, account.getJid().toBareJid()+ ": online with resource " + account.getResource());
+		changeStatus(Account.State.ONLINE);
 		if (bindListener != null) {
 			bindListener.onBind(account);
 		}
-		sendInitialPing();
 	}
 
 	private void sendServiceDiscoveryInfo(final Jid jid) {
@@ -937,16 +919,17 @@ public class XmppConnection implements Runnable {
 			return;
 		}
 		final String name = packet.getName();
-		if (name.equals("iq") || name.equals("message") || name.equals("presence")) {
-			++stanzasSent;
-		}
 		tagWriter.writeStanzaAsync(packet);
-		if ((packet instanceof MessagePacket || packet instanceof IqPacket) && packet.getId() != null && this.streamId != null) {
+		if (packet instanceof AbstractAcknowledgeableStanza) {
-			if (Config.EXTENDED_SM_LOGGING) {
+			AbstractAcknowledgeableStanza stanza = (AbstractAcknowledgeableStanza) packet;
-				Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for stanza #" + stanzasSent);
+			++stanzasSent;
+			this.mStanzaQueue.put(stanzasSent, stanza);
+			if (stanza instanceof MessagePacket && stanza.getId() != null && this.streamId != null) {
+				if (Config.EXTENDED_SM_LOGGING) {
+					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for message stanza #" + stanzasSent);
+				}
+				tagWriter.writeStanzaAsync(new RequestPacket(this.smVersion));
 			}
-			this.mStanzaReceipts.put(stanzasSent, packet.getId());
-			tagWriter.writeStanzaAsync(new RequestPacket(this.smVersion));
 		}
 	}
 

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

@@ -0,0 +1,17 @@
+package eu.siacs.conversations.xmpp.stanzas;
+
+abstract public class AbstractAcknowledgeableStanza extends AbstractStanza {
+
+	protected AbstractAcknowledgeableStanza(String name) {
+		super(name);
+	}
+
+
+	public String getId() {
+		return this.getAttribute("id");
+	}
+
+	public void setId(final String id) {
+		setAttribute("id", id);
+	}
+}

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

@@ -18,10 +18,6 @@ public class AbstractStanza extends Element {
 		return getAttributeAsJid("from");
 	}
 
-	public String getId() {
-		return this.getAttribute("id");
-	}
-
 	public void setTo(final Jid to) {
 		if (to != null) {
 			setAttribute("to", to.toString());
@@ -34,10 +30,6 @@ public class AbstractStanza extends Element {
 		}
 	}
 
-	public void setId(final String id) {
-		setAttribute("id", id);
-	}
-
 	public boolean fromServer(final Account account) {
 		return getFrom() == null
 			|| getFrom().equals(account.getServer())

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

@@ -2,9 +2,9 @@ package eu.siacs.conversations.xmpp.stanzas;
 
 import eu.siacs.conversations.xml.Element;
 
-public class IqPacket extends AbstractStanza {
+public class IqPacket extends AbstractAcknowledgeableStanza {
 
-	public static enum TYPE {
+	public enum TYPE {
 		ERROR,
 		SET,
 		RESULT,

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

@@ -5,7 +5,7 @@ import android.util.Pair;
 import eu.siacs.conversations.parser.AbstractParser;
 import eu.siacs.conversations.xml.Element;
 
-public class MessagePacket extends AbstractStanza {
+public class MessagePacket extends AbstractAcknowledgeableStanza {
 	public static final int TYPE_CHAT = 0;
 	public static final int TYPE_NORMAL = 2;
 	public static final int TYPE_GROUPCHAT = 3;

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

@@ -1,6 +1,6 @@
 package eu.siacs.conversations.xmpp.stanzas;
 
-public class PresencePacket extends AbstractStanza {
+public class PresencePacket extends AbstractAcknowledgeableStanza {
 
 	public PresencePacket() {
 		super("presence");