Merge branch 'development' of https://github.com/siacs/Conversations into development

src/eu/siacs/conversations/entities/Conversation.java

@@ -269,6 +269,9 @@ public class Conversation extends AbstractEntity {
 			return false;
 		} else {
 			String foreignPresence = this.otrSession.getSessionID().getUserID();
+			if (getContact()==null) {
+				return true;
+			} else {
 				if (!getContact().getPresences().containsKey(foreignPresence)) {
 					this.resetOtrSession();
 					return false;
@@ -276,6 +279,7 @@ public class Conversation extends AbstractEntity {
 				return true;
 			}
 		}
+	}
 
 	public String getOtrFingerprint() {
 		if (this.otrFingerprint == null) {

src/eu/siacs/conversations/parser/MessageParser.java

@@ -112,7 +112,11 @@ public class MessageParser {
 		}
 		String counterPart = fromParts[1];
 		if (counterPart.equals(conversation.getMucOptions().getNick())) {
+			if (mXmppConnectionService.markMessage(conversation, packet.getId(), Message.STATUS_SEND)) {
+				return null;
+			} else {
 				status = Message.STATUS_SEND;
+			}
 		} else {
 			status = Message.STATUS_RECIEVED;
 		}

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

@@ -10,14 +10,12 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
-import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpServiceConnection;
 
 import net.java.otr4j.OtrException;
 import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
-import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
@@ -47,7 +45,6 @@ import eu.siacs.conversations.xmpp.OnStatusChanged;
 import eu.siacs.conversations.xmpp.OnTLSExceptionReceived;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager;
-import eu.siacs.conversations.xmpp.jingle.JingleFile;
 import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived;
 import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
@@ -788,11 +785,11 @@ public class XmppConnectionService extends Service {
 					// don't encrypt
 					if (message.getConversation().getMode() == Conversation.MODE_SINGLE) {
 						message.setStatus(Message.STATUS_SEND);
-						saveInDb = true;
-						addToConversation = true;
 					}
 					packet = prepareMessagePacket(account, message, null);
 					send = true;
+					saveInDb = true;
+					addToConversation = true;
 				}
 			}
 		} else {
@@ -1481,21 +1478,23 @@ public class XmppConnectionService extends Service {
 
 	public boolean markMessage(Account account, String recipient, String uuid,
 			int status) {
-		boolean marked = false;
 		for (Conversation conversation : getConversations()) {
 			if (conversation.getContactJid().equals(recipient)
 					&& conversation.getAccount().equals(account)) {
+				return markMessage(conversation, uuid, status);
+			}
+		}
+		return false;
+	}
+	
+	public boolean markMessage(Conversation conversation, String uuid, int status) {
 		for (Message message : conversation.getMessages()) {
 			if (message.getUuid().equals(uuid)) {
 				markMessage(message, status);
-						marked = true;
+				return true;
-						break;
 			}
 		}
-				break;
+		return false;
-			}
-		}
-		return marked;
 	}
 
 	public void markMessage(Message message, int status) {