Don't allow minFrame > maxFrame in LottieValueAnimator (airbnb#969)

XHGInc · Oct 19, 2018 · 8f8da11 · 8f8da11
1 parent 65c5ee8
commit 8f8da11
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/LottieValueAnimator.java b/lottie/src/main/java/com/airbnb/lottie/utils/LottieValueAnimator.java
@@ -163,6 +163,9 @@ public void setMaxFrame(int maxFrame) {
   }
 
   public void setMinAndMaxFrames(int minFrame, int maxFrame) {
+    if (minFrame > maxFrame) {
+      throw new IllegalArgumentException(String.format("minFrame (%s) must be <= maxFrame (%s)", minFrame, maxFrame));
+    }
     float compositionMinFrame = composition == null ? -Float.MAX_VALUE : composition.getStartFrame();
     float compositionMaxFrame = composition == null ? Float.MAX_VALUE : composition.getEndFrame();
     this.minFrame = MiscUtils.clamp(minFrame, compositionMinFrame, compositionMaxFrame);

diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
@@ -163,6 +163,23 @@ public void testMinAndMaxBothSet() {
     assertClose(0.8f, animator.getAnimatedValueAbsolute());
   }
 
+  @Test
+  public void testSetFrameIntegrity() {
+    animator.setMinAndMaxFrames(200, 800);
+
+    // setFrame < minFrame should clamp to minFrame
+    animator.setFrame(100);
+    assertEquals(200, animator.getFrame());
+
+    animator.setFrame(900);
+    assertEquals(800, animator.getFrame());
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testMinAndMaxFrameIntegrity() {
+    animator.setMinAndMaxFrames(800, 200);
+  }
+
   @Test
   public void testDefaultAnimator() {
     testAnimator(new VerifyListener() {