From 8c983bb7e684085c9bf3a3b7498e9dc7b143c5a8 Mon Sep 17 00:00:00 2001 From: Dan Lew Date: Thu, 17 Dec 2015 06:39:21 -0600 Subject: [PATCH] Fixed accidentally introduced potential NPE This can occur when loading an image where one of the layers doesn't load correctly. --- .../habitrpg/android/habitica/userpicture/UserPicture.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java index 64edfaff3..84051483e 100644 --- a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java +++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java @@ -66,10 +66,9 @@ public class UserPicture { Bitmap res = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ARGB_8888); Canvas myCanvas = new Canvas(res); Integer layerNumber = 0; - for (Object layer : this.layers) { - if (layer.getClass() == Bitmap.class) { - Bitmap layerBitmap = (Bitmap) layer; - this.modifyCanvas(layerBitmap, myCanvas, layerNumber); + for (Bitmap layerBitmap : this.layers) { + if (layerBitmap != null) { + modifyCanvas(layerBitmap, myCanvas, layerNumber); } layerNumber++; }