basic otr support

2 files changed, 3 insertions, 1 deletions

diff --git a/src/de/gultsch/chat/xmpp/MessagePacket.java b/src/de/gultsch/chat/xmpp/MessagePacket.java
index 5da76152f..0d4d07d7d 100644
--- a/src/de/gultsch/chat/xmpp/MessagePacket.java
+++ b/src/de/gultsch/chat/xmpp/MessagePacket.java
@@ -42,6 +42,7 @@ public class MessagePacket extends Element {
 	}
 	
 	public void setBody(String text) {
+		this.children.remove(findChild("body"));
 		Element body = new Element("body");
 		body.setContent(text);
 		this.children.add(body);
diff --git a/src/de/gultsch/chat/xmpp/XmppConnection.java b/src/de/gultsch/chat/xmpp/XmppConnection.java
index 337d8c7dd..1b9aa0c3a 100644
--- a/src/de/gultsch/chat/xmpp/XmppConnection.java
+++ b/src/de/gultsch/chat/xmpp/XmppConnection.java
@@ -411,6 +411,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	public void sendMessagePacket(MessagePacket packet) {
+		Log.d(LOGTAG,"sending message packet "+packet.toString());
 		tagWriter.writeElement(packet);
 	}
 
@@ -440,6 +441,6 @@ public class XmppConnection implements Runnable {
 
 	public void disconnect() {
 		shouldConnect = false;
-		tagWriter.writeTag(Tag.end("stream"));
+		tagWriter.writeTag(Tag.end("stream:stream"));
 	}
 }