sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle muc nicks with white spaces. fixed #884

This commit is contained in:
iNPUTmice 2015-01-14 22:48:14 +01:00
parent df742ce1e1
commit a6a9ed4877
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/services/AvatarService.java
View File

@ -212,7 +212,8 @@ public class AvatarService {
} }
bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888); bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap); Canvas canvas = new Canvas(bitmap);
final String letter = name.isEmpty() ? "X" : name.substring(0,1); final String trimmedName = name.trim();
final String letter = trimmedName.isEmpty() ? "X" : trimmedName.substring(0,1);
final int color = UIHelper.getColorForName(name); final int color = UIHelper.getColorForName(name);
drawTile(canvas, letter, color, 0, 0, size, size); drawTile(canvas, letter, color, 0, 0, size, size);
mXmppConnectionService.getBitmapCache().put(KEY, bitmap); mXmppConnectionService.getBitmapCache().put(KEY, bitmap);

4
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View File

@ -212,9 +212,9 @@ public class UIHelper {
if (counterpart==null) { if (counterpart==null) {
return ""; return "";
} else if (!counterpart.isBareJid()) { } else if (!counterpart.isBareJid()) {
return counterpart.getResourcepart(); return counterpart.getResourcepart().trim();
} else { } else {
return counterpart.toString(); return counterpart.toString().trim();
} }
} }
} }