mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-10-31 17:25:58 +01:00
Bump JXMPP to 0.5.0
This commit is contained in:
parent
f633313c4a
commit
183c605278
8 changed files with 13 additions and 13 deletions
|
@ -160,7 +160,7 @@ public abstract class ScramMechanism extends SASLMechanism {
|
|||
// mechanisms.
|
||||
final String cacheKey = password + ',' + salt + ',' + getName();
|
||||
byte[] serverKey, clientKey;
|
||||
Keys keys = CACHE.get(cacheKey);
|
||||
Keys keys = CACHE.lookup(cacheKey);
|
||||
if (keys == null) {
|
||||
// SaltedPassword := Hi(Normalize(password), salt, i)
|
||||
byte[] saltedPassword = hi(saslPrep(password), Base64.decode(salt), iterations);
|
||||
|
|
|
@ -204,7 +204,7 @@ public final class IoTProvisioningManager extends Manager {
|
|||
|
||||
// Handle <clearCache/> request.
|
||||
Jid from = iqRequest.getFrom();
|
||||
LruCache<BareJid, Void> cache = negativeFriendshipRequestCache.get(from);
|
||||
LruCache<BareJid, Void> cache = negativeFriendshipRequestCache.lookup(from);
|
||||
if (cache != null) {
|
||||
cache.clear();
|
||||
}
|
||||
|
@ -329,7 +329,7 @@ public final class IoTProvisioningManager extends Manager {
|
|||
* @throws InterruptedException
|
||||
*/
|
||||
public boolean isFriend(Jid provisioningServer, BareJid friendInQuestion) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
|
||||
LruCache<BareJid, Void> cache = negativeFriendshipRequestCache.get(provisioningServer);
|
||||
LruCache<BareJid, Void> cache = negativeFriendshipRequestCache.lookup(provisioningServer);
|
||||
if (cache != null && cache.containsKey(friendInQuestion)) {
|
||||
// We hit a cached negative isFriend response for this provisioning server.
|
||||
return false;
|
||||
|
|
|
@ -304,7 +304,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
|
|||
* @param address the address the connection failure counter should be increased
|
||||
*/
|
||||
private static void incrementConnectionFailures(String address) {
|
||||
Integer count = ADDRESS_BLACKLIST.get(address);
|
||||
Integer count = ADDRESS_BLACKLIST.lookup(address);
|
||||
ADDRESS_BLACKLIST.put(address, count == null ? 1 : count + 1);
|
||||
}
|
||||
|
||||
|
@ -315,7 +315,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
|
|||
* @return number of connection failures
|
||||
*/
|
||||
private static int getConnectionFailures(String address) {
|
||||
Integer count = ADDRESS_BLACKLIST.get(address);
|
||||
Integer count = ADDRESS_BLACKLIST.lookup(address);
|
||||
return count != null ? count : 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -160,7 +160,7 @@ public final class EntityCapsManager extends Manager {
|
|||
* @return the node version (node#ver) or null
|
||||
*/
|
||||
public static String getNodeVersionByJid(Jid jid) {
|
||||
NodeVerHash nvh = JID_TO_NODEVER_CACHE.get(jid);
|
||||
NodeVerHash nvh = JID_TO_NODEVER_CACHE.lookup(jid);
|
||||
if (nvh != null) {
|
||||
return nvh.nodeVer;
|
||||
} else {
|
||||
|
@ -169,7 +169,7 @@ public final class EntityCapsManager extends Manager {
|
|||
}
|
||||
|
||||
public static NodeVerHash getNodeVerHashByJid(Jid jid) {
|
||||
return JID_TO_NODEVER_CACHE.get(jid);
|
||||
return JID_TO_NODEVER_CACHE.lookup(jid);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -182,7 +182,7 @@ public final class EntityCapsManager extends Manager {
|
|||
* @return the discovered info
|
||||
*/
|
||||
public static DiscoverInfo getDiscoverInfoByUser(Jid user) {
|
||||
NodeVerHash nvh = JID_TO_NODEVER_CACHE.get(user);
|
||||
NodeVerHash nvh = JID_TO_NODEVER_CACHE.lookup(user);
|
||||
if (nvh == null)
|
||||
return null;
|
||||
|
||||
|
@ -198,7 +198,7 @@ public final class EntityCapsManager extends Manager {
|
|||
* @return The corresponding DiscoverInfo or null if none is known.
|
||||
*/
|
||||
public static DiscoverInfo getDiscoveryInfoByNodeVer(String nodeVer) {
|
||||
DiscoverInfo info = CAPS_CACHE.get(nodeVer);
|
||||
DiscoverInfo info = CAPS_CACHE.lookup(nodeVer);
|
||||
|
||||
// If it was not in CAPS_CACHE, try to retrieve the information from persistentCache
|
||||
if (info == null && persistentCache != null) {
|
||||
|
|
|
@ -730,7 +730,7 @@ public final class ServiceDiscoveryManager extends Manager {
|
|||
List<DiscoverInfo> serviceDiscoInfo = null;
|
||||
DomainBareJid serviceName = connection().getXMPPServiceDomain();
|
||||
if (useCache) {
|
||||
serviceDiscoInfo = services.get(feature);
|
||||
serviceDiscoInfo = services.lookup(feature);
|
||||
if (serviceDiscoInfo != null) {
|
||||
return serviceDiscoInfo;
|
||||
}
|
||||
|
|
|
@ -335,7 +335,7 @@ public final class Roster extends Manager {
|
|||
private Map<Resourcepart, Presence> getPresencesInternal(BareJid entity) {
|
||||
Map<Resourcepart, Presence> entityPresences = presenceMap.get(entity);
|
||||
if (entityPresences == null) {
|
||||
entityPresences = nonRosterPresenceMap.get(entity);
|
||||
entityPresences = nonRosterPresenceMap.lookup(entity);
|
||||
}
|
||||
return entityPresences;
|
||||
}
|
||||
|
|
|
@ -193,7 +193,7 @@ public class EntityCapsTest extends AbstractSmackIntegrationTest {
|
|||
String u1ver = EntityCapsManager.getNodeVersionByJid(conTwo.getUser());
|
||||
assertNotNull(u1ver);
|
||||
|
||||
DiscoverInfo entityInfo = EntityCapsManager.CAPS_CACHE.get(u1ver);
|
||||
DiscoverInfo entityInfo = EntityCapsManager.CAPS_CACHE.lookup(u1ver);
|
||||
assertNotNull(entityInfo);
|
||||
|
||||
assertEquals(info.toXML(), entityInfo.toXML());
|
||||
|
|
|
@ -2,7 +2,7 @@ allprojects {
|
|||
ext {
|
||||
shortVersion = '4.2.0-beta4'
|
||||
isSnapshot = true
|
||||
jxmppVersion = '0.5.0-alpha7'
|
||||
jxmppVersion = '0.5.0'
|
||||
smackMinAndroidSdk = 8
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue