diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-03 17:39:57 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-03 17:39:57 +0200 |
| commit | 2506ef82df6369fef71e00e891b2a2c69330ff94 (patch) | |
| tree | df9bb02ad77a9da79900661c8fe1239fffab5cec /src/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | a53716af82bc8736d8de6f9cc4cd07814aa4f0d8 (diff) | |
be compatible with openkeychain api v3
Diffstat (limited to 'src/eu/siacs/conversations/services/XmppConnectionService.java')
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 9ca31255..786605ab 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -288,7 +288,7 @@ public class XmppConnectionService extends Service { } else { msg = ""; } - contact.setPgpKeyId(pgp.fetchKeyId(msg, x + contact.setPgpKeyId(pgp.fetchKeyId(account,msg, x .getContent())); } catch (OpenPgpException e) { Log.d(LOGTAG, "faulty pgp. just ignore"); @@ -657,8 +657,7 @@ public class XmppConnectionService extends Service { .getFullJid()); packet.setTo(message.getCounterpart()); packet.setBody("This is an XEP-0027 encryted message"); - packet.addChild("x","jabber:x:encrypted").setContent(this.getPgpEngine().encrypt(keyId, - message.getBody())); + packet.addChild("x", "jabber:x:encrypted").setContent(message.getEncryptedBody()); account.getXmppConnection().sendMessagePacket(packet); message.setStatus(Message.STATUS_SEND); message.setEncryption(Message.ENCRYPTION_DECRYPTED); |