From f7e447a97c687c8727f87caa55306200595760a2 Mon Sep 17 00:00:00 2001 From: Marin Date: Mon, 20 Jan 2014 11:49:39 +0200 Subject: [PATCH] Improves the OTR information messages displayed to the user when the session status is FINISHED --- lib/installer-exclude/otr4j.jar | Bin 94426 -> 94429 bytes resources/languages/resources.properties | 4 ++-- .../plugin/otr/ScOtrEngineImpl.java | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/installer-exclude/otr4j.jar b/lib/installer-exclude/otr4j.jar index 6e4a280093cb6937dc6325360a6c0711c2f8e23c..06dc4a7b1498b0d73649c586d793315a009e0292 100644 GIT binary patch delta 14979 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 O04Sj|bbrr%f&D)z9O(xD delta 14928 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 off chat history here. plugin.otr.activator.historyoff={0} is NOT recording this conversation. You can activate chat history here. -plugin.otr.activator.sessionfinishederror=Your message was not sent. Please end your private conversation with {0}. +plugin.otr.activator.sessionfinishederror=Your message [{0}] was not sent. Please end your private conversation with {1}. plugin.otr.activator.smpaborted={0} has aborted the authentication process. plugin.otr.activator.smperror=An error occurred in the authentication process. plugin.otr.activator.unencryptedmsgreceived=The message was received unencrypted. plugin.otr.activator.unreadablemsgreceived={0} sent you an unreadable encrypted message. -plugin.otr.activator.requireencryption=Your message was not sent. Private messaging is required. +plugin.otr.activator.requireencryption=Your message [{0}] was not sent. Private messaging is required. plugin.otr.activator.unreadablemsgreply=You sent {0} an unreadable encrypted message. Please end your private conversation with {1} or refresh it. plugin.otr.activator.fallbackmessage={0} is trying to initiate an encrypted \ Off-The-Record conversation with you. However, your software does not support \ diff --git a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java index 578c2d839..c3d8ae553 100644 --- a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java +++ b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java @@ -232,7 +232,7 @@ public void smpAborted(SessionID sessionID) throws OtrException } @Override - public void finishedSessionMessage(SessionID sessionID) + public void finishedSessionMessage(SessionID sessionID, String msgText) throws OtrException { OtrContact otrContact = getOtrContact(sessionID); @@ -246,7 +246,7 @@ public void finishedSessionMessage(SessionID sessionID) OtrActivator.resourceService.getI18NString( "plugin.otr.activator.sessionfinishederror", new String[] - {contact.getDisplayName() + resourceName}); + {msgText, contact.getDisplayName() + resourceName}); OtrActivator.uiService.getChat(contact).addMessage( contact.getDisplayName(), new Date(), Chat.ERROR_MESSAGE, error, @@ -261,15 +261,12 @@ public void requireEncryptedMessage(SessionID sessionID, String msgText) if (otrContact == null) return; - String resourceName = otrContact.resource != null ? - "/" + otrContact.resource.getResourceName() : ""; - Contact contact = otrContact.contact; String error = OtrActivator.resourceService.getI18NString( "plugin.otr.activator.requireencryption", new String[] - {contact.getDisplayName() + resourceName}); + {msgText}); OtrActivator.uiService.getChat(contact).addMessage( contact.getDisplayName(), new Date(), Chat.ERROR_MESSAGE, error,