diff options
| author | Emil Ivov <emcho@jitsi.org> | 2008-08-20 13:41:16 +0000 |
|---|---|---|
| committer | Emil Ivov <emcho@jitsi.org> | 2008-08-20 13:41:16 +0000 |
| commit | a05f42827f14116fe0634980881114228f054954 (patch) | |
| tree | 73147b3b56f78395b0bc4bda40252c65a6da7391 /src/net/java | |
| parent | 00d10077de5f757f82c5a14010bdbbfcb1e2ad08 (diff) | |
| download | jitsi-a05f42827f14116fe0634980881114228f054954.zip jitsi-a05f42827f14116fe0634980881114228f054954.tar.gz jitsi-a05f42827f14116fe0634980881114228f054954.tar.bz2 | |
Stop sending typing notifications through the XEP-0022 mechanism as we now handle them through XEP-0085 and having both is redundant and causes our XMPP unit tests to fail.
Diffstat (limited to 'src/net/java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTypingNotificationsJabberImpl.java | 9 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/util/Logger.java | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTypingNotificationsJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTypingNotificationsJabberImpl.java index f1db826..1ea8712 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTypingNotificationsJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTypingNotificationsJabberImpl.java @@ -165,7 +165,13 @@ public class OperationSetTypingNotificationsJabberImpl "The specified contact is not a Jabber contact." + notifiedContact); - + /** + * Emil Ivov: We used to use this in while we were still using XEP-0022 + * to send typing notifications. I am commenting it out today on + * 2008-08-20 as we now also support XEP-0085 (see below) and using both + * mechanisms sends double notifications which, apart from simply being + * redundant, is also causing the jabber slick to fail. + * String packetID = (String)packetIDsTable.get(notifiedContact.getAddress()); @@ -186,6 +192,7 @@ public class OperationSetTypingNotificationsJabberImpl packetIDsTable.remove(notifiedContact.getAddress()); } } + */ //now handle XEP-0085 sendXep85ChatState(notifiedContact, typingState); diff --git a/src/net/java/sip/communicator/util/Logger.java b/src/net/java/sip/communicator/util/Logger.java index 9046782..be30d2d 100644 --- a/src/net/java/sip/communicator/util/Logger.java +++ b/src/net/java/sip/communicator/util/Logger.java @@ -1,5 +1,9 @@ -package net.java.sip.communicator.util; - +/* + * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */package net.java.sip.communicator.util; import java.util.logging.*; /** @@ -62,7 +66,6 @@ public class Logger throws NullPointerException { return new Logger(java.util.logging.Logger.getLogger(name)); - } |