Merge branch 'master' of ssh://git.fucktheforce.de/conversations

Conflicts:
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
index 642d0ed0..7f7b350c 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
@@ -34,7 +34,7 @@ import net.java.otr4j.crypto.OtrCryptoException;
 import net.java.otr4j.session.InstanceTag;
 import net.java.otr4j.session.SessionID;
 
-public class OtrEngine implements OtrEngineHost {
+public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost {
 
 	private Account account;
 	private OtrPolicy otrPolicy;
@@ -126,7 +126,7 @@ public class OtrEngine implements OtrEngineHost {
 	@Override
 	public byte[] getLocalFingerprintRaw(SessionID arg0) {
 		try {
-			return new OtrCryptoEngineImpl().getFingerprintRaw(getPublicKey());
+			return getFingerprintRaw(getPublicKey());
 		} catch (OtrCryptoException e) {
 			return null;
 		}
@@ -180,6 +180,7 @@ public class OtrEngine implements OtrEngineHost {
 		packet.setBody(body);
 		packet.addChild("private", "urn:xmpp:carbons:2");
 		packet.addChild("no-copy", "urn:xmpp:hints");
+		packet.addChild("no-store", "urn:xmpp:hints");
 		packet.setType(MessagePacket.TYPE_CHAT);
 		account.getXmppConnection().sendMessagePacket(packet);
 	}
@@ -257,10 +258,10 @@ public class OtrEngine implements OtrEngineHost {
 			Conversation conversation = this.mXmppConnectionService.find(this.account,jid);
 			if (conversation!=null) {
 				if (approved) {
-					conversation.getContact().addOtrFingerprint(CryptoHelper.prettifyFingerprint(fingerprint));
+					conversation.getContact().addOtrFingerprint(fingerprint);
 				}
 				conversation.smp().hint = null;
-				conversation.smp().status = Conversation.Smp.STATUS_FINISHED;
+				conversation.smp().status = Conversation.Smp.STATUS_VERIFIED;
 				mXmppConnectionService.updateConversationUi();
 				mXmppConnectionService.syncRosterToDisk(conversation.getAccount());
 			}