diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-11-25 13:25:17 +0200 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-11-25 13:25:59 +0200 |
| commit | 0d568ebd21e93a0110834f38a3669dfedbac3118 (patch) | |
| tree | ecd5e77da3d5acb407bb554487222bd9d01dee65 | |
| parent | c7a6c3fc852489b30092599f15871a7fef5fee3c (diff) | |
| download | jitsi-0d568ebd21e93a0110834f38a3669dfedbac3118.zip jitsi-0d568ebd21e93a0110834f38a3669dfedbac3118.tar.gz jitsi-0d568ebd21e93a0110834f38a3669dfedbac3118.tar.bz2 | |
Adds some helper methods in xmpp protocol and a NPE check.
4 files changed, 24 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java index 869e51d..78402ad 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java @@ -355,6 +355,17 @@ public class InfoRetreiver } /** + * Adds a cached contact details. + * @param contactAddress the contact address + * @param details the details to add + */ + void addCachedContactDetails( + String contactAddress, List<GenericDetail> details) + { + retreivedDetails.put(contactAddress, details); + } + + /** * Checks for full name tag in the <tt>card</tt>. * @param card the card to check. * @return the Full name if existing, null otherwise. diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java index 24aac09..9dbc90b 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java @@ -879,7 +879,9 @@ public class OperationSetPersistentPresenceJabberImpl throw new IllegalArgumentException( "Argument is not an jabber contact (contact=" + contact + ")"); - ((ContactJabberImpl)contact).getSourceEntry().setName(newName); + RosterEntry entry = ((ContactJabberImpl)contact).getSourceEntry(); + if(entry != null) + entry.setName(newName); } /** diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java index 05cd9cd..c906ead 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetServerStoredContactInfoJabberImpl.java @@ -41,6 +41,15 @@ public class OperationSetServerStoredContactInfoJabberImpl } /** + * Returns the info retriever. + * @return the info retriever. + */ + InfoRetreiver getInfoRetriever() + { + return infoRetreiver; + } + + /** * returns the user details from the specified class or its descendants * the class is one from the * net.java.sip.communicator.service.protocol.ServerStoredDetails diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/VolatileContactJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/VolatileContactJabberImpl.java index b27f956..ee7cce2 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/VolatileContactJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/VolatileContactJabberImpl.java @@ -31,7 +31,7 @@ public class VolatileContactJabberImpl * The display name of the contact. This property is used only for private * messaging contacts. */ - private String displayName = null; + protected String displayName = null; /** * Creates an Volatile JabberContactImpl with the specified id |