diff options
| author | BrianBlade <n.gelbertz@gmail.com> | 2015-04-01 12:22:18 +0200 |
|---|---|---|
| committer | BrianBlade <n.gelbertz@gmail.com> | 2015-04-01 20:03:09 +0200 |
| commit | db74cb52c417a99005f86d49804fdb512ee5c99f (patch) | |
| tree | ea547ae1e7faee463a451d38494a4052c1d44e58 /src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | |
| parent | 7eabdfd80f50634282307f45c5f99ab46181805d (diff) | |
Fix OTR-Error messages
Send out OTR-Errors on unreadableMessageReceived() as well, not only on
messageFromAnotherInstanceReceived
Diffstat (limited to 'src/main/java/eu/siacs/conversations/generator/MessageGenerator.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java index 8f6a90b9..a60c5613 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java @@ -172,7 +172,7 @@ public class MessageGenerator extends AbstractGenerator { return receivedPacket; } - public MessagePacket generateOtrError(Jid to, String id) { + public MessagePacket generateOtrError(Jid to, String id, String errorText) { MessagePacket packet = new MessagePacket(); packet.setType(MessagePacket.TYPE_ERROR); packet.setAttribute("id",id); @@ -181,7 +181,7 @@ public class MessageGenerator extends AbstractGenerator { error.setAttribute("code","406"); error.setAttribute("type","modify"); error.addChild("not-acceptable","urn:ietf:params:xml:ns:xmpp-stanzas"); - error.addChild("text").setContent("unreadable OTR message received"); + error.addChild("text").setContent("?OTR Error:" + errorText); return packet; } } |