From b13e8dc827f03946d45f29aced27b0ca527241d7 Mon Sep 17 00:00:00 2001
From: Oksana Pokrovskaya <lempo.personal@gmail.com>
Date: Thu, 15 Mar 2018 12:24:03 +0300
Subject: [PATCH] fixed set state error

---
 .../fragments/ViewControllerFragment.java     | 19 ++++++++++---------
 .../components/viewmodel/StateViewModel.kt    |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 15a8129..c0bd1e2 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -103,7 +103,7 @@ public class ViewControllerFragment<TState extends AbstractState, TActivity exte
 
     private ViewController viewController;
     private Disposable viewControllerSubscription;
-    private TState state;
+    public TState state;
     private boolean started;
     private boolean stateCreated;
 
@@ -199,9 +199,18 @@ public class ViewControllerFragment<TState extends AbstractState, TActivity exte
         } catch (ShouldNotHappenException ignored) {
             // ignored, it`s ok to get null state there
         }
+
         state = savedInstanceState != null
                 ? stateFromViewModel != null ? stateFromViewModel : (TState) savedInstanceState.getSerializable(VIEW_CONTROLLER_STATE_EXTRA)
                 : (getArguments() != null ? (TState) getArguments().getSerializable(VIEW_CONTROLLER_STATE_EXTRA) : null);
+        if (state != null) {
+            if (inDebugMode) {
+                state = reserialize(state);
+            }
+            tryCreateState(getContext());
+        } else if (isStateRequired()) {
+            Lc.assertion("State is required and null");
+        }
         if (stateFromViewModel == null) {
             try {
                 Method stateSetter = viewModelClass.getSuperclass().getDeclaredMethod("setState", state.getClass().getSuperclass());
@@ -212,14 +221,6 @@ public class ViewControllerFragment<TState extends AbstractState, TActivity exte
             } catch (InvocationTargetException ignored) {
             }
         }
-        if (state != null) {
-            if (inDebugMode) {
-                state = reserialize(state);
-            }
-            tryCreateState(getContext());
-        } else if (isStateRequired()) {
-            Lc.assertion("State is required and null");
-        }
 
         viewControllerSubscription = Observable
                 .combineLatest(activitySubject.distinctUntilChanged(), viewSubject.distinctUntilChanged(),
diff --git a/src/main/java/ru/touchin/roboswag/components/viewmodel/StateViewModel.kt b/src/main/java/ru/touchin/roboswag/components/viewmodel/StateViewModel.kt
index 942314a..6d82ad3 100644
--- a/src/main/java/ru/touchin/roboswag/components/viewmodel/StateViewModel.kt
+++ b/src/main/java/ru/touchin/roboswag/components/viewmodel/StateViewModel.kt
@@ -32,7 +32,7 @@ open class StateViewModel<TState : AbstractState>(application: Application,
         untilDestroy(Observable.just(Any()), Consumer { onStateCreated() })
     }
 
-    protected fun onStateCreated() {
+    protected open fun onStateCreated() {
 
     }