popTo animates top screen

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/IdStack.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
+import android.support.annotation.NonNull;
+
 import com.reactnativenavigation.utils.StringUtils;
 
 import java.util.ArrayDeque;
@@ -68,7 +70,8 @@ public class IdStack<E> implements Iterable<String> {
 		return StringUtils.isEqual(id, peekId());
 	}
 
-	@Override
+	@NonNull
+    @Override
 	public Iterator<String> iterator() {
 		return deque.iterator();
 	}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -180,15 +180,15 @@ public class StackController extends ParentController<StackLayout> {
         Iterator<String> iterator = stack.iterator();
         String currentControlId = iterator.next();
         while (!viewController.getId().equals(currentControlId)) {
-            String nextControlId = iterator.next();
-            boolean animate = nextControlId.equals(viewController.getId());
-            if (animate) {
-                pop(listener);
-            } else {
-                removeAndDestroyController(stack.get(currentControlId));
+            if (stack.isTop(currentControlId)) {
+                currentControlId = iterator.next();
+                continue;
             }
-            currentControlId = nextControlId;
+            removeAndDestroyController(stack.get(currentControlId));
+            currentControlId = iterator.next();
         }
+
+        pop(listener);
     }
 
     void popToRoot(CommandListener listener) {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -43,6 +43,7 @@ public class StackControllerTest extends BaseTest {
     private ViewController child1;
     private ViewController child2;
     private ViewController child3;
+    private ViewController child4;
     private NavigationAnimator animator;
     private TopBarController topBarController;
 
@@ -54,6 +55,7 @@ public class StackControllerTest extends BaseTest {
         child1 = spy(new SimpleViewController(activity, "child1", new Options()));
         child2 = spy(new SimpleViewController(activity, "child2", new Options()));
         child3 = spy(new SimpleViewController(activity, "child3", new Options()));
+        child4 = spy(new SimpleViewController(activity, "child4", new Options()));
     }
 
     @Test
@@ -315,6 +317,26 @@ public class StackControllerTest extends BaseTest {
         assertThat(uut.size()).isEqualTo(2);
     }
 
+    @Test
+    public void popTo_animatesTopController() {
+        uut.push(child1, new CommandListenerAdapter());
+        uut.push(child2, new CommandListenerAdapter());
+        uut.push(child3, new CommandListenerAdapter());
+        uut.push(child4, new CommandListenerAdapter() {
+            @Override
+            public void onSuccess(String childId) {
+                uut.popTo(child2, new CommandListenerAdapter() {
+                    @Override
+                    public void onSuccess(String childId) {
+                        verify(animator, times(0)).animatePop(eq(child1.getView()), any());
+                        verify(animator, times(0)).animatePop(eq(child2.getView()), any());
+                        verify(animator, times(1)).animatePop(eq(child4.getView()), any());
+                    }
+                });
+            }
+        });
+    }
+
     @Test
     public void popToRoot_PopsEverythingAboveFirstController() {
         child1.options.animated = new Bool(false);