vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 14:02:06 +01:00
Code Issues Releases Wiki Activity

Rename Roster.getPresenceMapKey() to getMapKey()

Browse source 
since this method is not only used to determine the key for the
presence map, but also for the 'entries' map.

The logic is in both cases the same: If somehow an entry with an
resourcepart went into the roster (RFC 6121 does not explicity forbid
JIDs with an resourcepart in the roster), then use the full JID as
key, otherwise use the bare JID.

See also SMACK-19.
This commit is contained in:
Florian Schmaus 2015-01-19 19:26:19 +01:00
parent 9d775c8418
commit 142f78c135
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
smack-core/src/main/java/org/jivesoftware/smack/Roster.java
View file

@ -448,7 +448,7 @@ public class Roster {
if (user == null) { if (user == null) {
return null; return null;
} }
String key = getPresenceMapKey(user); String key = getMapKey(user);
return entries.get(key); return entries.get(key);
} }
@ -522,7 +522,7 @@ public class Roster {
* or if no presence information is available.. * or if no presence information is available..
*/ */
public Presence getPresence(String user) { public Presence getPresence(String user) {
String key = getPresenceMapKey(XmppStringUtils.parseBareJid(user)); String key = getMapKey(XmppStringUtils.parseBareJid(user));
Map<String, Presence> userPresences = presenceMap.get(key); Map<String, Presence> userPresences = presenceMap.get(key);
if (userPresences == null) { if (userPresences == null) {
Presence presence = new Presence(Presence.Type.unavailable); Presence presence = new Presence(Presence.Type.unavailable);
@ -589,7 +589,7 @@ public class Roster {
* or if no presence information is available. * or if no presence information is available.
*/ */
public Presence getPresenceResource(String userWithResource) { public Presence getPresenceResource(String userWithResource) {
String key = getPresenceMapKey(userWithResource); String key = getMapKey(userWithResource);
String resource = XmppStringUtils.parseResource(userWithResource); String resource = XmppStringUtils.parseResource(userWithResource);
Map<String, Presence> userPresences = presenceMap.get(key); Map<String, Presence> userPresences = presenceMap.get(key);
if (userPresences == null) { if (userPresences == null) {
@ -619,7 +619,7 @@ public class Roster {
* presence information is available. * presence information is available.
*/ */
public List<Presence> getAllPresences(String bareJid) { public List<Presence> getAllPresences(String bareJid) {
Map<String, Presence> userPresences = presenceMap.get(getPresenceMapKey(bareJid)); Map<String, Presence> userPresences = presenceMap.get(getMapKey(bareJid));
List<Presence> res; List<Presence> res;
if (userPresences == null) { if (userPresences == null) {
// Create an unavailable presence if none was found // Create an unavailable presence if none was found
@ -663,7 +663,7 @@ public class Roster {
*/ */
public List<Presence> getPresences(String user) { public List<Presence> getPresences(String user) {
List<Presence> res; List<Presence> res;
String key = getPresenceMapKey(user); String key = getMapKey(user);
Map<String, Presence> userPresences = presenceMap.get(key); Map<String, Presence> userPresences = presenceMap.get(key);
if (userPresences == null) { if (userPresences == null) {
Presence presence = new Presence(Presence.Type.unavailable); Presence presence = new Presence(Presence.Type.unavailable);
@ -724,7 +724,7 @@ public class Roster {
} }
/** /**
* Returns the key to use in the presenceMap for a fully qualified XMPP ID. * Returns the key to use in the presenceMap and entries Map for a fully qualified XMPP ID.
* The roster can contain any valid address format such us "domain/resource", * The roster can contain any valid address format such us "domain/resource",
* "user@domain" or "user@domain/resource". If the roster contains an entry * "user@domain" or "user@domain/resource". If the roster contains an entry
* associated with the fully qualified XMPP ID then use the fully qualified XMPP * associated with the fully qualified XMPP ID then use the fully qualified XMPP
@ -734,16 +734,16 @@ public class Roster {
* *
* @param user the bare or fully qualified XMPP ID, e.g. jdoe@example.com or * @param user the bare or fully qualified XMPP ID, e.g. jdoe@example.com or
* jdoe@example.com/Work. * jdoe@example.com/Work.
* @return the key to use in the presenceMap for the fully qualified XMPP ID. * @return the key to use in the presenceMap and entries Map for the fully qualified XMPP ID.
*/ */
private String getPresenceMapKey(String user) { private String getMapKey(String user) {
if (user == null) { if (user == null) {
return null; return null;
} }
String key = user; if (entries.containsKey(user)) {
if (!entries.containsKey(user)) { return user;
key = XmppStringUtils.parseBareJid(user);
} }
String key = XmppStringUtils.parseBareJid(user);
return key.toLowerCase(Locale.US); return key.toLowerCase(Locale.US);
} }
@ -975,7 +975,7 @@ public class Roster {
public void processPacket(Packet packet) throws NotConnectedException { public void processPacket(Packet packet) throws NotConnectedException {
Presence presence = (Presence) packet; Presence presence = (Presence) packet;
String from = presence.getFrom(); String from = presence.getFrom();
String key = getPresenceMapKey(from); String key = getMapKey(from);
Map<String, Presence> userPresences; Map<String, Presence> userPresences;
Presence response = null; Presence response = null;