diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/services/AvatarService.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/services/AvatarService.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java index dac42c63d..4e3ed756b 100644 --- a/src/main/java/de/pixart/messenger/services/AvatarService.java +++ b/src/main/java/de/pixart/messenger/services/AvatarService.java @@ -30,7 +30,7 @@ import de.pixart.messenger.entities.MucOptions; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded; import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.jid.Jid; +import rocks.xmpp.addr.Jid; public class AvatarService implements OnAdvancedStreamFeaturesLoaded { @@ -72,7 +72,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { } } if (avatar == null) { - avatar = get(contact.getDisplayName(), contact.getJid().toBareJid().toString(), size, cachedOnly); + avatar = get(contact.getDisplayName(), contact.getJid().asBareJid().toString(), size, cachedOnly); } this.mXmppConnectionService.getBitmapCache().put(KEY, avatar); return avatar; @@ -119,7 +119,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { if (contact != null) { avatar = get(contact, size, cachedOnly); } else { - String seed = user.getRealJid() != null ? user.getRealJid().toBareJid().toString() : null; + String seed = user.getRealJid() != null ? user.getRealJid().asBareJid().toString() : null; avatar = get(user.getName(), seed, size, cachedOnly); } } @@ -145,7 +145,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { this.sizes.add(size); } } - return PREFIX_CONTACT + "_" + contact.getAccount().getJid().toBareJid() + "_" + return PREFIX_CONTACT + "_" + contact.getAccount().getJid().asBareJid() + "_" + contact.getJid() + "_" + String.valueOf(size); } @@ -155,7 +155,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { this.sizes.add(size); } } - return PREFIX_CONTACT + "_" + user.getAccount().getJid().toBareJid() + "_" + return PREFIX_CONTACT + "_" + user.getAccount().getJid().asBareJid() + "_" + user.getFullJid() + "_" + String.valueOf(size); } @@ -171,11 +171,11 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { if (bookmark.getConversation() != null) { return get(bookmark.getConversation(), size, cachedOnly); } else { - String seed = bookmark.getJid() != null ? bookmark.getJid().toBareJid().toString() : null; + String seed = bookmark.getJid() != null ? bookmark.getJid().asBareJid().toString() : null; return get(bookmark.getDisplayName(), seed, size, cachedOnly); } } else { - String seed = item.getJid() != null ? item.getJid().toBareJid().toString() : null; + String seed = item.getJid() != null ? item.getJid().asBareJid().toString() : null; return get(item.getDisplayName(), seed, size, cachedOnly); } } @@ -220,7 +220,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar(); if (users.size() == 0) { Conversation c = mucOptions.getConversation(); - bitmap = getImpl(c.getName(), c.getJid().toBareJid().toString(), size); + bitmap = getImpl(c.getName(), c.getJid().asBareJid().toString(), size); } else { bitmap = getImpl(users, size); } @@ -298,9 +298,9 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { for (MucOptions.User user : users) { builder.append("\0"); - builder.append(user.getRealJid() == null ? "" : user.getRealJid().toBareJid().toPreppedString()); + builder.append(user.getRealJid() == null ? "" : user.getRealJid().asBareJid().toString()); builder.append("\0"); - builder.append(user.getFullJid() == null ? "" : user.getFullJid().toPreppedString()); + builder.append(user.getFullJid() == null ? "" : user.getFullJid().toString()); } final String key = builder.toString(); synchronized (this.conversationDependentKeys) { @@ -328,7 +328,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { } avatar = mXmppConnectionService.getFileBackend().getAvatar(account.getAvatar(), size); if (avatar == null) { - avatar = get(account.getJid().toBareJid().toString(), null, size, false); + avatar = get(account.getJid().asBareJid().toString(), null, size, false); } mXmppConnectionService.getBitmapCache().put(KEY, avatar); return avatar; @@ -357,7 +357,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { return get(c, size, cachedOnly); } Jid tcp = message.getTrueCounterpart(); - String seed = tcp != null ? tcp.toBareJid().toString() : null; + String seed = tcp != null ? tcp.asBareJid().toString() : null; return get(UIHelper.getMessageDisplayName(message), seed, size, cachedOnly); } else { return get(conversation.getAccount(), size, cachedOnly); @@ -472,10 +472,10 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { } } if (contact != null) { - String seed = contact.getJid().toBareJid().toString(); + String seed = contact.getJid().asBareJid().toString(); drawTile(canvas, contact.getDisplayName(), seed, left, top, right, bottom); } else { - String seed = user.getRealJid() == null ? null : user.getRealJid().toBareJid().toString(); + String seed = user.getRealJid() == null ? null : user.getRealJid().asBareJid().toString(); drawTile(canvas, user.getName(), seed, left, top, right, bottom); } return true; @@ -491,7 +491,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { } } } - String name = account.getJid().toBareJid().toString(); + String name = account.getJid().asBareJid().toString(); return drawTile(canvas, name, name, left, top, right, bottom); } @@ -536,7 +536,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { public void onAdvancedStreamFeaturesAvailable(Account account) { XmppConnection.Features features = account.getXmppConnection().getFeatures(); if (features.pep() && !features.pepPersistent()) { - Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": has pep but is not persistent"); + Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": has pep but is not persistent"); if (account.getAvatar() != null) { mXmppConnectionService.republishAvatarIfNeeded(account); } |