[jitsi-dev] [jitsi] Added support for SMP for the OTR plugin. (#12)


#1

Integrated the latest version of otr4j in Jitsi.
You can merge this Pull Request by running:

  git pull https://github.com/mdzhigarov/jitsi otrJitsi

Or you can view, comment on it, or merge it online at:

  https://github.com/jitsi/jitsi/pull/12

-- Commit Summary --

  * Added support for SMP for the OTR plugin.

-- File Changes --

    M lib/installer-exclude/otr4j.jar (0)
    M resources/languages/resources.properties (35)
    A src/net/java/sip/communicator/plugin/otr/CustomTextArea.java (26)
    A src/net/java/sip/communicator/plugin/otr/FingerprintAuthenticationPanel.java (257)
    M src/net/java/sip/communicator/plugin/otr/OtrBuddyAuthenticationDialog.java (283)
    M src/net/java/sip/communicator/plugin/otr/ScOtrEngine.java (32)
    M src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java (654)
    M src/net/java/sip/communicator/plugin/otr/ScOtrKeyManager.java (2)
    M src/net/java/sip/communicator/plugin/otr/ScOtrKeyManagerImpl.java (20)
    A src/net/java/sip/communicator/plugin/otr/SecretQuestionAuthenticationPanel.java (117)
    A src/net/java/sip/communicator/plugin/otr/SharedSecretAuthenticationPanel.java (89)
    M src/net/java/sip/communicator/plugin/otr/otr.manifest.mf (2)

-- Patch Links --

https://github.com/jitsi/jitsi/pull/12.patch
https://github.com/jitsi/jitsi/pull/12.diff


#2

Merged #12.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/12