Merge pull request #639 from SamWhited/issue631

Use JID class instead of strings

1 files changed, 4 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
index e0bd0e79..82d7145e 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
@@ -85,13 +85,11 @@ public class OtrEngine implements OtrEngineHost {
 			this.account.setKey("otr_p", privateKeySpec.getP().toString(16));
 			this.account.setKey("otr_q", privateKeySpec.getQ().toString(16));
 			this.account.setKey("otr_y", publicKeySpec.getY().toString(16));
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		} catch (InvalidKeySpecException e) {
+		} catch (final NoSuchAlgorithmException | InvalidKeySpecException e) {
 			e.printStackTrace();
 		}
 
-	}
+    }
 
 	@Override
 	public void askForSecret(SessionID arg0, InstanceTag arg1, String arg2) {
@@ -157,9 +155,9 @@ public class OtrEngine implements OtrEngineHost {
 		MessagePacket packet = new MessagePacket();
 		packet.setFrom(account.getFullJid());
 		if (session.getUserID().isEmpty()) {
-			packet.setTo(session.getAccountID());
+			packet.setAttribute("to", session.getAccountID());
 		} else {
-			packet.setTo(session.getAccountID() + "/" + session.getUserID());
+			packet.setAttribute("to", session.getAccountID() + "/" + session.getUserID());
 		}
 		packet.setBody(body);
 		packet.addChild("private", "urn:xmpp:carbons:2");