From dbab43e42388572c19f59339cf0c8a76f85b8b7b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 27 Jul 2016 20:11:22 +0200 Subject: [PATCH] fixed rare null pointer in avatar creation --- .../java/eu/siacs/conversations/services/AvatarService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java index d77f4da59..45a6fd817 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -298,7 +298,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { } bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(bitmap); - final String trimmedName = name.trim(); + final String trimmedName = name == null ? "" : name.trim(); drawTile(canvas, trimmedName, 0, 0, size, size); mXmppConnectionService.getBitmapCache().put(KEY, bitmap); return bitmap;