commit f71402c8959cf7e65b8674d39112de2dc43ce0a2
author Gabriel Peal <gpeal@users.noreply.github.com> Thu Aug 30 09:35:48 2018 -0700
committer GitHub <noreply@github.com> Thu Aug 30 09:35:48 2018 -0700
tree df6019b65a690df709680640778b02353c3377fb
parent 9be40fb1c03f3bba53597f5cb2db823dbd8c97bb

Gracefully degrade when null bitmaps are set (#912)

Fixes #586
Fixes #900

lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
index 9159743..1630613 100644
--- a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
+++ b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
@@ -66,25 +66,24 @@
   }
 
   @Nullable public Bitmap bitmapForId(String id) {
-    Bitmap bitmap = imageAssets.get(id).getBitmap();
+    LottieImageAsset asset = imageAssets.get(id);
+    if (asset == null) {
+      return null;
+    }
+    Bitmap bitmap = asset.getBitmap();
     if (bitmap != null) {
       return bitmap;
     }
 
-    LottieImageAsset imageAsset = imageAssets.get(id);
-    if (imageAsset == null) {
-      return null;
-    }
-
     if (delegate != null) {
-      bitmap = delegate.fetchBitmap(imageAsset);
+      bitmap = delegate.fetchBitmap(asset);
       if (bitmap != null) {
         putBitmap(id, bitmap);
       }
       return bitmap;
     }
 
-    String filename = imageAsset.getFileName();
+    String filename = asset.getFileName();
     BitmapFactory.Options opts = new BitmapFactory.Options();
     opts.inScaled = true;
     opts.inDensity = 160;
@@ -122,7 +121,10 @@
       Iterator<Map.Entry<String, LottieImageAsset>> it = imageAssets.entrySet().iterator();
       while (it.hasNext()) {
         Map.Entry<String, LottieImageAsset> entry = it.next();
-        entry.getValue().getBitmap().recycle();
+        Bitmap bitmap = entry.getValue().getBitmap();
+        if (bitmap != null) {
+          bitmap.recycle();
+        }
         it.remove();
       }
     }