commit c0f723b4b540aeb28fac00c484bd2d43871fc259
author Bo Duan <boduan402@gmail.com> Mon Nov 18 10:21:22 2019 -0800
committer Gabriel Peal <gpeal@users.noreply.github.com> Mon Nov 18 10:21:22 2019 -0800
tree 70d825dfed18246333e3e7525a9e1896e0a08a62
parent da96f5c8d8d1ef530d6632e94a42933a739786a7

Fix NPE when set ScaleType in xml. (#1433)

Fixes #1432

lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index a8113d5..44b58bb 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -204,6 +204,9 @@
       setRenderMode(RenderMode.values()[renderModeOrdinal]);
     }
 
+    if (getScaleType() != null) {
+      lottieDrawable.setScaleType(getScaleType());
+    }
     ta.recycle();
 
     lottieDrawable.setSystemAnimationsAreEnabled(Utils.getAnimationScale(getContext()) != 0f);
@@ -844,7 +847,9 @@
 
   @Override public void setScaleType(ScaleType scaleType) {
     super.setScaleType(scaleType);
-    lottieDrawable.setScaleType(scaleType);
+    if (lottieDrawable != null) {
+      lottieDrawable.setScaleType(scaleType);
+    }
   }
 
   @MainThread