Make change start/end callbacks when parent controller is popped. Fixes #683 (#684)

conductor/src/main/java/com/bluelinelabs/conductor/Router.java

@@ -225,8 +225,9 @@ public abstract class Router {
         final List<RouterTransaction> poppedControllers = backstack.popAll();
         trackDestroyingControllers(poppedControllers);
 
+        RouterTransaction topTransaction = null;
         if (popViews && poppedControllers.size() > 0) {
-            RouterTransaction topTransaction = poppedControllers.get(0);
+            topTransaction = poppedControllers.get(0);
             topTransaction.controller().addLifecycleListener(new Controller.LifecycleListener() {
                 @Override
                 public void onChangeEnd(@NonNull Controller controller, @NonNull ControllerChangeHandler changeHandler, @NonNull ControllerChangeType changeType) {
@@ -241,6 +242,16 @@ public abstract class Router {
 
             performControllerChange(null, topTransaction, false, topTransaction.popChangeHandler());
         }
+
+        if (poppedControllers.size() > 0) {
+            NoOpControllerChangeHandler changeHandler = new NoOpControllerChangeHandler();
+            for (RouterTransaction routerTransaction : poppedControllers) {
+                if (routerTransaction != topTransaction) {
+                    routerTransaction.controller().changeStarted(changeHandler, ControllerChangeType.POP_EXIT);
+                    routerTransaction.controller().changeEnded(changeHandler, ControllerChangeType.POP_EXIT);
+                }
+            }
+        }
     }
 
     public int getContainerId() {
@@ -874,12 +885,7 @@ public abstract class Router {
             }
             pendingControllerChanges.add(transaction);
             if (container != null) {
-                container.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        performPendingControllerChanges();
-                    }
-                });
+                container.post(this::performPendingControllerChanges);
             }
         } else {
             ControllerChangeHandler.executeChange(transaction);

conductor/src/test/java/com/bluelinelabs/conductor/ControllerLifecycleActivityReferenceTests.kt

@@ -155,7 +155,7 @@ class ControllerLifecycleActivityReferenceTests {
     )
     activity.router.popCurrentController()
 
-    Assert.assertEquals(listOf(true), listener.changeEndReferences)
+    Assert.assertEquals(listOf(true, true), listener.changeEndReferences)
     Assert.assertEquals(listOf(true), listener.postCreateViewReferences)
     Assert.assertEquals(listOf(true), listener.postAttachReferences)
     Assert.assertEquals(listOf(true), listener.postDetachReferences)
@@ -208,7 +208,7 @@ class ControllerLifecycleActivityReferenceTests {
     )
     activityController.pause().stop().destroy()
 
-    Assert.assertEquals(listOf(true), listener.changeEndReferences)
+    Assert.assertEquals(listOf(true, true), listener.changeEndReferences)
     Assert.assertEquals(listOf(true), listener.postCreateViewReferences)
     Assert.assertEquals(listOf(true), listener.postAttachReferences)
     Assert.assertEquals(listOf(true), listener.postDetachReferences)

conductor/src/test/java/com/bluelinelabs/conductor/ControllerLifecycleCallbacksTests.kt

@@ -465,6 +465,8 @@ class ControllerLifecycleCallbacksTests {
     assertCalls(expectedCallState, child)
 
     activityController.get().router.popCurrentController()
+    expectedCallState.changeStartCalls++
+    expectedCallState.changeEndCalls++
     expectedCallState.detachCalls++
     expectedCallState.destroyViewCalls++
     expectedCallState.contextUnavailableCalls++