From a059380ddc7ea3aee059f6fcf3f249917a574881 Mon Sep 17 00:00:00 2001
From: Arseniy Borisov <ars.borisov@gmail.com>
Date: Tue, 21 Feb 2017 16:11:42 +0300
Subject: [PATCH] fix static

---
 .../SimpleViewControllerFragment.java         |  5 +++++
 ...atelessTargetedViewControllerFragment.java |  5 +++++
 .../StatelessViewControllerFragment.java      | 19 ++++++++++++-------
 .../fragments/ViewControllerFragment.java     | 11 +++++++++--
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java
index 98e355f..900804d 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java
@@ -64,6 +64,11 @@ public class SimpleViewControllerFragment<TState extends AbstractState, TActivit
         return viewControllerClass;
     }
 
+    @Override
+    protected boolean isStateRequired() {
+        return true;
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java
index 75a8f0f..bc5421a 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java
@@ -51,6 +51,11 @@ public class StatelessTargetedViewControllerFragment<TTargetState extends Abstra
         return createState(viewControllerClass, new DefaultState());
     }
 
+    @Override
+    protected boolean isStateRequired() {
+        return false;
+    }
+
     @NonNull
     @Override
     public AbstractState getState() {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java
index 69bfa9b..f463ae6 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java
@@ -38,13 +38,6 @@ import ru.touchin.roboswag.core.log.Lc;
 public class StatelessViewControllerFragment<TActivity extends ViewControllerActivity<?>>
         extends SimpleViewControllerFragment<AbstractState, TActivity> {
 
-    @NonNull
-    @Override
-    public AbstractState getState() {
-        Lc.assertion("Trying to access to state of stateless fragment of " + getViewControllerClass());
-        return super.getState();
-    }
-
     /**
      * Creates {@link Bundle} which will store state and {@link ViewController}'s class.
      *
@@ -56,4 +49,16 @@ public class StatelessViewControllerFragment<TActivity extends ViewControllerAct
         return createState(viewControllerClass, new DefaultState());
     }
 
+    @NonNull
+    @Override
+    public AbstractState getState() {
+        Lc.assertion("Trying to access to state of stateless fragment of " + getViewControllerClass());
+        return super.getState();
+    }
+
+    @Override
+    protected boolean isStateRequired() {
+        return false;
+    }
+
 }
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 6e34840..d2bda7a 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
@@ -139,6 +139,13 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
     public abstract Class<? extends ViewController<TActivity,
             ? extends ViewControllerFragment<TState, TActivity>>> getViewControllerClass();
 
+    /**
+     * Returns if ViewControllerFragment requires state or not.
+     *
+     * @return true if state is required
+     */
+    protected abstract boolean isStateRequired();
+
     @SuppressWarnings("unchecked")
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
@@ -154,8 +161,8 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
                 state = reserialize(state);
             }
             state.onCreate();
-        } else {
-            Lc.assertion("State is null");
+        } else if (isStateRequired()) {
+            Lc.assertion("State is required and null");
         }
         viewControllerSubscription = Observable
                 .combineLatest(activitySubject.distinctUntilChanged(), viewSubject.distinctUntilChanged(),