Fixes slow sending of jabber messages.

Fixes some messages in history not shown, filtered by history service or exception obtaining display name of offline contacts.

2 files changed, 30 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
index 0b42221..2a32ab4 100644
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
@@ -302,4 +302,23 @@ public abstract class AbstractOperationSetBasicInstantMessaging
 
         return evt;
     }
+
+    /**
+     * Determines whether the protocol supports the supplied content type
+     * for the given contact.
+     *
+     * @param contentType the type we want to check
+     * @param contact contact which is checked for supported contentType
+     * @return <tt>true</tt> if the contact supports it and
+     * <tt>false</tt> otherwise.
+     */
+    public boolean isContentTypeSupported(String contentType, Contact contact)
+    {
+        // by default we support default mime type, for other mime-types
+        // method must be overridden
+        if(contentType.equals(DEFAULT_MIME_TYPE))
+            return true;
+
+        return false;
+    }
 }
diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java b/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java
index 9fb7831..c961511 100644
--- a/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java
+++ b/src/net/java/sip/communicator/service/protocol/OperationSetBasicInstantMessaging.java
@@ -109,4 +109,15 @@ public interface OperationSetBasicInstantMessaging
      * <tt>false</tt> otherwise.
      */
     public boolean isContentTypeSupported(String contentType);
+
+    /**
+     * Determines whether the protocol supports the supplied content type
+     * for the given contact.
+     *
+     * @param contentType the type we want to check
+     * @param contact contact which is checked for supported contentType
+     * @return <tt>true</tt> if the contact supports it and
+     * <tt>false</tt> otherwise.
+     */
+    public boolean isContentTypeSupported(String contentType, Contact contact);
 }