thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display '#' in generated channel avatars

Browse source
This commit is contained in:
Christian Schneppe 2019-12-24 14:07:15 +01:00
parent 15d27e2cbb
commit b4f8f47540
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/de/pixart/messenger/services/AvatarService.java
View file

@ -60,6 +60,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
private static final String PREFIX_CONVERSATION = "conversation";
private static final String PREFIX_ACCOUNT = "account";
private static final String PREFIX_GENERIC = "generic";
private static final String CHANNEL_SYMBOL = "#";
final private ArrayList<Integer> sizes = new ArrayList<>();
final private HashMap<String, Set<String>> conversationDependentKeys = new HashMap<>();
@ -97,7 +98,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
if (conversation != null) {
return get(conversation, size, cacheOnly);
}
return get(result.getName(), room != null ? room.asBareJid().toEscapedString() : result.getName(), size, cacheOnly);
return get(CHANNEL_SYMBOL, room != null ? room.asBareJid().toEscapedString() : result.getName(), size, cacheOnly);
}
private Bitmap get(final Contact contact, final int size, boolean cachedOnly) {
@ -342,12 +343,16 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
bitmap = mXmppConnectionService.getFileBackend().getAvatar(mucOptions.getAvatar(), size);
if (bitmap == null) {
final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar();
if (users.size() == 0) {
Conversation c = mucOptions.getConversation();
bitmap = getImpl(c.getName().toString(), c.getJid().asBareJid().toString(), size);
Conversation c = mucOptions.getConversation();
if (mucOptions.isPrivateAndNonAnonymous()) {
final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar();
if (users.size() == 0) {
bitmap = getImpl(c.getName().toString(), c.getJid().asBareJid().toString(), size);
} else {
bitmap = getImpl(users, size);
}
} else {
bitmap = getImpl(users, size);
bitmap = getImpl(CHANNEL_SYMBOL, c.getJid().asBareJid().toString(), size);
}
}
@ -631,7 +636,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
private static boolean drawTile(Canvas canvas, String name, String seed, int left, int top, int right, int bottom) {
if (name != null) {
final String letter = getFirstLetter(name);
final String letter = name.equals(CHANNEL_SYMBOL) ? name : getFirstLetter(name);
final int color = UIHelper.getColorForName(seed == null ? name : seed);
drawTile(canvas, letter, color, left, top, right, bottom);
return true;