Merge pull request #144 from square/loganj/restore

fix state restoration
square · Feb 11, 2016 · 92d16c2 · 92d16c2
2 parents 6995997 + 8a48117
commit 92d16c2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/flow/src/main/java/flow/InternalLifecycleIntegration.java b/flow/src/main/java/flow/InternalLifecycleIntegration.java
@@ -44,9 +44,11 @@ static void install(final Application app, final Activity activity,
       @Override public void onActivityCreated(Activity a, Bundle savedInstanceState) {
         if (a == activity) {
           InternalLifecycleIntegration fragment = find(activity);
-          final boolean newFragment = fragment == null;
+          boolean newFragment = fragment == null;
           if (newFragment) {
             fragment = new InternalLifecycleIntegration();
+          }
+          if (fragment.keyManager == null) {
             fragment.defaultHistory = defaultHistory;
             fragment.parceler = parceler;
             fragment.keyManager = keyManager;