Fix for OTR UI in case of multiple OTR session.

Okay, so this was a real PITA. The otr4j library behaves as expected.
The OTR plugin, on the other hand, hides controls and does not get
updated on the actual selected resouce (chat transport) at all. So as a
consequence the OTR plugin is actually giving a lot of misinformation.

There is still an outstanding issue where you establish an OTR encrypted
session for a particular session ID and the OTR session selector box
does not automatically select the encrypted session. I'm not sure if
this should be the desired behaviour, though. What if there are 2 OTR
encrypted sessions, would you want to switch?

That is something to think about ...

2 files changed, 1 insertions, 5 deletions

diff --git a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
index 88668e3..eab7c37 100644
--- a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
+++ b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
@@ -1304,8 +1304,7 @@ public class ScOtrEngineImpl
     public List<Session> getSessionInstances(OtrContact otrContact)

     {

         if (otrContact == null)

-            return null;

-

+            return Collections.emptyList();

         return getSession(otrContact).getInstances();

     }

 

diff --git a/src/net/java/sip/communicator/plugin/otr/authdialog/OTRv3OutgoingSessionSwitcher.java b/src/net/java/sip/communicator/plugin/otr/authdialog/OTRv3OutgoingSessionSwitcher.java
index 528cbf7..ad3f37c 100644
--- a/src/net/java/sip/communicator/plugin/otr/authdialog/OTRv3OutgoingSessionSwitcher.java
+++ b/src/net/java/sip/communicator/plugin/otr/authdialog/OTRv3OutgoingSessionSwitcher.java
@@ -244,9 +244,6 @@ public class OTRv3OutgoingSessionSwitcher
      */
     public void setCurrentContact(Contact contact, String resourceName)
     {
-        if (this.contact != null && this.contact.contact == contact)
-            return;
-
         if (resourceName == null)
         {
             this.contact =