fix backstack by historyChangesAfterListenerCall() flow test

Zhuinden · Jan 16, 2017 · 08584fc · 08584fc
1 parent 05f8056
commit 08584fc
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/demo-stack/src/main/java/com/zhuinden/simplestackdemo/stack/Backstack.java b/demo-stack/src/main/java/com/zhuinden/simplestackdemo/stack/Backstack.java
@@ -27,9 +27,10 @@ public class Backstack {
     public static final int REATTACH = 1;
     //
 
-    private final List<Parcelable> initialParameters;
+    private final List<Parcelable> originalStack = new ArrayList<>();
 
-    private ArrayList<Parcelable> stack = new ArrayList<>();
+    private final List<Parcelable> initialParameters;
+    private List<Parcelable> stack = originalStack;
 
     private LinkedList<PendingStateChange> queuedStateChanges = new LinkedList<>();
 
@@ -71,6 +72,7 @@ public void setStateChanger(StateChanger stateChanger, @StateChangerRegisterMode
                 }
                 ArrayList<Parcelable> newHistory = new ArrayList<>();
                 newHistory.addAll(stack.isEmpty() ? initialParameters : stack);
+                stack = initialParameters;
                 enqueueStateChange(newHistory, StateChange.Direction.REPLACE, true);
             }
         }
@@ -172,9 +174,12 @@ public void stateChangeComplete() {
     }
 
     private void completeStateChange(StateChange stateChange) {
-        if(!stateChange.previousState.isEmpty() || (stateChange.previousState.isEmpty() && stack.isEmpty())) {
-            this.stack.clear();
-            this.stack.addAll(stateChange.newState);
+        if(!stateChange.previousState.isEmpty() || (stateChange.previousState.isEmpty() && initialParameters == stack)) {
+            if(initialParameters == stack) {
+                stack = originalStack;
+            }
+            stack.clear();
+            stack.addAll(stateChange.newState);
         }
 
         PendingStateChange pendingStateChange = queuedStateChanges.remove(0);