diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-04-02 11:11:22 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-04-02 11:11:22 +0200 |
commit | 59ea143147548ee15211d7c334076a158757c85f (patch) | |
tree | 112b4addde3d8420247b1b9d5f590321b9a43267 /src/main/java/eu/siacs/conversations/generator/MessageGenerator.java | |
parent | ef680840988f0907a2c1911f82e73644ba92000c (diff) | |
parent | db74cb52c417a99005f86d49804fdb512ee5c99f (diff) |
Merge pull request #1099 from BrianBlade/fix_otr_error_msgs
Fix OTR-Error messages (#1021)
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 8f6a90b99..a60c5613f 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; } } |