From ae90c0f3495262122c862db818ab92cb5dc29804 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Tue, 20 Oct 2015 23:25:26 +1100
Subject: [PATCH 01/28] Decouple EventBusC2V from AndroidMvc

---
 .../shipdream/lib/android/mvc/Injector.java   | 19 ++++++++++++++
 .../lib/android/mvc/view/AndroidMvc.java      | 20 ---------------
 .../lib/android/mvc/view/EventRegister.java   | 25 +++++++++++++++++--
 .../lib/android/mvc/view/MvcService.java      |  2 +-
 4 files changed, 43 insertions(+), 23 deletions(-)
 create mode 100644 library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
new file mode 100644
index 0000000..a272cae
--- /dev/null
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
@@ -0,0 +1,19 @@
+package com.shipdream.lib.android.mvc;
+
+import com.shipdream.lib.poke.exception.PokeException;
+
+public class Injector {
+    private static MvcGraph mvcGraph;
+
+    public static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
+        try {
+            mvcGraph = new MvcGraph(baseDependencies);
+        } catch (PokeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static MvcGraph getGraph() {
+        return mvcGraph;
+    }
+}
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
index db1033e..da3a3a7 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
@@ -31,7 +31,6 @@
 import com.shipdream.lib.android.mvc.controller.internal.AndroidPosterImpl;
 import com.shipdream.lib.android.mvc.event.BaseEventV2V;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
-import com.shipdream.lib.android.mvc.event.bus.annotation.EventBusC2V;
 import com.shipdream.lib.android.mvc.event.bus.internal.EventBusImpl;
 import com.shipdream.lib.poke.exception.PokeException;
 
@@ -43,8 +42,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
-import javax.inject.Inject;
-
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
 /**
@@ -54,16 +51,9 @@
  * {@link MvcGraph} how it works.
  */
 public class AndroidMvc {
-    private static class EventBusC2VHolder {
-        @Inject
-        @EventBusC2V
-        EventBus eventBusC2V;
-    }
-
     static final String MVC_SATE_PREFIX = "__--AndroidMvc:State:";
     static final String FRAGMENT_TAG_PREFIX = "__--AndroidMvc:Fragment:";
     private static MvcGraph mvcGraph;
-    private static EventBusC2VHolder eventBusC2VHolder;
     private static EventBus eventBusV2V;
     private static DefaultStateKeeper sStateManager;
 
@@ -96,8 +86,6 @@ public static MvcGraph graph() {
     public static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
         try {
             mvcGraph = new MvcGraph(baseDependencies);
-            eventBusC2VHolder = new EventBusC2VHolder();
-            mvcGraph.inject(eventBusC2VHolder);
         } catch (PokeException e) {
             throw new RuntimeException(e);
         }
@@ -151,14 +139,6 @@ static void restoreControllerStateByTheirOwn(Bundle savedState, Object object) {
         }
     }
 
-    /**
-     * Gets Controllers to Views event bus. Internal use by AndroidMvc library only.
-     * @return The event bus
-     */
-    static EventBus getEventBusC2V() {
-        return eventBusC2VHolder.eventBusC2V;
-    }
-
     /**
      * Gets the views to views event bus. By default all {@link MvcFragment}s,
      * {@link MvcDialogFragment} and {@link MvcService} have registered to this event bus. They
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
index a49f065..286e069 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
@@ -16,10 +16,31 @@
 
 package com.shipdream.lib.android.mvc.view;
 
+import com.shipdream.lib.android.mvc.event.bus.EventBus;
+import com.shipdream.lib.android.mvc.event.bus.annotation.EventBusC2V;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+
 class EventRegister {
+    private static class C2VBusHolder {
+        @Inject
+        @EventBusC2V
+        private EventBus eventBusC2V;
+
+        private static C2VBusHolder instance;
+
+        private static C2VBusHolder getInstance() {
+            if (instance == null) {
+                instance = new C2VBusHolder();
+                AndroidMvc.graph().inject(instance);
+            }
+            return instance;
+        }
+    }
+
     private Logger logger = LoggerFactory.getLogger(getClass());
     private Object androidComponent;
     private boolean eventsRegistered = false;
@@ -33,7 +54,7 @@ public EventRegister(Object androidComponent) {
      */
     public void registerEventBuses() {
         if (!eventsRegistered) {
-            AndroidMvc.getEventBusC2V().register(androidComponent);
+            C2VBusHolder.getInstance().eventBusC2V.register(androidComponent);
             AndroidMvc.getEventBusV2V().register(androidComponent);
             eventsRegistered = true;
             logger.trace("+Event bus registered for view - '{}'.",
@@ -49,7 +70,7 @@ public void registerEventBuses() {
      */
     public void unregisterEventBuses() {
         if (eventsRegistered) {
-            AndroidMvc.getEventBusC2V().unregister(androidComponent);
+            C2VBusHolder.getInstance().eventBusC2V.unregister(androidComponent);
             AndroidMvc.getEventBusV2V().unregister(androidComponent);
             eventsRegistered = false;
             logger.trace("-Event bus unregistered for view - '{}' and its controllers.",
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
index 2a25485..12f0691 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
@@ -55,6 +55,6 @@ public void onDestroy() {
      * @param event
      */
     protected void postEventV2V(BaseEventV2V event) {
-        AndroidMvc.getEventBusC2V().post(event);
+        AndroidMvc.getEventBusV2V().post(event);
     }
 }

From 16fac5e899b216417dd480b9697191eb33b8cd30 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Wed, 21 Oct 2015 23:33:36 +1100
Subject: [PATCH 02/28] Move instance of MvcGraph to controller layer

---
 .../shipdream/lib/android/mvc/Injector.java   |  6 +-
 .../shipdream/lib/android/mvc/MvcConfig.java  | 11 +++
 .../lib/android/mvc/view/AndroidMvc.java      | 77 ++++++++-----------
 3 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
index a272cae..475af72 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
@@ -5,7 +5,7 @@
 public class Injector {
     private static MvcGraph mvcGraph;
 
-    public static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
+    static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
         try {
             mvcGraph = new MvcGraph(baseDependencies);
         } catch (PokeException e) {
@@ -13,6 +13,10 @@ public static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
         }
     }
 
+    /**
+     * Get the graph managing injectable objects.
+     * @return
+     */
     public static MvcGraph getGraph() {
         return mvcGraph;
     }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java
new file mode 100644
index 0000000..78429db
--- /dev/null
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java
@@ -0,0 +1,11 @@
+package com.shipdream.lib.android.mvc;
+
+public class MvcConfig {
+    /**
+     * Config the dependencies of MvcGraph.
+     * @param dependencies the dependencies.
+     */
+    public static void configGraph(MvcGraph.BaseDependencies dependencies) {
+        Injector.configGraph(dependencies);
+    }
+}
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
index da3a3a7..7ba01b5 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
@@ -23,6 +23,8 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
+import com.shipdream.lib.android.mvc.Injector;
+import com.shipdream.lib.android.mvc.MvcConfig;
 import com.shipdream.lib.android.mvc.MvcGraph;
 import com.shipdream.lib.android.mvc.StateKeeper;
 import com.shipdream.lib.android.mvc.StateManaged;
@@ -32,7 +34,6 @@
 import com.shipdream.lib.android.mvc.event.BaseEventV2V;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
 import com.shipdream.lib.android.mvc.event.bus.internal.EventBusImpl;
-import com.shipdream.lib.poke.exception.PokeException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,19 +47,42 @@
 
 /**
  * {@link AndroidMvc} will generate a default {@link MvcGraph} for injection. To replace
- * {@link MvcGraph.BaseDependencies} use {@link #configGraph(MvcGraph.BaseDependencies)}.
+ * {@link MvcGraph.BaseDependencies} use {@link MvcConfig#configGraph(MvcGraph.BaseDependencies)}.
  * By default, the graph uses naming convention to locate the implementations of dependencies. See
  * {@link MvcGraph} how it works.
  */
 public class AndroidMvc {
     static final String MVC_SATE_PREFIX = "__--AndroidMvc:State:";
     static final String FRAGMENT_TAG_PREFIX = "__--AndroidMvc:Fragment:";
-    private static MvcGraph mvcGraph;
     private static EventBus eventBusV2V;
     private static DefaultStateKeeper sStateManager;
 
+    private static class DefaultControllerDependencies extends MvcGraph.BaseDependencies {
+        private static ExecutorService sNetworkExecutorService;
+        private final static String BACKGROUND_THREAD_NAME = "AndroidMvcDefaultBackgroundThread";
+
+        @Override
+        public ExecutorService createExecutorService() {
+            if (sNetworkExecutorService == null) {
+                sNetworkExecutorService = Executors.newFixedThreadPool(10, new ThreadFactory() {
+                    @Override
+                    public Thread newThread(final @NonNull Runnable r) {
+                        return new Thread(new Runnable() {
+                            @Override
+                            public void run() {
+                                android.os.Process.setThreadPriority(THREAD_PRIORITY_BACKGROUND);
+                                r.run();
+                            }
+                        }, BACKGROUND_THREAD_NAME);
+                    }
+                });
+            }
+            return sNetworkExecutorService;
+        }
+    }
+
     static {
-        configGraph(new DefaultControllerDependencies());
+        MvcConfig.configGraph(new DefaultControllerDependencies());
         sStateManager = new DefaultStateKeeper();
         eventBusV2V = new EventBusImpl();
 
@@ -73,33 +97,18 @@ private AndroidMvc() {
      * @return The {@link MvcGraph}
      */
     public static MvcGraph graph() {
-        return mvcGraph;
-    }
-
-    /**
-     * Config the {@link MvcGraph} by custom dependencies.
-     * <p>Note that, the graph will be regenerated after config. In addition, it's cached instances
-     * will be regenerated such as cached singletons.</p>
-     *
-     * @param baseDependencies The dependencies of all controllers
-     */
-    public static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
-        try {
-            mvcGraph = new MvcGraph(baseDependencies);
-        } catch (PokeException e) {
-            throw new RuntimeException(e);
-        }
+        return Injector.getGraph();
     }
 
     static void saveStateOfAllControllers(Bundle outState) {
         sStateManager.bundle = outState;
-        mvcGraph.saveAllStates(sStateManager);
+        Injector.getGraph().saveAllStates(sStateManager);
         sStateManager.bundle = null;
     }
 
     static void restoreStateOfAllControllers(Bundle savedState) {
         sStateManager.bundle = savedState;
-        mvcGraph.restoreAllStates(sStateManager);
+        Injector.getGraph().restoreAllStates(sStateManager);
         sStateManager.bundle = null;
     }
 
@@ -162,30 +171,6 @@ public static void setCustomStateKeeper(AndroidStateKeeper customStateKeeper) {
         sStateManager.customStateKeeper = customStateKeeper;
     }
 
-    private static class DefaultControllerDependencies extends MvcGraph.BaseDependencies {
-        private static ExecutorService sNetworkExecutorService;
-        private final static String BACKGROUND_THREAD_NAME = "AndroidMvcDefaultBackgroundThread";
-
-        @Override
-        public ExecutorService createExecutorService() {
-            if (sNetworkExecutorService == null) {
-                sNetworkExecutorService = Executors.newFixedThreadPool(10, new ThreadFactory() {
-                    @Override
-                    public Thread newThread(final @NonNull Runnable r) {
-                        return new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                android.os.Process.setThreadPriority(THREAD_PRIORITY_BACKGROUND);
-                                r.run();
-                            }
-                        }, BACKGROUND_THREAD_NAME);
-                    }
-                });
-            }
-            return sNetworkExecutorService;
-        }
-    }
-
     private static class DefaultStateKeeper implements StateKeeper {
         private static Gson gson;
         private Bundle bundle;

From fc4ee5c3d640d5747ca917767248f6c80e9d5b6c Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Thu, 22 Oct 2015 23:39:00 +1100
Subject: [PATCH 03/28] EventBusV2V is injectable now

---
 .../shipdream/lib/android/mvc/Injector.java   |  9 +++--
 .../shipdream/lib/android/mvc/MvcConfig.java  | 11 -------
 .../lib/android/mvc/view/AndroidMvc.java      | 33 +++++++++----------
 .../lib/android/mvc/view/EventBusV2V.java     | 17 ++++++++++
 .../lib/android/mvc/view/EventRegister.java   | 24 +++++++++-----
 .../android/mvc/view/MvcDialogFragment.java   | 14 ++++++--
 .../lib/android/mvc/view/MvcFragment.java     | 14 ++++++--
 .../lib/android/mvc/view/MvcService.java      | 12 +++++--
 8 files changed, 88 insertions(+), 46 deletions(-)
 delete mode 100644 library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java
 create mode 100644 library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventBusV2V.java

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
index 475af72..615d592 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java
@@ -5,9 +5,14 @@
 public class Injector {
     private static MvcGraph mvcGraph;
 
-    static void configGraph(MvcGraph.BaseDependencies baseDependencies) {
+    /**
+     * Config the dependencies of MvcGraph. Be careful to use this method because it will dump the
+     * existing graph and all injectable instances managed by it
+     * @param dependencies the dependencies.
+     */
+    public static void configGraph(MvcGraph.BaseDependencies dependencies) {
         try {
-            mvcGraph = new MvcGraph(baseDependencies);
+            mvcGraph = new MvcGraph(dependencies);
         } catch (PokeException e) {
             throw new RuntimeException(e);
         }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java
deleted file mode 100644
index 78429db..0000000
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/MvcConfig.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.shipdream.lib.android.mvc;
-
-public class MvcConfig {
-    /**
-     * Config the dependencies of MvcGraph.
-     * @param dependencies the dependencies.
-     */
-    public static void configGraph(MvcGraph.BaseDependencies dependencies) {
-        Injector.configGraph(dependencies);
-    }
-}
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
index 7ba01b5..1f87e9e 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
@@ -24,16 +24,16 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.shipdream.lib.android.mvc.Injector;
-import com.shipdream.lib.android.mvc.MvcConfig;
 import com.shipdream.lib.android.mvc.MvcGraph;
 import com.shipdream.lib.android.mvc.StateKeeper;
 import com.shipdream.lib.android.mvc.StateManaged;
 import com.shipdream.lib.android.mvc.controller.BaseController;
 import com.shipdream.lib.android.mvc.controller.NavigationController;
 import com.shipdream.lib.android.mvc.controller.internal.AndroidPosterImpl;
-import com.shipdream.lib.android.mvc.event.BaseEventV2V;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
 import com.shipdream.lib.android.mvc.event.bus.internal.EventBusImpl;
+import com.shipdream.lib.poke.Component;
+import com.shipdream.lib.poke.Provides;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,18 +43,19 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
+import javax.inject.Singleton;
+
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
 /**
  * {@link AndroidMvc} will generate a default {@link MvcGraph} for injection. To replace
- * {@link MvcGraph.BaseDependencies} use {@link MvcConfig#configGraph(MvcGraph.BaseDependencies)}.
+ * {@link MvcGraph.BaseDependencies} use {@link Injector#configGraph(MvcGraph.BaseDependencies)}.
  * By default, the graph uses naming convention to locate the implementations of dependencies. See
  * {@link MvcGraph} how it works.
  */
 public class AndroidMvc {
     static final String MVC_SATE_PREFIX = "__--AndroidMvc:State:";
     static final String FRAGMENT_TAG_PREFIX = "__--AndroidMvc:Fragment:";
-    private static EventBus eventBusV2V;
     private static DefaultStateKeeper sStateManager;
 
     private static class DefaultControllerDependencies extends MvcGraph.BaseDependencies {
@@ -81,10 +82,19 @@ public void run() {
         }
     }
 
+    static class ViewComponent extends Component {
+        @Provides
+        @EventBusV2V
+        @Singleton
+        public EventBus providesIEventBusC2V() {
+            return new EventBusImpl();
+        }
+    }
+
     static {
-        MvcConfig.configGraph(new DefaultControllerDependencies());
+        Injector.configGraph(new DefaultControllerDependencies());
+        Injector.getGraph().register(new ViewComponent());
         sStateManager = new DefaultStateKeeper();
-        eventBusV2V = new EventBusImpl();
 
         AndroidPosterImpl.init();
     }
@@ -148,17 +158,6 @@ static void restoreControllerStateByTheirOwn(Bundle savedState, Object object) {
         }
     }
 
-    /**
-     * Gets the views to views event bus. By default all {@link MvcFragment}s,
-     * {@link MvcDialogFragment} and {@link MvcService} have registered to this event bus. They
-     * also have short cut methods to post {@link BaseEventV2V}. Custom views which need to use the
-     * event bus must register to this event respectively..
-     * @return The event bus
-     */
-    public static EventBus getEventBusV2V() {
-        return eventBusV2V;
-    }
-
     /**
      * Set the custom state keeper for the objects that are wanted to be saved and restored by it.
      * Other objects will still be saved and restored by json serialization.
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventBusV2V.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventBusV2V.java
new file mode 100644
index 0000000..d3bcb55
--- /dev/null
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventBusV2V.java
@@ -0,0 +1,17 @@
+package com.shipdream.lib.android.mvc.view;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+/**
+ * Indicates the annotated event bus is for communication among views. Events through the
+ * event bus annotated by this annotation should be posted and received on UI thread.
+ */
+@Qualifier
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EventBusV2V {
+}
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
index 286e069..dad1169 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
@@ -16,6 +16,7 @@
 
 package com.shipdream.lib.android.mvc.view;
 
+import com.shipdream.lib.android.mvc.event.BaseEventV2V;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
 import com.shipdream.lib.android.mvc.event.bus.annotation.EventBusC2V;
 
@@ -25,16 +26,20 @@
 import javax.inject.Inject;
 
 class EventRegister {
-    private static class C2VBusHolder {
+    private static class BusHolder {
         @Inject
         @EventBusC2V
         private EventBus eventBusC2V;
 
-        private static C2VBusHolder instance;
+        @Inject
+        @EventBusV2V
+        private EventBus eventBusV2V;
+
+        private static BusHolder instance;
 
-        private static C2VBusHolder getInstance() {
+        private static BusHolder getInstance() {
             if (instance == null) {
-                instance = new C2VBusHolder();
+                instance = new BusHolder();
                 AndroidMvc.graph().inject(instance);
             }
             return instance;
@@ -54,8 +59,8 @@ public EventRegister(Object androidComponent) {
      */
     public void registerEventBuses() {
         if (!eventsRegistered) {
-            C2VBusHolder.getInstance().eventBusC2V.register(androidComponent);
-            AndroidMvc.getEventBusV2V().register(androidComponent);
+            BusHolder.getInstance().eventBusC2V.register(androidComponent);
+            BusHolder.getInstance().eventBusV2V.register(androidComponent);
             eventsRegistered = true;
             logger.trace("+Event bus registered for view - '{}'.",
                     androidComponent.getClass().getSimpleName());
@@ -70,8 +75,8 @@ public void registerEventBuses() {
      */
     public void unregisterEventBuses() {
         if (eventsRegistered) {
-            C2VBusHolder.getInstance().eventBusC2V.unregister(androidComponent);
-            AndroidMvc.getEventBusV2V().unregister(androidComponent);
+            BusHolder.getInstance().eventBusC2V.unregister(androidComponent);
+            BusHolder.getInstance().eventBusV2V.unregister(androidComponent);
             eventsRegistered = false;
             logger.trace("-Event bus unregistered for view - '{}' and its controllers.",
                     androidComponent.getClass().getSimpleName());
@@ -81,4 +86,7 @@ public void unregisterEventBuses() {
         }
     }
 
+    void postEventV2V(BaseEventV2V event) {
+        BusHolder.getInstance().eventBusV2V.post(event);
+    }
 }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java
index 363c15b..4c56425 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java
@@ -66,11 +66,19 @@ public void onDestroy() {
     }
 
     /**
-     * Post an event from this view to other views
-     * @param event The event
+     * Post an event from this view to other views. Using EventBusV2V is a handy way to
+     * inter-communicate among views but it's a little anti pattern. Best practice is that views
+     * communicates to other views through controllers and EventBusC2V. For example, if view1 wants
+     * to talk to view2, instead of sending V2V events, view1 can send a command to a controller and
+     * that controller will fire an C2VEvent that will be received by view2. In this way, more
+     * business logic can be wrapped into controllers rather than exposed to view1.
+     *
+     * <p>However, it's not absolute. If touching a controller is an overkill, sending events
+     * directly through V2V channel is still an option.</p>
+     * @param event
      */
     protected void postEventV2V(BaseEventV2V event) {
-        AndroidMvc.getEventBusV2V().post(event);
+        eventRegister.postEventV2V(event);
     }
 
 }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
index 2a75b73..bfb1ddd 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
@@ -471,10 +471,18 @@ public boolean onBackButtonPressed() {
     }
 
     /**
-     * Post an event from this view to other views
-     * @param event The view to view event
+     * Post an event from this view to other views. Using EventBusV2V is a handy way to
+     * inter-communicate among views but it's a little anti pattern. Best practice is that views
+     * communicates to other views through controllers and EventBusC2V. For example, if view1 wants
+     * to talk to view2, instead of sending V2V events, view1 can send a command to a controller and
+     * that controller will fire an C2VEvent that will be received by view2. In this way, more
+     * business logic can be wrapped into controllers rather than exposed to view1.
+     *
+     * <p>However, it's not absolute. If touching a controller is an overkill, sending events
+     * directly through V2V channel is still an option.</p>
+     * @param event
      */
     protected void postEventV2V(BaseEventV2V event) {
-        AndroidMvc.getEventBusV2V().post(event);
+        eventRegister.postEventV2V(event);
     }
 }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
index 12f0691..5375a01 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
@@ -51,10 +51,18 @@ public void onDestroy() {
     }
 
     /**
-     * Post an event from this view to other views
+     * Post an event from this view to other views. Using EventBusV2V is a handy way to
+     * inter-communicate among views but it's a little anti pattern. Best practice is that views
+     * communicates to other views through controllers and EventBusC2V. For example, if view1 wants
+     * to talk to view2, instead of sending V2V events, view1 can send a command to a controller and
+     * that controller will fire an C2VEvent that will be received by view2. In this way, more
+     * business logic can be wrapped into controllers rather than exposed to view1.
+     *
+     * <p>However, it's not absolute. If touching a controller is an overkill, sending events
+     * directly through V2V channel is still an option.</p>
      * @param event
      */
     protected void postEventV2V(BaseEventV2V event) {
-        AndroidMvc.getEventBusV2V().post(event);
+        eventRegister.postEventV2V(event);
     }
 }

From dfbae49929a26d493d97b5f738ba47d379096e18 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Wed, 21 Oct 2015 16:55:25 +1100
Subject: [PATCH 04/28] Refactor how V2V event bus is injected and add tests
 for it

---
 .../mvc/view/eventv2v/TestV2VEvents.java      | 73 +++++++++++++++++++
 .../src/main/AndroidManifest.xml              |  6 ++
 .../view/eventv2v/EventBusV2VActivity.java    | 63 ++++++++++++++++
 .../eventv2v/EventBusV2VDialogFragment.java   | 50 +++++++++++++
 .../view/eventv2v/EventBusV2VFragment.java    | 71 ++++++++++++++++++
 .../mvc/view/eventv2v/EventBusV2VService.java | 36 +++++++++
 .../lib/android/mvc/view/eventv2v/Events.java | 30 ++++++++
 .../controller/V2VTestController.java         | 23 ++++++
 .../internal/V2VTestControllerImpl.java       | 16 ++++
 .../src/main/res/layout/fragment_mvc_v2v.xml  | 48 ++++++++++++
 .../res/layout/fragment_mvc_v2v_dialog.xml    | 42 +++++++++++
 .../lib/android/mvc/view/EventRegister.java   | 60 +++++++--------
 .../android/mvc/view/MvcDialogFragment.java   | 10 +++
 .../lib/android/mvc/view/MvcFragment.java     |  7 +-
 .../lib/android/mvc/view/MvcService.java      |  2 +
 15 files changed, 503 insertions(+), 34 deletions(-)
 create mode 100644 library/android-mvc-test/src/androidTest/java/com/shipdream/lib/android/mvc/view/eventv2v/TestV2VEvents.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VActivity.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VDialogFragment.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VFragment.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VService.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/Events.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/V2VTestController.java
 create mode 100644 library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/internal/V2VTestControllerImpl.java
 create mode 100644 library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v.xml
 create mode 100644 library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v_dialog.xml

diff --git a/library/android-mvc-test/src/androidTest/java/com/shipdream/lib/android/mvc/view/eventv2v/TestV2VEvents.java b/library/android-mvc-test/src/androidTest/java/com/shipdream/lib/android/mvc/view/eventv2v/TestV2VEvents.java
new file mode 100644
index 0000000..43d81fd
--- /dev/null
+++ b/library/android-mvc-test/src/androidTest/java/com/shipdream/lib/android/mvc/view/eventv2v/TestV2VEvents.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015 Kejun Xia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.shipdream.lib.android.mvc.view.eventv2v;
+
+import com.shipdream.lib.android.mvc.view.BaseTestCase;
+import com.shipdream.lib.android.mvc.view.eventv2v.controller.V2VTestController;
+import com.shipdream.lib.android.mvc.view.test.R;
+
+import org.junit.Test;
+
+import javax.inject.Inject;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+public class TestV2VEvents extends BaseTestCase<EventBusV2VActivity> {
+    @Inject
+    private V2VTestController v2VTestController;
+
+    public TestV2VEvents() {
+        super(EventBusV2VActivity.class);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        waitTest();
+    }
+
+    @Test
+    public void should_be_able_to_send_and_receive_v2v_events_among_fragments_services_and_dialogFragments() throws Throwable {
+        onView(withId(R.id.fragment_mvc_v2v_text)).check(matches(withText("Initial Text")));
+
+        onView(withId(R.id.fragment_mvc_v2v_btnService)).perform(click());
+
+        onView(withId(R.id.fragment_mvc_v2v_text)).check(matches(withText("Updated By Service")));
+
+        onView(withId(R.id.fragment_mvc_v2v_btnDialog)).perform(click());
+
+        onView(withId(R.id.fragment_mvc_v2v_dialog_text)).check(matches(withText("Initial Dialog Text")));
+
+        v2VTestController.updateDialogButton(this, "Updated By Under Fragment via V2V event");
+
+        onView(withId(R.id.fragment_mvc_v2v_dialog_text)).check(matches(withText("Updated By Under Fragment via V2V event")));
+
+        onView(withId(R.id.fragment_mvc_v2v_dialog_button)).perform(click());
+
+        onView(withId(R.id.fragment_mvc_v2v_text)).check(matches(withText("Dialog Closed")));
+    }
+
+}
diff --git a/library/android-mvc-test/src/main/AndroidManifest.xml b/library/android-mvc-test/src/main/AndroidManifest.xml
index a52de66..ae10a4d 100644
--- a/library/android-mvc-test/src/main/AndroidManifest.xml
+++ b/library/android-mvc-test/src/main/AndroidManifest.xml
@@ -45,6 +45,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name="com.shipdream.lib.android.mvc.view.eventv2v.EventBusV2VActivity"
+                  android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+
+        <service android:name="com.shipdream.lib.android.mvc.view.eventv2v.EventBusV2VService"/>
     </application>
 
 </manifest>
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VActivity.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VActivity.java
new file mode 100644
index 0000000..5f75203
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VActivity.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Kejun Xia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.shipdream.lib.android.mvc.view.eventv2v;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.shipdream.lib.android.mvc.view.MvcActivity;
+import com.shipdream.lib.android.mvc.view.MvcFragment;
+
+public class EventBusV2VActivity extends MvcActivity {
+
+    @Override
+    protected Class<? extends MvcFragment> mapNavigationFragment(String locationId) {
+        return EventBusV2VFragment.class;
+    }
+
+    @Override
+    protected Class<? extends DelegateFragment> getDelegateFragmentClass() {
+        return HomeFragment.class;
+    }
+
+    public static class HomeFragment extends DelegateFragment {
+        private boolean onViewStateRestoredCalled = false;
+
+        @Override
+        protected void onStartUp() {
+            getNavigationController().navigateTo(this, "TestFragment", null);
+        }
+
+        @Override
+        public void onViewReady(View view, Bundle savedInstanceState, Reason reason) {
+            super.onViewReady(view, savedInstanceState, reason);
+
+            if (reason.isRestored()) {
+                if (!onViewStateRestoredCalled) {
+                    throw new IllegalStateException("When activity is restoring, onViewReady must be called after onViewStateRestored to guarantee all state of this fragment is ready to use.");
+                }
+            }
+        }
+
+        @Override
+        public void onViewStateRestored(Bundle savedInstanceState) {
+            onViewStateRestoredCalled = true;
+            super.onViewStateRestored(savedInstanceState);
+        }
+    }
+
+}
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VDialogFragment.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VDialogFragment.java
new file mode 100644
index 0000000..ffe20e9
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VDialogFragment.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Kejun Xia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.shipdream.lib.android.mvc.view.eventv2v;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.shipdream.lib.android.mvc.view.MvcDialogFragment;
+import com.shipdream.lib.android.mvc.view.test.R;
+
+public class EventBusV2VDialogFragment extends MvcDialogFragment {
+    private TextView textView;
+    private View button;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_mvc_v2v_dialog, container);
+        textView = (TextView) view.findViewById(R.id.fragment_mvc_v2v_dialog_text);
+        button = view.findViewById(R.id.fragment_mvc_v2v_dialog_button);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                postEventV2V(new Events.OnFragmentTextChanged(v, "Dialog Closed"));
+                dismiss();
+            }
+        });
+        return view;
+    }
+
+    private void onEvent(Events.OnDialogButtonChanged onButtonUpdated) {
+        textView.setText(onButtonUpdated.getText());
+    }
+}
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VFragment.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VFragment.java
new file mode 100644
index 0000000..10a6bad
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VFragment.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015 Kejun Xia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.shipdream.lib.android.mvc.view.eventv2v;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
+import com.shipdream.lib.android.mvc.view.MvcFragment;
+import com.shipdream.lib.android.mvc.view.eventv2v.controller.V2VTestController;
+import com.shipdream.lib.android.mvc.view.test.R;
+
+public class EventBusV2VFragment extends MvcFragment {
+    private TextView textView;
+    private View buttonDialog;
+    private View buttonService;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.fragment_mvc_v2v;
+    }
+
+    @Override
+    public void onViewReady(View view, Bundle savedInstanceState, Reason reason) {
+        super.onViewReady(view, savedInstanceState, reason);
+
+        textView = (TextView) view.findViewById(R.id.fragment_mvc_v2v_text);
+
+        buttonDialog = view.findViewById(R.id.fragment_mvc_v2v_btnDialog);
+        buttonDialog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final EventBusV2VDialogFragment cityDialog = new EventBusV2VDialogFragment();
+                cityDialog.show(getFragmentManager(), "EventBusV2VDialogFragment");
+            }
+        });
+
+        buttonService = view.findViewById(R.id.fragment_mvc_v2v_btnService);
+        buttonService.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), EventBusV2VService.class);
+                getActivity().startService(intent);
+            }
+        });
+    }
+
+    private void onEvent(Events.OnFragmentTextChanged event) {
+        textView.setText(event.getText());
+    }
+
+    private void onEvent(V2VTestController.EventC2V.OnButtonUpdated onButtonUpdated) {
+        postEventV2V(new Events.OnDialogButtonChanged(onButtonUpdated.getSender(), onButtonUpdated.getText()));
+    }
+
+}
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VService.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VService.java
new file mode 100644
index 0000000..e8606fd
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/EventBusV2VService.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Kejun Xia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.shipdream.lib.android.mvc.view.eventv2v;
+
+import android.content.Intent;
+import android.os.IBinder;
+
+import com.shipdream.lib.android.mvc.view.MvcService;
+
+public class EventBusV2VService extends MvcService {
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        super.onStartCommand(intent, flags, startId);
+        postEventV2V(new Events.OnFragmentTextChanged(this, "Updated By Service"));
+        return START_STICKY;
+    }
+}
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/Events.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/Events.java
new file mode 100644
index 0000000..7bee1de
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/Events.java
@@ -0,0 +1,30 @@
+package com.shipdream.lib.android.mvc.view.eventv2v;
+
+import com.shipdream.lib.android.mvc.event.BaseEventV2V;
+
+public interface Events {
+    abstract class OnTextChanged extends BaseEventV2V {
+        private final String text;
+        protected OnTextChanged(Object sender, String text) {
+            super(sender);
+            this.text = text;
+        }
+
+        public String getText() {
+            return text;
+        }
+    }
+
+    class OnFragmentTextChanged extends OnTextChanged {
+        protected OnFragmentTextChanged(Object sender, String text) {
+            super(sender, text);
+        }
+    }
+
+    class OnDialogButtonChanged extends OnTextChanged {
+        protected OnDialogButtonChanged(Object sender, String text) {
+            super(sender, text);
+        }
+    }
+
+}
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/V2VTestController.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/V2VTestController.java
new file mode 100644
index 0000000..bb2cdb5
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/V2VTestController.java
@@ -0,0 +1,23 @@
+package com.shipdream.lib.android.mvc.view.eventv2v.controller;
+
+import com.shipdream.lib.android.mvc.controller.BaseController;
+import com.shipdream.lib.android.mvc.event.BaseEventC2V;
+
+public interface V2VTestController extends BaseController {
+    void updateDialogButton(Object sender, String text);
+
+    interface EventC2V {
+        class OnButtonUpdated extends BaseEventC2V {
+            private final String text;
+
+            public OnButtonUpdated(Object sender, String text) {
+                super(sender);
+                this.text = text;
+            }
+
+            public String getText() {
+                return text;
+            }
+        }
+    }
+}
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/internal/V2VTestControllerImpl.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/internal/V2VTestControllerImpl.java
new file mode 100644
index 0000000..21d4719
--- /dev/null
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/eventv2v/controller/internal/V2VTestControllerImpl.java
@@ -0,0 +1,16 @@
+package com.shipdream.lib.android.mvc.view.eventv2v.controller.internal;
+
+import com.shipdream.lib.android.mvc.controller.internal.BaseControllerImpl;
+import com.shipdream.lib.android.mvc.view.eventv2v.controller.V2VTestController;
+
+public class V2VTestControllerImpl extends BaseControllerImpl implements V2VTestController{
+    @Override
+    protected Class getModelClassType() {
+        return null;
+    }
+
+    @Override
+    public void updateDialogButton(Object sender, String text) {
+        postC2VEvent(new EventC2V.OnButtonUpdated(sender, text));
+    }
+}
diff --git a/library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v.xml b/library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v.xml
new file mode 100644
index 0000000..ed1dc31
--- /dev/null
+++ b/library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Kejun Xia
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/fragment_mvc_v2v_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Initial Text"/>
+
+        <Button
+            android:id="@+id/fragment_mvc_v2v_btnDialog"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Start Dialog"/>
+
+        <Button
+            android:id="@+id/fragment_mvc_v2v_btnService"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Start Service"/>
+
+    </LinearLayout>
+
+</ScrollView>
+
diff --git a/library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v_dialog.xml b/library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v_dialog.xml
new file mode 100644
index 0000000..ea9f274
--- /dev/null
+++ b/library/android-mvc-test/src/main/res/layout/fragment_mvc_v2v_dialog.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Kejun Xia
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/fragment_mvc_v2v_dialog_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Initial Dialog Text"/>
+
+        <TextView
+            android:id="@+id/fragment_mvc_v2v_dialog_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Update Under fragment"/>
+
+    </LinearLayout>
+
+</ScrollView>
+
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
index dad1169..3407c8d 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/EventRegister.java
@@ -26,67 +26,63 @@
 import javax.inject.Inject;
 
 class EventRegister {
-    private static class BusHolder {
-        @Inject
-        @EventBusC2V
-        private EventBus eventBusC2V;
+    @Inject
+    @EventBusC2V
+    private EventBus eventBusC2V;
 
-        @Inject
-        @EventBusV2V
-        private EventBus eventBusV2V;
-
-        private static BusHolder instance;
-
-        private static BusHolder getInstance() {
-            if (instance == null) {
-                instance = new BusHolder();
-                AndroidMvc.graph().inject(instance);
-            }
-            return instance;
-        }
-    }
+    @Inject
+    @EventBusV2V
+    private EventBus eventBusV2V;
 
     private Logger logger = LoggerFactory.getLogger(getClass());
     private Object androidComponent;
     private boolean eventsRegistered = false;
 
-    public EventRegister(Object androidComponent) {
+    EventRegister(Object androidComponent) {
         this.androidComponent = androidComponent;
     }
 
     /**
-     * Register c2v and v2v event buses. This method should be called on view's onCreate life cycle callback.
+     * Register c2v and v2v event buses.
      */
-    public void registerEventBuses() {
+    void registerEventBuses() {
         if (!eventsRegistered) {
-            BusHolder.getInstance().eventBusC2V.register(androidComponent);
-            BusHolder.getInstance().eventBusV2V.register(androidComponent);
+            eventBusC2V.register(androidComponent);
+            eventBusV2V.register(androidComponent);
             eventsRegistered = true;
-            logger.trace("+Event bus registered for view - '{}'.",
+            logger.debug("+Event bus registered for view - '{}'.",
                     androidComponent.getClass().getSimpleName());
         } else {
-            logger.trace("!Event bus already registered for view - '{}' and its controllers.",
+            logger.debug("!Event bus already registered for view - '{}' and its controllers.",
                     androidComponent.getClass().getSimpleName());
         }
     }
 
     /**
-     * Unregister c2v and v2v event buses. This method should be called on view's onDestroy life cycle callback.
+     * Unregister c2v and v2v event buses.
      */
-    public void unregisterEventBuses() {
+    void unregisterEventBuses() {
         if (eventsRegistered) {
-            BusHolder.getInstance().eventBusC2V.unregister(androidComponent);
-            BusHolder.getInstance().eventBusV2V.unregister(androidComponent);
+            eventBusC2V.unregister(androidComponent);
+            eventBusV2V.unregister(androidComponent);
             eventsRegistered = false;
-            logger.trace("-Event bus unregistered for view - '{}' and its controllers.",
+            logger.debug("-Event bus unregistered for view - '{}' and its controllers.",
                     androidComponent.getClass().getSimpleName());
         } else {
-            logger.trace("!Event bus already unregistered for view - '{}'.",
+            logger.debug("!Event bus already unregistered for view - '{}'.",
                     androidComponent.getClass().getSimpleName());
         }
     }
 
+    void onCreate() {
+        AndroidMvc.graph().inject(this);
+    }
+
+    void onDestroy() {
+        AndroidMvc.graph().release(this);
+    }
+
     void postEventV2V(BaseEventV2V event) {
-        BusHolder.getInstance().eventBusV2V.post(event);
+        eventBusV2V.post(event);
     }
 }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java
index 4c56425..2099100 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcDialogFragment.java
@@ -19,6 +19,7 @@
 import android.app.AlertDialog;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
+import android.view.View;
 
 import com.shipdream.lib.android.mvc.event.BaseEventV2V;
 
@@ -43,6 +44,13 @@ public void onCreate(Bundle savedInstanceState) {
         AndroidMvc.graph().inject(this);
 
         eventRegister = new EventRegister(this);
+        eventRegister.onCreate();
+        eventRegister.registerEventBuses();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         eventRegister.registerEventBuses();
     }
 
@@ -56,12 +64,14 @@ public void onDestroyView() {
         }
         //============================================
         super.onDestroyView();
+        eventRegister.unregisterEventBuses();
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         eventRegister.unregisterEventBuses();
+        eventRegister.onDestroy();
         AndroidMvc.graph().release(this);
     }
 
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
index bfb1ddd..9a5f3fa 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
@@ -214,6 +214,9 @@ void releaseDependencies() {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        eventRegister = new EventRegister(this);
+        eventRegister.onCreate();
+
         if(savedInstanceState == null) {
             lastOrientation = getResources().getConfiguration().orientation;
         } else {
@@ -258,7 +261,6 @@ final public View onCreateView(LayoutInflater inflater, ViewGroup container, Bun
     @Override
     final public void onViewCreated(final View view, final Bundle savedInstanceState) {
         fragmentComesBackFromBackground = false;
-        eventRegister = new EventRegister(this);
         eventRegister.registerEventBuses();
 
         final boolean restoring = savedInstanceState != null;
@@ -394,7 +396,6 @@ public void onPause() {
     public void onDestroyView() {
         super.onDestroyView();
         eventRegister.unregisterEventBuses();
-        eventRegister = null;
     }
 
     /**
@@ -409,6 +410,8 @@ public void onDestroyView() {
     public void onDestroy() {
         super.onDestroy();
         releaseDependencies();
+        eventRegister.onDestroy();
+        eventRegister = null;
     }
 
     @Override
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
index 5375a01..ecc1026 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcService.java
@@ -37,6 +37,7 @@ public void onCreate() {
         AndroidMvc.graph().inject(this);
 
         eventRegister = new EventRegister(this);
+        eventRegister.onCreate();
         eventRegister.registerEventBuses();
     }
 
@@ -47,6 +48,7 @@ public void onCreate() {
     public void onDestroy() {
         super.onDestroy();
         eventRegister.unregisterEventBuses();
+        eventRegister.onDestroy();
         AndroidMvc.graph().release(this);
     }
 

From fd58da0a44052eb58365966fb23c8cd94dd07e04 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Wed, 21 Oct 2015 00:14:33 +1100
Subject: [PATCH 05/28] Make AndroidMvc class lighter

---
 .../lib/android/mvc/view/AndroidMvc.java      | 180 +-----------------
 .../android/mvc/view/DefaultStateKeeper.java  | 129 +++++++++++++
 .../mvc/view/DefaultStateKeeperHolder.java    |  68 +++++++
 .../lib/android/mvc/view/MvcActivity.java     |  11 +-
 .../lib/android/mvc/view/MvcFragment.java     |   6 +-
 5 files changed, 207 insertions(+), 187 deletions(-)
 create mode 100644 library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeper.java
 create mode 100644 library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeperHolder.java

diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
index 1f87e9e..d7d15b7 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/AndroidMvc.java
@@ -16,29 +16,17 @@
 
 package com.shipdream.lib.android.mvc.view;
 
-import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
 import com.shipdream.lib.android.mvc.Injector;
 import com.shipdream.lib.android.mvc.MvcGraph;
-import com.shipdream.lib.android.mvc.StateKeeper;
-import com.shipdream.lib.android.mvc.StateManaged;
-import com.shipdream.lib.android.mvc.controller.BaseController;
-import com.shipdream.lib.android.mvc.controller.NavigationController;
 import com.shipdream.lib.android.mvc.controller.internal.AndroidPosterImpl;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
 import com.shipdream.lib.android.mvc.event.bus.internal.EventBusImpl;
 import com.shipdream.lib.poke.Component;
 import com.shipdream.lib.poke.Provides;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -54,10 +42,6 @@
  * {@link MvcGraph} how it works.
  */
 public class AndroidMvc {
-    static final String MVC_SATE_PREFIX = "__--AndroidMvc:State:";
-    static final String FRAGMENT_TAG_PREFIX = "__--AndroidMvc:Fragment:";
-    private static DefaultStateKeeper sStateManager;
-
     private static class DefaultControllerDependencies extends MvcGraph.BaseDependencies {
         private static ExecutorService sNetworkExecutorService;
         private final static String BACKGROUND_THREAD_NAME = "AndroidMvcDefaultBackgroundThread";
@@ -94,7 +78,6 @@ public EventBus providesIEventBusC2V() {
     static {
         Injector.configGraph(new DefaultControllerDependencies());
         Injector.getGraph().register(new ViewComponent());
-        sStateManager = new DefaultStateKeeper();
 
         AndroidPosterImpl.init();
     }
@@ -110,54 +93,6 @@ public static MvcGraph graph() {
         return Injector.getGraph();
     }
 
-    static void saveStateOfAllControllers(Bundle outState) {
-        sStateManager.bundle = outState;
-        Injector.getGraph().saveAllStates(sStateManager);
-        sStateManager.bundle = null;
-    }
-
-    static void restoreStateOfAllControllers(Bundle savedState) {
-        sStateManager.bundle = savedState;
-        Injector.getGraph().restoreAllStates(sStateManager);
-        sStateManager.bundle = null;
-    }
-
-    static void saveControllerStateOfTheirOwn(Bundle outState, Object object) {
-        Field[] fields = object.getClass().getDeclaredFields();
-        sStateManager.bundle = outState;
-        for (int i = 0; i < fields.length; i++) {
-            Field field = fields[i];
-            if (BaseController.class.isAssignableFrom(field.getType())) {
-                StateManaged stateManaged = null;
-                try {
-                    field.setAccessible(true);
-                    stateManaged = (StateManaged) field.get(object);
-                } catch (IllegalAccessException e) {
-                    //ignore
-                }
-                sStateManager.saveState(stateManaged.getState(), stateManaged.getStateType());
-            }
-        }
-    }
-
-    static void restoreControllerStateByTheirOwn(Bundle savedState, Object object) {
-        Field[] fields = object.getClass().getDeclaredFields();
-        sStateManager.bundle = savedState;
-        for (int i = 0; i < fields.length; i++) {
-            Field field = fields[i];
-            if (BaseController.class.isAssignableFrom(field.getType())) {
-                try {
-                    field.setAccessible(true);
-                    StateManaged stateManaged = (StateManaged) field.get(object);
-                    Object value = sStateManager.getState(stateManaged.getStateType());
-                    stateManaged.restoreState(value);
-                } catch (IllegalAccessException e) {
-                    //ignore
-                }
-            }
-        }
-    }
-
     /**
      * Set the custom state keeper for the objects that are wanted to be saved and restored by it.
      * Other objects will still be saved and restored by json serialization.
@@ -167,120 +102,7 @@ static void restoreControllerStateByTheirOwn(Bundle savedState, Object object) {
      *                          {@link AndroidStateKeeper#getState(Parcelable, Class)}
      */
     public static void setCustomStateKeeper(AndroidStateKeeper customStateKeeper) {
-        sStateManager.customStateKeeper = customStateKeeper;
+        DefaultStateKeeperHolder.stateKeeper.customStateKeeper = customStateKeeper;
     }
 
-    private static class DefaultStateKeeper implements StateKeeper {
-        private static Gson gson;
-        private Bundle bundle;
-        private Logger logger = LoggerFactory.getLogger(getClass());
-        private AndroidStateKeeper navigationModelKeeper = new NavigationModelKeeper();
-        private AndroidStateKeeper customStateKeeper;
-
-        private DefaultStateKeeper() {
-            gson = new GsonBuilder().create();
-        }
-
-        private static String getStateKey(String stateTypeName) {
-            return MVC_SATE_PREFIX + stateTypeName;
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public <T> void saveState(T state, Class<T> type) {
-            if (type != null) {
-                Parcelable parcelable = null;
-
-                if (NavigationController.Model.class == type) {
-                    //Use navigation model keeper to save state
-                    parcelable = navigationModelKeeper.saveState(state, type);
-                } else {
-                    if (customStateKeeper != null) {
-                        //Use customs state manager to restore state
-                        parcelable = customStateKeeper.saveState(state, type);
-                    }
-                }
-
-                long ts = System.currentTimeMillis();
-                if (parcelable != null) {
-                    String stateKey = getStateKey(type.getName());
-                    bundle.putParcelable(stateKey, parcelable);
-                    logger.trace("Save state by parcel state keeper - {}, {}ms used.",
-                            type.getName(), System.currentTimeMillis() - ts);
-                } else {
-                    //Use Gson to restore state
-                    String stateKey = getStateKey(type.getName());
-                    String json = gson.toJson(state);
-                    bundle.putString(stateKey, json);
-
-                    logger.trace("Save state by JSON - {}, {}ms used. Content: {}",
-                            type.getName(), System.currentTimeMillis() - ts, json);
-                }
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public <T> T getState(Class<T> type) {
-            T state = null;
-            if (type != null) {
-                long ts = System.currentTimeMillis();
-                String stateKey = getStateKey(type.getName());
-                Object value = bundle.get(stateKey);
-                Parcelable parcelable = null;
-                if (value instanceof Parcelable) {
-                    parcelable = (Parcelable) value;
-                }
-                if (NavigationController.Model.class == type) {
-                    //Use navigation model keeper to restore state
-                    state = (T) navigationModelKeeper.getState(parcelable, type);
-                    logger.trace("Restore state by parcel state keeper - {}, {}ms used.",
-                            type.getName(), System.currentTimeMillis() - ts);
-                } else {
-                    //Use custom state keeper or gson state keeper to restore state.
-                    if (customStateKeeper != null) {
-                        if (parcelable != null) {
-                            //Use custom state manager to restore state
-                            state = (T) customStateKeeper.getState(parcelable, type);
-                            logger.trace("Restore state by parcel state keeper - {}, {}ms used.",
-                                    type.getName(), System.currentTimeMillis() - ts);
-                        }
-                    }
-                    if (state == null) {
-                        //State is not restored successfully by custom state keeper nor navigation
-                        //model keeper. So try to use Gson to restore state
-                        state = deserialize(bundle, type);
-                    }
-                }
-
-                if (state == null) {
-                    throw new IllegalStateException("Can't find restore state for " + type.getName());
-                }
-            }
-            return state;
-        }
-
-        private <T> T deserialize(Bundle outState, Class<T> type) {
-            T state;
-            long ts = System.currentTimeMillis();
-
-            String stateKey = getStateKey(type.getName());
-            String json = outState.getString(stateKey);
-            try {
-                //recover the model
-                state = gson.fromJson(json, type);
-                //rebind the model to the controller
-            } catch (JsonSyntaxException exception) {
-                String errorMessage = String.format(
-                        "Failed to restore state(%s) by json deserialization", type.getName());
-                throw new RuntimeException(errorMessage, exception);
-            }
-
-            logger.trace("Restore state by JSON - {}, {}ms used.",
-                    type.getName(), System.currentTimeMillis() - ts);
-
-            return state;
-        }
-
-    }
 }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeper.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeper.java
new file mode 100644
index 0000000..59a6606
--- /dev/null
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeper.java
@@ -0,0 +1,129 @@
+package com.shipdream.lib.android.mvc.view;
+
+import android.os.Bundle;
+import android.os.Parcelable;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import com.shipdream.lib.android.mvc.StateKeeper;
+import com.shipdream.lib.android.mvc.controller.NavigationController;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class DefaultStateKeeper implements StateKeeper {
+    static final String MVC_SATE_PREFIX = "__--AndroidMvc:State:";
+
+    private static Gson gson;
+    private Logger logger = LoggerFactory.getLogger(getClass());
+    private AndroidStateKeeper navigationModelKeeper = new NavigationModelKeeper();
+    AndroidStateKeeper customStateKeeper;
+    Bundle bundle;
+
+    DefaultStateKeeper() {
+        gson = new GsonBuilder().create();
+    }
+
+    private static String getStateKey(String stateTypeName) {
+        return MVC_SATE_PREFIX + stateTypeName;
+    }
+
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> void saveState(T state, Class<T> type) {
+        if (type != null) {
+            Parcelable parcelable = null;
+
+            if (NavigationController.Model.class == type) {
+                //Use navigation model keeper to save state
+                parcelable = navigationModelKeeper.saveState(state, type);
+            } else {
+                if (customStateKeeper != null) {
+                    //Use customs state manager to restore state
+                    parcelable = customStateKeeper.saveState(state, type);
+                }
+            }
+
+            long ts = System.currentTimeMillis();
+            if (parcelable != null) {
+                String stateKey = getStateKey(type.getName());
+                bundle.putParcelable(stateKey, parcelable);
+                logger.trace("Save state by parcel state keeper - {}, {}ms used.",
+                        type.getName(), System.currentTimeMillis() - ts);
+            } else {
+                //Use Gson to restore state
+                String stateKey = getStateKey(type.getName());
+                String json = gson.toJson(state);
+                bundle.putString(stateKey, json);
+
+                logger.trace("Save state by JSON - {}, {}ms used. Content: {}",
+                        type.getName(), System.currentTimeMillis() - ts, json);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T getState(Class<T> type) {
+        T state = null;
+        if (type != null) {
+            long ts = System.currentTimeMillis();
+            String stateKey = getStateKey(type.getName());
+            Object value = bundle.get(stateKey);
+            Parcelable parcelable = null;
+            if (value instanceof Parcelable) {
+                parcelable = (Parcelable) value;
+            }
+            if (NavigationController.Model.class == type) {
+                //Use navigation model keeper to restore state
+                state = (T) navigationModelKeeper.getState(parcelable, type);
+                logger.trace("Restore state by parcel state keeper - {}, {}ms used.",
+                        type.getName(), System.currentTimeMillis() - ts);
+            } else {
+                //Use custom state keeper or gson state keeper to restore state.
+                if (customStateKeeper != null) {
+                    if (parcelable != null) {
+                        //Use custom state manager to restore state
+                        state = (T) customStateKeeper.getState(parcelable, type);
+                        logger.trace("Restore state by parcel state keeper - {}, {}ms used.",
+                                type.getName(), System.currentTimeMillis() - ts);
+                    }
+                }
+                if (state == null) {
+                    //State is not restored successfully by custom state keeper nor navigation
+                    //model keeper. So try to use Gson to restore state
+                    state = deserialize(bundle, type);
+                }
+            }
+
+            if (state == null) {
+                throw new IllegalStateException("Can't find restore state for " + type.getName());
+            }
+        }
+        return state;
+    }
+
+    private <T> T deserialize(Bundle outState, Class<T> type) {
+        T state;
+        long ts = System.currentTimeMillis();
+
+        String stateKey = getStateKey(type.getName());
+        String json = outState.getString(stateKey);
+        try {
+            //recover the model
+            state = gson.fromJson(json, type);
+            //rebind the model to the controller
+        } catch (JsonSyntaxException exception) {
+            String errorMessage = String.format(
+                    "Failed to restore state(%s) by json deserialization", type.getName());
+            throw new RuntimeException(errorMessage, exception);
+        }
+
+        logger.trace("Restore state by JSON - {}, {}ms used.",
+                type.getName(), System.currentTimeMillis() - ts);
+
+        return state;
+    }
+}
\ No newline at end of file
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeperHolder.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeperHolder.java
new file mode 100644
index 0000000..e239e29
--- /dev/null
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/DefaultStateKeeperHolder.java
@@ -0,0 +1,68 @@
+package com.shipdream.lib.android.mvc.view;
+
+import android.os.Bundle;
+
+import com.shipdream.lib.android.mvc.Injector;
+import com.shipdream.lib.android.mvc.StateManaged;
+import com.shipdream.lib.android.mvc.controller.BaseController;
+
+import java.lang.reflect.Field;
+
+/**
+ * This class holds a stateKeeper as a singleton.
+ */
+class DefaultStateKeeperHolder {
+    static DefaultStateKeeper stateKeeper;
+
+    static {
+        stateKeeper = new DefaultStateKeeper();
+    }
+
+    static void saveStateOfAllControllers(Bundle outState) {
+        stateKeeper.bundle = outState;
+        Injector.getGraph().saveAllStates(stateKeeper);
+        stateKeeper.bundle = null;
+    }
+
+    static void restoreStateOfAllControllers(Bundle savedState) {
+        stateKeeper.bundle = savedState;
+        Injector.getGraph().restoreAllStates(stateKeeper);
+        stateKeeper.bundle = null;
+    }
+
+    static void saveControllerStateOfTheirOwn(Bundle outState, Object object) {
+        Field[] fields = object.getClass().getDeclaredFields();
+        stateKeeper.bundle = outState;
+        for (int i = 0; i < fields.length; i++) {
+            Field field = fields[i];
+            if (BaseController.class.isAssignableFrom(field.getType())) {
+                StateManaged stateManaged = null;
+                try {
+                    field.setAccessible(true);
+                    stateManaged = (StateManaged) field.get(object);
+                } catch (IllegalAccessException e) {
+                    //ignore
+                }
+                stateKeeper.saveState(stateManaged.getState(), stateManaged.getStateType());
+            }
+        }
+    }
+
+    static void restoreControllerStateByTheirOwn(Bundle savedState, Object object) {
+        Field[] fields = object.getClass().getDeclaredFields();
+        stateKeeper.bundle = savedState;
+        for (int i = 0; i < fields.length; i++) {
+            Field field = fields[i];
+            if (BaseController.class.isAssignableFrom(field.getType())) {
+                try {
+                    field.setAccessible(true);
+                    StateManaged stateManaged = (StateManaged) field.get(object);
+                    Object value = stateKeeper.getState(stateManaged.getStateType());
+                    stateManaged.restoreState(value);
+                } catch (IllegalAccessException e) {
+                    //ignore
+                }
+            }
+        }
+    }
+}
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java
index af3b0f7..53ab562 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java
@@ -39,10 +39,11 @@
 import javax.inject.Inject;
 
 public abstract class MvcActivity extends AppCompatActivity {
+    private static final String FRAGMENT_TAG_PREFIX = "__--AndroidMvc:Fragment:";
     private DelegateFragment delegateFragment;
 
     String getDelegateFragmentTag() {
-        return AndroidMvc.FRAGMENT_TAG_PREFIX + getDelegateFragmentClass().getName();
+        return FRAGMENT_TAG_PREFIX + getDelegateFragmentClass().getName();
     }
 
     @SuppressWarnings("unchecked")
@@ -109,7 +110,7 @@ void addPendingOnViewReadyActions(Runnable runnable) {
      * injected into any fragments extending {@link MvcFragment} by fields annotated by @Inject.
      */
     public static abstract class DelegateFragment extends MvcFragment {
-        private static final String MVC_STATE_BUNDLE_KEY = AndroidMvc.MVC_SATE_PREFIX + "RootBundle";
+        private static final String MVC_STATE_BUNDLE_KEY = DefaultStateKeeper.MVC_SATE_PREFIX + "RootBundle";
         private Logger logger = LoggerFactory.getLogger(getClass());
         //Track if the state is saved and not able to commit fragment transaction
         private boolean canCommitFragmentTransaction = false;
@@ -242,7 +243,7 @@ public boolean onBackButtonPressed() {
         }
 
         private String getFragmentTag(String locationId) {
-            return AndroidMvc.FRAGMENT_TAG_PREFIX + locationId;
+            return FRAGMENT_TAG_PREFIX + locationId;
         }
 
         @Override
@@ -257,7 +258,7 @@ public void onCreate(Bundle savedInstanceState) {
 
                 Bundle mvcOutState = savedInstanceState.getBundle(MVC_STATE_BUNDLE_KEY);
                 long ts = System.currentTimeMillis();
-                AndroidMvc.restoreStateOfAllControllers(mvcOutState);
+                DefaultStateKeeperHolder.restoreStateOfAllControllers(mvcOutState);
                 logger.trace("Restored state of all active controllers, {}ms used.", System.currentTimeMillis() - ts);
             }
         }
@@ -333,7 +334,7 @@ public void onSaveInstanceState(Bundle outState) {
 
             long ts = System.currentTimeMillis();
             Bundle mvcOutState = new Bundle();
-            AndroidMvc.saveStateOfAllControllers(mvcOutState);
+            DefaultStateKeeperHolder.saveStateOfAllControllers(mvcOutState);
             outState.putBundle(MVC_STATE_BUNDLE_KEY, mvcOutState);
             logger.trace("Save state of all active controllers, {}ms used.", System.currentTimeMillis() - ts);
         }
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
index 9a5f3fa..6296184 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
@@ -156,7 +156,7 @@ public String toString() {
         }
     }
 
-    private final static String STATE_LAST_ORIENTATION = AndroidMvc.MVC_SATE_PREFIX + "LastOrientation--__";
+    private final static String STATE_LAST_ORIENTATION = DefaultStateKeeper.MVC_SATE_PREFIX + "LastOrientation--__";
     private EventRegister eventRegister;
     private CopyOnWriteArrayList<Runnable> onViewReadyListeners;
     private boolean fragmentComesBackFromBackground = false;
@@ -229,7 +229,7 @@ public void onCreate(Bundle savedInstanceState) {
         injectDependencies();
 
         if (savedInstanceState != null && !isStateManagedByRootDelegateFragment) {
-            AndroidMvc.restoreControllerStateByTheirOwn(savedInstanceState, this);
+            DefaultStateKeeperHolder.restoreControllerStateByTheirOwn(savedInstanceState, this);
         }
     }
 
@@ -420,7 +420,7 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putInt(STATE_LAST_ORIENTATION, lastOrientation);
 
         if (!isStateManagedByRootDelegateFragment) {
-            AndroidMvc.saveControllerStateOfTheirOwn(outState, this);
+            DefaultStateKeeperHolder.saveControllerStateOfTheirOwn(outState, this);
         }
     }
 

From 5a4d4c89f902ea3653baf2537abe7dba59229677 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Fri, 23 Oct 2015 00:24:17 +1100
Subject: [PATCH 06/28] Add use method in graph to use an injectable instance
 easier

---
 .../shipdream/lib/android/mvc/MvcGraph.java   |  25 +----
 .../java/com/shipdream/lib/poke/Consumer.java |   5 +
 .../java/com/shipdream/lib/poke/Graph.java    |  65 ++++++-----
 .../java/com/shipdream/lib/poke/Provider.java |  28 ++++-
 .../lib/poke/TestInjectionReferenceCount.java |  35 ------
 .../lib/poke/TestInjectionWithQualifier.java  | 104 +++++++++++++++++-
 6 files changed, 180 insertions(+), 82 deletions(-)
 create mode 100644 library/poke/src/main/java/com/shipdream/lib/poke/Consumer.java

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
index 114b8cf..827e063 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
@@ -24,21 +24,23 @@
 import com.shipdream.lib.android.mvc.event.bus.annotation.EventBusC2V;
 import com.shipdream.lib.android.mvc.event.bus.internal.EventBusImpl;
 import com.shipdream.lib.poke.Component;
+import com.shipdream.lib.poke.Consumer;
 import com.shipdream.lib.poke.Graph;
 import com.shipdream.lib.poke.ImplClassLocator;
 import com.shipdream.lib.poke.ImplClassLocatorByPattern;
 import com.shipdream.lib.poke.ImplClassNotFoundException;
 import com.shipdream.lib.poke.Provider;
+import com.shipdream.lib.poke.Provider.OnFreedListener;
 import com.shipdream.lib.poke.ProviderByClassType;
 import com.shipdream.lib.poke.ProviderFinderByRegistry;
 import com.shipdream.lib.poke.Provides;
 import com.shipdream.lib.poke.ScopeCache;
 import com.shipdream.lib.poke.SimpleGraph;
 import com.shipdream.lib.poke.exception.CircularDependenciesException;
+import com.shipdream.lib.poke.exception.PokeException;
 import com.shipdream.lib.poke.exception.ProvideException;
 import com.shipdream.lib.poke.exception.ProviderConflictException;
 import com.shipdream.lib.poke.exception.ProviderMissingException;
-import com.shipdream.lib.poke.Provider.OnFreedListener;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -171,25 +173,10 @@ public void clearOnProviderFreedListeners() {
         graph.clearOnProviderFreedListeners();
     }
 
-    /**
-     * Get an instance matching the type and qualifier. If there is an instance cached, the cached
-     * instance will be returned otherwise a new instance will be created.
-     *
-     * <p>Note that, not like {@link #inject(Object)} (Object)} this method will <b>NOT</b> increment
-     * reference count for the injectable object with the same type and qualifier.</p>
-     * @param type the type of the object
-     * @param qualifier the qualifier of the injected object. Null is allowed if no qualifier is specified
-     * @return The cached object or a new instance matching the type and qualifier
-     * @throws MvcGraphException throw if exception occurs during getting the instance
-     */
-    public <T> T get(Class<T> type, Annotation qualifier) {
+    public <T> void use(Class<T> type, Annotation qualifier, Consumer<T> consumer) {
         try {
-            return graph.get(type, qualifier, Inject.class);
-        } catch (ProviderMissingException e) {
-            throw new MvcGraphException(e.getMessage(), e);
-        } catch (ProvideException e) {
-            throw new MvcGraphException(e.getMessage(), e);
-        } catch (CircularDependenciesException e) {
+            graph.use(type, qualifier, Inject.class, consumer);
+        } catch (PokeException e) {
             throw new MvcGraphException(e.getMessage(), e);
         }
     }
diff --git a/library/poke/src/main/java/com/shipdream/lib/poke/Consumer.java b/library/poke/src/main/java/com/shipdream/lib/poke/Consumer.java
new file mode 100644
index 0000000..3e7c4c4
--- /dev/null
+++ b/library/poke/src/main/java/com/shipdream/lib/poke/Consumer.java
@@ -0,0 +1,5 @@
+package com.shipdream.lib.poke;
+
+public abstract class Consumer <T> {
+    public abstract void consume(T instance);
+}
diff --git a/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java b/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
index 8301617..d9ac275 100644
--- a/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
+++ b/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
@@ -157,32 +157,43 @@ public void inject(Object target, Class<? extends Annotation> injectAnnotation)
         visitedFields.clear();
     }
 
+    public <T> void use(Class<T> type, Class<? extends Annotation> injectAnnotation, Consumer<T> consumer)
+            throws ProvideException, CircularDependenciesException, ProviderMissingException {
+        use(type, null, injectAnnotation, consumer);
+    }
+
     /**
-     * Get an instance matching the type and qualifier. If there is an instance cached, the cached
-     * instance will be returned otherwise a new instance will be created.
      *
-     * <p>Note that, not like {@link #inject(Object, Class)} this method will <b>NOT</b> increment
-     * reference count for the injectable object with the same type and qualifier.</p>
-     * @param type the type of the object
-     * @param qualifier the qualifier of the injected object. Null is allowed if no qualifier is specified
-     * @return The cached object or a new instance matching the type and qualifier
-     * @throws ProviderMissingException throw if the provider matching the requiredType and qualifier is not found
-     * @throws ProvideException throw when failed to create a new instance
-     * @throws CircularDependenciesException throw when circular dependency found during injecting the newly created instance
+     * @param type
+     * @param qualifier
+     * @param injectAnnotation
+     * @param consumer
+     * @param <T>
+     * @throws ProvideException
+     * @throws CircularDependenciesException
+     * @throws ProviderMissingException
      */
-    public <T> T get(Class<T> type, Annotation qualifier, Class<? extends Annotation> injectAnnotation)
-            throws ProviderMissingException, ProvideException, CircularDependenciesException {
+    public <T> void use(Class<T> type, Annotation qualifier,
+                        Class<? extends Annotation> injectAnnotation, Consumer<T> consumer)
+            throws ProvideException, CircularDependenciesException, ProviderMissingException {
+        T instance;
+
         Provider<T> provider = getProvider(type, qualifier);
         T cachedInstance = provider.findCachedInstance();
         if (cachedInstance != null) {
-            return cachedInstance;
+            instance = cachedInstance;
         } else {
-            T newInstance = provider.createInstance();
+            T newInstance = provider.get();
 
             doInject(newInstance, null, null, injectAnnotation, false);
 
-            return newInstance;
+            instance = newInstance;
         }
+
+        provider.retain();
+        consumer.consume(instance);
+        provider.release();
+        checkToFreeProvider(provider);
     }
 
     @SuppressWarnings("unchecked")
@@ -301,16 +312,7 @@ private void doRelease(Object target, Class targetType, Annotation targetQualifi
 
                                 provider.release(target, field);
 
-                                if (provider.totalReference() == 0) {
-                                    if (onProviderFreedListeners != null) {
-                                        int listenerSize = onProviderFreedListeners.size();
-                                        for (int k = 0; k < listenerSize; k++) {
-                                            onProviderFreedListeners.get(k).onFreed(provider);
-                                        }
-                                    }
-
-                                    provider.freeCache();
-                                }
+                                checkToFreeProvider(provider);
                             }
                         }
                     }
@@ -324,6 +326,19 @@ private void doRelease(Object target, Class targetType, Annotation targetQualifi
         }
     }
 
+    private void checkToFreeProvider(Provider provider) {
+        if (provider.totalReference() == 0) {
+            if (onProviderFreedListeners != null) {
+                int listenerSize = onProviderFreedListeners.size();
+                for (int k = 0; k < listenerSize; k++) {
+                    onProviderFreedListeners.get(k).onFreed(provider);
+                }
+            }
+
+            provider.freeCache();
+        }
+    }
+
     private void recordVisitField(Object object, Field field) {
         Set<String> fields = visitedFields.get(object);
         if(fields == null) {
diff --git a/library/poke/src/main/java/com/shipdream/lib/poke/Provider.java b/library/poke/src/main/java/com/shipdream/lib/poke/Provider.java
index ab19571..613d1c7 100644
--- a/library/poke/src/main/java/com/shipdream/lib/poke/Provider.java
+++ b/library/poke/src/main/java/com/shipdream/lib/poke/Provider.java
@@ -76,8 +76,20 @@ int getReferenceCount(Object owner, Field field) {
         return 0;
     }
 
-    void retain(Object owner, Field field) {
+    /**
+     * Increase reference count.
+     */
+    void retain() {
         totalRefCount++;
+    }
+
+    /**
+     * Retain an instance injected as a field of an object
+     * @param owner The owner of the field
+     * @param field The field
+     */
+    void retain(Object owner, Field field) {
+        retain();
         Map<String, Integer> fields = owners.get(owner);
         if (fields == null) {
             fields = new HashMap<>();
@@ -93,10 +105,22 @@ void retain(Object owner, Field field) {
         }
     }
 
+    /**
+     * Decrease reference count.
+     */
+    void release() {
+        totalRefCount--;
+    }
+
+    /**
+     * Release an instance injected as a field of an object
+     * @param owner The owner of the field
+     * @param field The field
+     */
     void release(Object owner, Field field) {
         Map<String, Integer> fields = owners.get(owner);
         if(fields!= null) {
-            totalRefCount--;
+            release();
 
             Integer count = fields.get(field.getName());
             if(--count > 0) {
diff --git a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionReferenceCount.java b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionReferenceCount.java
index 2f857cd..41057ec 100644
--- a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionReferenceCount.java
+++ b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionReferenceCount.java
@@ -96,41 +96,6 @@ public Container providesContainer() {
         }
     }
 
-    @Test
-    public void should_be_able_to_get_cached_instance() throws ProvideException, ProviderConflictException,
-            CircularDependenciesException, ProviderMissingException {
-        SimpleGraph graph = new SimpleGraph();
-        Component component = new TestComp2();
-        graph.register(component);
-
-        Container container = graph.get(Container.class, null, MyInject.class);
-        Assert.assertNotNull(((Fridge) container).a);
-        Assert.assertNotNull(((Fridge) container).b);
-
-        Assert.assertTrue(component.getScopeCache().cache.isEmpty());
-
-        House house = new House();
-        graph.inject(house, MyInject.class);
-
-        Assert.assertNotNull(house.container);
-        Assert.assertNotNull(((Fridge) house.container).a);
-        Assert.assertNotNull(((Fridge) house.container).b);
-        Assert.assertTrue(((Fridge) house.container).a == ((Fridge) house.container).b);
-
-        Assert.assertTrue(((Fridge) container).a != house.container);
-        Assert.assertTrue(((Fridge) container).a != ((Fridge) house.container).a);
-        Assert.assertTrue(((Fridge) container).b != ((Fridge) house.container).b);
-
-        Provider<Container> containerProvider = graph.getProvider(Container.class, null);
-        Provider<Fruit> fruitProvider = graph.getProvider(Fruit.class, null);
-
-        Assert.assertTrue(containerProvider.totalReference() == 1);
-        Assert.assertTrue(fruitProvider.totalReference() == 2);
-
-        graph.release(house, MyInject.class);
-        Assert.assertTrue(component.getScopeCache().cache.isEmpty());
-    }
-
     @Test
     public void referenceCountCanReduceCascadinglyFromRoot() throws ProvideException, ProviderConflictException,
             CircularDependenciesException, ProviderMissingException {
diff --git a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
index ff1e92c..d160c4a 100644
--- a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
+++ b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
@@ -17,17 +17,18 @@
 package com.shipdream.lib.poke;
 
 import com.shipdream.lib.poke.exception.CircularDependenciesException;
+import com.shipdream.lib.poke.exception.PokeException;
 import com.shipdream.lib.poke.exception.ProvideException;
 import com.shipdream.lib.poke.exception.ProviderConflictException;
 import com.shipdream.lib.poke.exception.ProviderMissingException;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 
+import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Qualifier;
 
@@ -82,6 +83,107 @@ private static class Container {
         private Os windows;
     }
 
+    @Test
+    public void should_use_cached_instance_if_inject_instance_is_referenced_more_then_once() throws Exception {
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, iOs.class, scopeCache);
+        graph.register(Os.class, Android.class, scopeCache);
+        graph.register(Os.class, Windows.class, scopeCache);
+
+        //Retain = 0
+
+        final Container container = new Container();
+        graph.inject(container, MyInject.class);
+        //Retain  = 1
+
+        final Container container2 = new Container();
+        graph.inject(container2, MyInject.class);
+        //Retain = 2
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertTrue(container.ios == instance);
+                Assert.assertTrue(container2.ios == instance);
+            }
+        });
+
+        graph.release(container, MyInject.class);
+        //Retain = 1
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertTrue(container.ios == instance);
+                Assert.assertTrue(container2.ios == instance);
+            }
+        });
+
+        graph.release(container2, MyInject.class);
+        //Retain = 0
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertTrue(container.ios != null);
+                Assert.assertTrue(container.ios != instance);
+            }
+        });
+    }
+
+    @Test
+    public void should_retain_instance_in_use_method_until_exit() throws Exception {
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, iOs.class, scopeCache);
+        graph.register(Os.class, Android.class, scopeCache);
+        graph.register(Os.class, Windows.class, scopeCache);
+
+        final Container container = new Container();
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                try {
+                    graph.inject(container, MyInject.class);
+                } catch (PokeException e) {
+                    throw new RuntimeException(e);
+                }
+
+                Assert.assertTrue(container.ios != null);
+                Assert.assertTrue(container.ios == instance);
+            }
+        });
+    }
+
+    @Test
+    public void should__be_able_to_use_instance_injected_with_qualifier() throws Exception {
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, iOs.class, scopeCache);
+        graph.register(Os.class, Android.class, scopeCache);
+        graph.register(Os.class, Windows.class, scopeCache);
+
+        final Container container = new Container();
+
+        @Google
+        class GoogleHolder{}
+
+        graph.use(Os.class, GoogleHolder.class.getAnnotation(Google.class), Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                try {
+                    graph.inject(container, MyInject.class);
+                } catch (PokeException e) {
+                    throw new RuntimeException(e);
+                }
+
+                Assert.assertTrue(container.android == instance);
+            }
+        });
+    }
+
     @Test
     public void shouldInjectQualifiedWithDifferentInstances() throws ProviderConflictException,
             ProvideException, CircularDependenciesException, ProviderMissingException {

From 1d0b59cdc46a13ffea3c94be9d784344307721ea Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Fri, 23 Oct 2015 00:53:33 +1100
Subject: [PATCH 07/28] Add use method to MvcGraph and tests for it

---
 .../shipdream/lib/android/mvc/MvcGraph.java   | 115 +++++++++
 .../lib/android/mvc/TestMvcGraph.java         | 231 +++++++++++++++++-
 .../java/com/shipdream/lib/poke/Graph.java    | 114 ++++++++-
 .../lib/poke/ProviderFinderByRegistry.java    |  11 +-
 .../lib/poke/TestInjectionWithQualifier.java  | 170 ++++++++-----
 5 files changed, 574 insertions(+), 67 deletions(-)

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
index 827e063..e32324a 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
@@ -173,6 +173,121 @@ public void clearOnProviderFreedListeners() {
         graph.clearOnProviderFreedListeners();
     }
 
+    /**
+     * Same as {@link #use(Class, Annotation, Consumer)} except using un-qualified injectable type.
+     * @param type The type of the injectable instance
+     * @param consumer Consume to use the instance
+     */
+    public <T> void use(Class<T> type, Consumer<T> consumer) {
+        try {
+            graph.use(type, Inject.class, consumer);
+        } catch (PokeException e) {
+            throw new MvcGraphException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Use an injectable instance in the scope of {@link Consumer#consume(Object)} without injecting
+     * it as a field of an object. This method will automatically retain the instance before
+     * {@link Consumer#consume(Object)} is called and released after it's returned. As a result,
+     * it doesn't hold the instance like the field marked by {@link Inject} that will retain the
+     * reference of the instance until {@link #release(Object)} is called. However, in the
+     * scope of {@link Consumer#consume(Object)} the instance will be held.
+     * <p>For example,</p>
+     * <pre>
+        interface Os {
+        }
+
+        static class DeviceComponent extends Component {
+            @Provides
+            @Singleton
+            public Os provide() {
+                return new Os(){
+                };
+            }
+        }
+    
+        class Device {
+            @Inject
+            private Os os;
+        }
+
+        mvcGraph.register(new DeviceComponent());
+
+        //OsReferenceCount = 0
+        mvcGraph.use(Os.class, null, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //First time to create the instance.
+                //OsReferenceCount = 1
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        final Device device = new Device();
+        mvcGraph.inject(device);  //OsReferenceCount = 1
+        //New instance created and cached
+
+        mvcGraph.use(Os.class, null, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //Since reference count is greater than 0, cached instance will be reused
+                //OsReferenceCount = 2
+                Assert.assertTrue(device.os == instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        mvcGraph.release(device);  //OsReferenceCount = 0
+        //Last instance released, so next time a new instance will be created
+
+        mvcGraph.use(Os.class, null, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os != instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        mvcGraph.use(Os.class, null, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os != instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+        //Cached instance cleared again
+
+        mvcGraph.use(Os.class, null, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                mvcGraph.inject(device);
+                //Injection will reuse the cached instance and increment the reference count
+                //OsReferenceCount = 2
+
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os == instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        mvcGraph.release(device);  //OsReferenceCount = 0
+     * </pre>
+     * @param type The type of the injectable instance
+     * @param qualifier Qualifier for the injectable instance
+     * @param consumer Consume to use the instance
+     * @throws MvcGraphException throw when there are exceptions during the consumption of the instance
+     */
     public <T> void use(Class<T> type, Annotation qualifier, Consumer<T> consumer) {
         try {
             graph.use(type, qualifier, Inject.class, consumer);
diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/TestMvcGraph.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/TestMvcGraph.java
index 7da131a..77c4b5f 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/TestMvcGraph.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/TestMvcGraph.java
@@ -17,11 +17,13 @@
 package com.shipdream.lib.android.mvc;
 
 import com.shipdream.lib.poke.Component;
+import com.shipdream.lib.poke.Consumer;
 import com.shipdream.lib.poke.Graph;
+import com.shipdream.lib.poke.Provider.OnFreedListener;
+import com.shipdream.lib.poke.Provides;
 import com.shipdream.lib.poke.ScopeCache;
 import com.shipdream.lib.poke.exception.ProvideException;
 import com.shipdream.lib.poke.exception.ProviderConflictException;
-import com.shipdream.lib.poke.Provider.OnFreedListener;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -29,10 +31,18 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
+import javax.inject.Inject;
+import javax.inject.Qualifier;
+import javax.inject.Singleton;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
@@ -66,6 +76,225 @@ protected ExecutorService createExecutorService() {
         });
     }
 
+    interface Os {
+    }
+
+    @Qualifier
+    @Documented
+    @Retention(RUNTIME)
+    @interface Apple {
+    }
+
+    @Qualifier
+    @Documented
+    @Retention(RUNTIME)
+    @interface Google {
+    }
+
+    static class iOS implements Os {
+
+    }
+
+    static class Android implements Os {
+
+    }
+
+    static class DeviceComponent extends Component {
+        @Provides
+        @Singleton
+        public Os provide() {
+            return new Android();
+        }
+
+        @Provides
+        @Singleton
+        @Apple
+        public Os provideIos() {
+            return new iOS();
+        }
+
+        @Provides
+        @Singleton
+        @Google
+        public Os provideAndroid() {
+            return new Android();
+        }
+    }
+
+    class Device {
+        @Inject
+        private Os android;
+
+        @Inject
+        @Apple
+        private Os os;
+    }
+
+    @Test
+    public void use_method_should_retain_and_release_instance_without_qualifier_correctly() {
+        mvcGraph.register(new DeviceComponent());
+
+        //OsReferenceCount = 0
+        mvcGraph.use(Os.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //First time to create the instance.
+                //OsReferenceCount = 1
+                Assert.assertTrue(instance instanceof Android);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        final Device device = new Device();
+        mvcGraph.inject(device);  //OsReferenceCount = 1
+        //New instance created and cached
+
+        mvcGraph.use(Os.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //Since reference count is greater than 0, cached instance will be reused
+                //OsReferenceCount = 2
+                Assert.assertTrue(device.android == instance);
+                Assert.assertTrue(instance instanceof Android);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        mvcGraph.release(device);  //OsReferenceCount = 0
+        //Last instance released, so next time a new instance will be created
+
+        mvcGraph.use(Os.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.android != instance);
+                Assert.assertTrue(instance instanceof Android);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        mvcGraph.use(Os.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.android != instance);
+                Assert.assertTrue(instance instanceof Android);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+        //Cached instance cleared again
+
+        mvcGraph.use(Os.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                mvcGraph.inject(device);
+                //Injection will reuse the cached instance and increment the reference count
+                //OsReferenceCount = 2
+
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.android == instance);
+                Assert.assertTrue(instance instanceof Android);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        mvcGraph.release(device);  //OsReferenceCount = 0
+    }
+
+    @Test
+    public void use_method_should_retain_and_release_instance_correctly() {
+        mvcGraph.register(new DeviceComponent());
+
+        @Apple
+        class NeedIoS {
+
+        }
+
+        Annotation iosQualifier = NeedIoS.class.getAnnotation(Apple.class);
+
+        //OsReferenceCount = 0
+        mvcGraph.use(Os.class, iosQualifier, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //First time to create the instance.
+                //OsReferenceCount = 1
+                Assert.assertTrue(instance instanceof iOS);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        final Device device = new Device();
+        mvcGraph.inject(device);  //OsReferenceCount = 1
+        //New instance created and cached
+
+        mvcGraph.use(Os.class, iosQualifier, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //Since reference count is greater than 0, cached instance will be reused
+                //OsReferenceCount = 2
+                Assert.assertTrue(device.os == instance);
+                Assert.assertTrue(instance instanceof iOS);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        mvcGraph.release(device);  //OsReferenceCount = 0
+        //Last instance released, so next time a new instance will be created
+
+        mvcGraph.use(Os.class, iosQualifier, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os != instance);
+                Assert.assertTrue(instance instanceof iOS);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        mvcGraph.use(Os.class, iosQualifier, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os != instance);
+                Assert.assertTrue(instance instanceof iOS);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+        //Cached instance cleared again
+
+        mvcGraph.use(Os.class, iosQualifier, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                mvcGraph.inject(device);
+                //Injection will reuse the cached instance and increment the reference count
+                //OsReferenceCount = 2
+
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os == instance);
+                Assert.assertTrue(instance instanceof iOS);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        mvcGraph.release(device);  //OsReferenceCount = 0
+    }
+
     @Test
     public void should_delegate_mvc_graph_properly() throws ProvideException, ProviderConflictException {
         // Arrange
diff --git a/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java b/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
index d9ac275..259c5a8 100644
--- a/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
+++ b/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
@@ -34,6 +34,8 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.inject.Inject;
+
 /**
  * Abstract graph manages how to inject dependencies to target objects.
  */
@@ -157,21 +159,115 @@ public void inject(Object target, Class<? extends Annotation> injectAnnotation)
         visitedFields.clear();
     }
 
+    /**
+     * Same as {@link #use(Class, Annotation, Class, Consumer)} except using un-qualified injectable type.
+     * @param type The type of the injectable instance
+     * @param injectAnnotation injectAnnotation
+     * @param consumer Consume to use the instance
+     * @throws ProvideException ProvideException
+     * @throws CircularDependenciesException CircularDependenciesException
+     * @throws ProviderMissingException ProviderMissingException
+     */
     public <T> void use(Class<T> type, Class<? extends Annotation> injectAnnotation, Consumer<T> consumer)
             throws ProvideException, CircularDependenciesException, ProviderMissingException {
         use(type, null, injectAnnotation, consumer);
     }
 
     /**
-     *
-     * @param type
-     * @param qualifier
-     * @param injectAnnotation
-     * @param consumer
-     * @param <T>
-     * @throws ProvideException
-     * @throws CircularDependenciesException
-     * @throws ProviderMissingException
+     * Use an injectable instance in the scope of {@link Consumer#consume(Object)} without injecting
+     * it as a field of an object. This method will automatically retain the instance before
+     * {@link Consumer#consume(Object)} is called and released after it's returned. As a result,
+     * it doesn't hold the instance like the field marked by {@link Inject} that will retain the
+     * reference of the instance until {@link #release(Object, Class)} is called. However, in the
+     * scope of {@link Consumer#consume(Object)} the instance will be held.
+     * <p>For example,</p>
+     * <pre>
+        private static class Device {
+            @MyInject
+            private Os os;
+        }
+
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+
+        graph.register(Os.class, Android.class, scopeCache);
+
+        //OsReferenceCount = 0
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+              //First time to create the instance.
+              //OsReferenceCount = 1
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        Device device = new Device();
+        graph.inject(device, MyInject.class);  //OsReferenceCount = 1
+        //New instance created and cached
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+              //Since reference count is greater than 0, cached instance will be reused
+              //OsReferenceCount = 2
+              Assert.assertTrue(device.os == instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        graph.release(device, MyInject.class);  //OsReferenceCount = 0
+        //Last instance released, so next time a new instance will be created
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+              //OsReferenceCount = 1
+              //Since the cached instance is cleared, the new instance is a newly created one.
+              Assert.assertTrue(device.os != instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os != instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 0
+        //Cached instance cleared again
+
+        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //OsReferenceCount = 1
+                graph.inject(device, MyInject.class);  
+                //Injection will reuse the cached instance and increment the reference count
+                //OsReferenceCount = 2
+
+                //Since the cached instance is cleared, the new instance is a newly created one.
+                Assert.assertTrue(device.os == instance);
+            }
+        });
+        //Reference count decremented by use method automatically
+        //OsReferenceCount = 1
+
+        graph.release(device, MyInject.class);  //OsReferenceCount = 0      
+     * </pre>
+     * @param type The type of the injectable instance
+     * @param qualifier Qualifier for the injectable instance
+     * @param injectAnnotation injectAnnotation
+     * @param consumer Consume to use the instance
+     * @throws ProvideException ProvideException
+     * @throws CircularDependenciesException CircularDependenciesException
+     * @throws ProviderMissingException ProviderMissingException
      */
     public <T> void use(Class<T> type, Annotation qualifier,
                         Class<? extends Annotation> injectAnnotation, Consumer<T> consumer)
diff --git a/library/poke/src/main/java/com/shipdream/lib/poke/ProviderFinderByRegistry.java b/library/poke/src/main/java/com/shipdream/lib/poke/ProviderFinderByRegistry.java
index 87399a1..dc3781c 100644
--- a/library/poke/src/main/java/com/shipdream/lib/poke/ProviderFinderByRegistry.java
+++ b/library/poke/src/main/java/com/shipdream/lib/poke/ProviderFinderByRegistry.java
@@ -410,7 +410,16 @@ static class MethodProvider extends Provider {
         @Override
         protected Object createInstance() throws ProvideException {
             try {
-                return method.invoke(component);
+                boolean accessible = method.isAccessible();
+                if (!accessible) {
+                    method.setAccessible(true);
+                }
+
+                Object obj = method.invoke(component);
+
+                method.setAccessible(accessible);
+
+                return obj;
             } catch (IllegalAccessException e) {
                 throw new ProvideException(String.format("Provides method %s must " +
                         "be accessible.", method.getName()), e);  // $COVERAGE-IGNORE$
diff --git a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
index d160c4a..e38b90a 100644
--- a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
+++ b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
@@ -28,7 +28,6 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 
-import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Qualifier;
 
@@ -70,7 +69,7 @@ public void shouldDetectConflictProviderException() throws ProviderConflictExcep
         graph.register(Os.class, Android.class);
     }
 
-    private static class Container {
+    private static class Device {
         @MyInject
         private Os ios;
 
@@ -93,41 +92,41 @@ public void should_use_cached_instance_if_inject_instance_is_referenced_more_the
 
         //Retain = 0
 
-        final Container container = new Container();
-        graph.inject(container, MyInject.class);
+        final Device device = new Device();
+        graph.inject(device, MyInject.class);
         //Retain  = 1
 
-        final Container container2 = new Container();
-        graph.inject(container2, MyInject.class);
+        final Device device2 = new Device();
+        graph.inject(device2, MyInject.class);
         //Retain = 2
 
-        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+        graph.use(Os.class, null, MyInject.class, new Consumer<Os>() {
             @Override
             public void consume(Os instance) {
-                Assert.assertTrue(container.ios == instance);
-                Assert.assertTrue(container2.ios == instance);
+                Assert.assertTrue(device.ios == instance);
+                Assert.assertTrue(device2.ios == instance);
             }
         });
 
-        graph.release(container, MyInject.class);
+        graph.release(device, MyInject.class);
         //Retain = 1
 
-        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+        graph.use(Os.class, null, MyInject.class, new Consumer<Os>() {
             @Override
             public void consume(Os instance) {
-                Assert.assertTrue(container.ios == instance);
-                Assert.assertTrue(container2.ios == instance);
+                Assert.assertTrue(device.ios == instance);
+                Assert.assertTrue(device2.ios == instance);
             }
         });
 
-        graph.release(container2, MyInject.class);
+        graph.release(device2, MyInject.class);
         //Retain = 0
 
-        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+        graph.use(Os.class, null, MyInject.class, new Consumer<Os>() {
             @Override
             public void consume(Os instance) {
-                Assert.assertTrue(container.ios != null);
-                Assert.assertTrue(container.ios != instance);
+                Assert.assertTrue(device.ios != null);
+                Assert.assertTrue(device.ios != instance);
             }
         });
     }
@@ -140,19 +139,78 @@ public void should_retain_instance_in_use_method_until_exit() throws Exception {
         graph.register(Os.class, Android.class, scopeCache);
         graph.register(Os.class, Windows.class, scopeCache);
 
-        final Container container = new Container();
+        final Device device = new Device();
 
-        graph.use(Os.class, null, Inject.class, new Consumer<Os>() {
+        graph.use(Os.class, null, MyInject.class, new Consumer<Os>() {
             @Override
             public void consume(Os instance) {
                 try {
-                    graph.inject(container, MyInject.class);
+                    graph.inject(device, MyInject.class);
                 } catch (PokeException e) {
                     throw new RuntimeException(e);
                 }
 
-                Assert.assertTrue(container.ios != null);
-                Assert.assertTrue(container.ios == instance);
+                Assert.assertTrue(device.ios != null);
+                Assert.assertTrue(device.ios == instance);
+            }
+        });
+
+        graph.use(Os.class, null, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertTrue(device.ios == instance);
+            }
+        });
+
+        graph.release(device, MyInject.class);
+
+        graph.use(Os.class, null, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //New instance has created
+                Assert.assertTrue(device.ios != instance);
+            }
+        });
+    }
+
+    @Test
+    public void should_retain_instance_in_use_method_until_exit_without_qualifier() throws Exception {
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, iOs.class, scopeCache);
+        graph.register(Os.class, Android.class, scopeCache);
+        graph.register(Os.class, Windows.class, scopeCache);
+
+        final Device device = new Device();
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                try {
+                    graph.inject(device, MyInject.class);
+                } catch (PokeException e) {
+                    throw new RuntimeException(e);
+                }
+
+                Assert.assertTrue(device.ios != null);
+                Assert.assertTrue(device.ios == instance);
+            }
+        });
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertTrue(device.ios == instance);
+            }
+        });
+
+        graph.release(device, MyInject.class);
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                //New instance has created
+                Assert.assertTrue(device.ios != instance);
             }
         });
     }
@@ -165,21 +223,21 @@ public void should__be_able_to_use_instance_injected_with_qualifier() throws Exc
         graph.register(Os.class, Android.class, scopeCache);
         graph.register(Os.class, Windows.class, scopeCache);
 
-        final Container container = new Container();
+        final Device device = new Device();
 
         @Google
         class GoogleHolder{}
 
-        graph.use(Os.class, GoogleHolder.class.getAnnotation(Google.class), Inject.class, new Consumer<Os>() {
+        graph.use(Os.class, GoogleHolder.class.getAnnotation(Google.class), MyInject.class, new Consumer<Os>() {
             @Override
             public void consume(Os instance) {
                 try {
-                    graph.inject(container, MyInject.class);
+                    graph.inject(device, MyInject.class);
                 } catch (PokeException e) {
                     throw new RuntimeException(e);
                 }
 
-                Assert.assertTrue(container.android == instance);
+                Assert.assertTrue(device.android == instance);
             }
         });
     }
@@ -192,19 +250,19 @@ public void shouldInjectQualifiedWithDifferentInstances() throws ProviderConflic
         graph.register(Os.class, Android.class);
         graph.register(Os.class, Windows.class);
 
-        Container container = new Container();
-        graph.inject(container, MyInject.class);
+        Device device = new Device();
+        graph.inject(device, MyInject.class);
 
-        Container container2 = new Container();
-        graph.inject(container2, MyInject.class);
+        Device device2 = new Device();
+        graph.inject(device2, MyInject.class);
 
-        Assert.assertEquals(container.ios.getClass(), iOs.class);
-        Assert.assertEquals(container.android.getClass(), Android.class);
-        Assert.assertEquals(container.windows.getClass(), Windows.class);
+        Assert.assertEquals(device.ios.getClass(), iOs.class);
+        Assert.assertEquals(device.android.getClass(), Android.class);
+        Assert.assertEquals(device.windows.getClass(), Windows.class);
 
-        Assert.assertTrue(container.ios != container2.ios);
-        Assert.assertTrue(container.android != container2.android);
-        Assert.assertTrue(container.windows != container2.windows);
+        Assert.assertTrue(device.ios != device2.ios);
+        Assert.assertTrue(device.android != device2.android);
+        Assert.assertTrue(device.windows != device2.windows);
     }
 
     @Test
@@ -216,19 +274,19 @@ public void shouldInjectQualifiedSingletonInstance() throws ProviderConflictExce
         graph.register(Os.class, Android.class, scopeCache);
         graph.register(Os.class, Windows.class, scopeCache);
 
-        Container container = new Container();
-        graph.inject(container, MyInject.class);
+        Device device = new Device();
+        graph.inject(device, MyInject.class);
 
-        Container container2 = new Container();
-        graph.inject(container2, MyInject.class);
+        Device device2 = new Device();
+        graph.inject(device2, MyInject.class);
 
-        Assert.assertEquals(container.ios.getClass(), iOs.class);
-        Assert.assertEquals(container.android.getClass(), Android.class);
-        Assert.assertEquals(container.windows.getClass(), Windows.class);
+        Assert.assertEquals(device.ios.getClass(), iOs.class);
+        Assert.assertEquals(device.android.getClass(), Android.class);
+        Assert.assertEquals(device.windows.getClass(), Windows.class);
 
-        Assert.assertTrue(container.ios == container2.ios);
-        Assert.assertTrue(container.android == container2.android);
-        Assert.assertTrue(container.windows == container2.windows);
+        Assert.assertTrue(device.ios == device2.ios);
+        Assert.assertTrue(device.android == device2.android);
+        Assert.assertTrue(device.windows == device2.windows);
     }
 
     static class ContainerComponent extends Component {
@@ -258,19 +316,19 @@ public void componentProvidesQualifierShouldOverrideImplClassQualifier() throws
         SimpleGraph graph = new SimpleGraph();
         graph.register(new ContainerComponent());
 
-        Container container = new Container();
-        graph.inject(container, MyInject.class);
+        Device device = new Device();
+        graph.inject(device, MyInject.class);
 
-        Container container2 = new Container();
-        graph.inject(container2, MyInject.class);
+        Device device2 = new Device();
+        graph.inject(device2, MyInject.class);
 
-        Assert.assertEquals(container.ios.getClass(), iOs.class);
-        Assert.assertEquals(container.android.getClass(), Windows.class);
-        Assert.assertEquals(container.windows.getClass(), Android.class);
+        Assert.assertEquals(device.ios.getClass(), iOs.class);
+        Assert.assertEquals(device.android.getClass(), Windows.class);
+        Assert.assertEquals(device.windows.getClass(), Android.class);
 
-        Assert.assertTrue(container.ios != container2.ios);
-        Assert.assertTrue(container.android != container2.android);
-        Assert.assertTrue(container.windows != container2.windows);
+        Assert.assertTrue(device.ios != device2.ios);
+        Assert.assertTrue(device.android != device2.android);
+        Assert.assertTrue(device.windows != device2.windows);
     }
 
     interface Book {

From 004a596f1eaed04acca3325f933a7f5d1d498091 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Fri, 23 Oct 2015 01:23:57 +1100
Subject: [PATCH 08/28] Inject nested fields in Graph.use method and
 corresponding tests added

---
 .../java/com/shipdream/lib/poke/Graph.java    |  23 +--
 .../lib/poke/TestInjectionWithQualifier.java  | 159 +++++++++++++++++-
 2 files changed, 170 insertions(+), 12 deletions(-)

diff --git a/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java b/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
index 259c5a8..5ddfeb5 100644
--- a/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
+++ b/library/poke/src/main/java/com/shipdream/lib/poke/Graph.java
@@ -153,7 +153,7 @@ public void inject(Object target, Class<? extends Annotation> injectAnnotation)
                 monitors.get(i).onInject(target);
             }
         }
-        doInject(target, null, null, injectAnnotation, true);
+        doInject(target, null, null, injectAnnotation);
         visitedInjectNodes.clear();
         revisitedNode = null;
         visitedFields.clear();
@@ -281,20 +281,26 @@ public <T> void use(Class<T> type, Annotation qualifier,
         } else {
             T newInstance = provider.get();
 
-            doInject(newInstance, null, null, injectAnnotation, false);
+            doInject(newInstance, type, qualifier, injectAnnotation);
 
             instance = newInstance;
         }
 
         provider.retain();
+        if (provider.totalReference() == 1) {
+            provider.notifyInjected(instance);
+        }
         consumer.consume(instance);
+
+        doRelease(instance, type, qualifier, injectAnnotation);
+
         provider.release();
         checkToFreeProvider(provider);
     }
 
     @SuppressWarnings("unchecked")
     private void doInject(Object target, Class targetType, Annotation targetQualifier,
-                          Class<? extends Annotation> injectAnnotation, boolean retainReference)
+                          Class<? extends Annotation> injectAnnotation)
             throws ProvideException, ProviderMissingException, CircularDependenciesException {
         boolean circularDetected = false;
         Provider targetProvider;
@@ -328,19 +334,14 @@ private void doInject(Object target, Class targetType, Annotation targetQualifie
                         Annotation fieldQualifier = ReflectUtils.findFirstQualifier(field);
                         Provider provider = getProvider(fieldType, fieldQualifier);
 
-                        Object impl;
-                        if (retainReference) {
-                            impl = provider.get();
-                            provider.retain(target, field);
-                        } else {
-                            impl = provider.createInstance();
-                        }
+                        Object impl = provider.get();
+                        provider.retain(target, field);
 
                         ReflectUtils.setField(target, field, impl);
 
                         boolean firstTimeInject = provider.totalReference() == 1;
                         if (!isFieldVisited(impl, field)) {
-                            doInject(impl, fieldType, fieldQualifier, injectAnnotation, retainReference);
+                            doInject(impl, fieldType, fieldQualifier, injectAnnotation);
                         }
 
                         if (firstTimeInject) {
diff --git a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
index e38b90a..5523d51 100644
--- a/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
+++ b/library/poke/src/test/java/com/shipdream/lib/poke/TestInjectionWithQualifier.java
@@ -32,6 +32,9 @@
 import javax.inject.Qualifier;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class TestInjectionWithQualifier extends BaseTestCases {
     @Qualifier
@@ -216,7 +219,7 @@ public void consume(Os instance) {
     }
 
     @Test
-    public void should__be_able_to_use_instance_injected_with_qualifier() throws Exception {
+    public void should_be_able_to_use_instance_injected_with_qualifier() throws Exception {
         final SimpleGraph graph = new SimpleGraph();
         ScopeCache scopeCache = new ScopeCache();
         graph.register(Os.class, iOs.class, scopeCache);
@@ -242,6 +245,160 @@ public void consume(Os instance) {
         });
     }
 
+    @Test
+    public void use_method_should_notify_injection_and_freed() throws
+            ProviderConflictException, ProvideException, CircularDependenciesException, ProviderMissingException {
+        final SimpleGraph graph = new SimpleGraph();
+        final Provider<Os> provider = new Provider<Os>(Os.class) {
+            @Override
+            protected Os createInstance() throws ProvideException {
+                return new Android();
+            }
+        };
+        provider.setScopeCache(new ScopeCache());
+        graph.register(provider);
+
+        class Phone {
+            @MyInject
+            private Os os;
+        }
+
+        final Provider.OnInjectedListener<Os> injectListener = mock(Provider.OnInjectedListener.class);
+        provider.registerOnInjectedListener(injectListener);
+
+        final Provider.OnFreedListener osOnFreedListener = mock(Provider.OnFreedListener.class);
+        graph.registerProviderFreedListener(osOnFreedListener);
+
+        final Phone phone = new Phone();
+
+        graph.inject(phone, MyInject.class);
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                verify(injectListener, times(1)).onInjected(phone.os);
+
+                Assert.assertTrue(phone.os == instance);
+                verify(osOnFreedListener, times(0)).onFreed(provider);
+
+                try {
+                    graph.release(phone, MyInject.class);
+                } catch (ProviderMissingException e) {
+                    throw new RuntimeException(e);
+                }
+
+                verify(osOnFreedListener, times(0)).onFreed(provider);
+            }
+        });
+
+        verify(injectListener, times(1)).onInjected(phone.os);
+
+        verify(osOnFreedListener, times(1)).onFreed(provider);
+    }
+
+    interface Connector{
+    }
+
+    static class SamSungOs implements Os {
+        @MyInject
+        Connector connector;
+    }
+
+    static class TypeC implements Connector{
+    }
+
+    @Test
+    public void use_method_should_inject_fields_recursively() throws
+            ProviderConflictException, ProvideException, CircularDependenciesException, ProviderMissingException {
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, SamSungOs.class, scopeCache);
+        graph.register(Connector.class, TypeC.class, scopeCache);
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertNotNull(((SamSungOs) instance).connector);
+            }
+        });
+    }
+
+    @Test
+    public void use_method_should_release_fields_recursively() throws
+            ProviderConflictException, ProvideException, CircularDependenciesException, ProviderMissingException {
+
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, SamSungOs.class, scopeCache);
+        graph.register(Connector.class, TypeC.class, scopeCache);
+
+        class Phone {
+            @MyInject
+            private Os os;
+        }
+
+        final Phone phone = new Phone();
+
+        class ConnectorHolder {
+            Connector connector;
+        }
+
+        final ConnectorHolder connectorHolder = new ConnectorHolder();
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertNotNull(((SamSungOs) instance).connector);
+
+                connectorHolder.connector = ((SamSungOs) instance).connector;
+            }
+        });
+
+        graph.inject(phone, MyInject.class);
+
+        Assert.assertTrue(connectorHolder.connector != ((SamSungOs) phone.os).connector);
+    }
+
+    @Test
+    public void inject_in_use_method_should_retain_instances() throws
+            ProviderConflictException, ProvideException, CircularDependenciesException, ProviderMissingException {
+
+        final SimpleGraph graph = new SimpleGraph();
+        ScopeCache scopeCache = new ScopeCache();
+        graph.register(Os.class, SamSungOs.class, scopeCache);
+        graph.register(Connector.class, TypeC.class, scopeCache);
+
+        class Phone {
+            @MyInject
+            private Os os;
+        }
+
+        final Phone phone = new Phone();
+
+        class ConnectorHolder {
+            Connector connector;
+        }
+
+        final ConnectorHolder connectorHolder = new ConnectorHolder();
+
+        graph.use(Os.class, MyInject.class, new Consumer<Os>() {
+            @Override
+            public void consume(Os instance) {
+                Assert.assertNotNull(((SamSungOs) instance).connector);
+
+                try {
+                    graph.inject(phone, MyInject.class);
+                } catch (PokeException e) {
+                    throw new RuntimeException(e);
+                }
+
+                connectorHolder.connector = ((SamSungOs) instance).connector;
+            }
+        });
+
+        Assert.assertTrue(connectorHolder.connector == ((SamSungOs) phone.os).connector);
+    }
+
     @Test
     public void shouldInjectQualifiedWithDifferentInstances() throws ProviderConflictException,
             ProvideException, CircularDependenciesException, ProviderMissingException {

From 303311ac502b94918200dd24caa04b9a626ba86a Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Sat, 24 Oct 2015 18:14:47 +1100
Subject: [PATCH 09/28] Bump up version to 1.4.0

---
 ChangeLog.md                     | 5 +++++
 README.md                        | 4 ++--
 build.gradle                     | 2 +-
 documents/sites/Site-MarkDown.md | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 3f79557..e2f84d7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,8 @@
+Version: 1.4.0
+* Refactor of class AndroidMvc so that controllers can access the MvcGraph
+* EventBusV2V is injectable same as EventBusC2V and EventBusC2C
+* Add method "use" in MvcGraph to consume an injectable classes which doesn't require a class field marked by @Inject
+
 Version: 1.3.0
 * Refactor the MvcFragment.Reason object.
 * Remove android-mvc-controller-retrofit
diff --git a/README.md b/README.md
index 4dea962..c64879a 100644
--- a/README.md
+++ b/README.md
@@ -33,13 +33,13 @@ The library is currently release to jCenter and MavenCentral
 <dependency>
     <groupId>com.shipdream</groupId>
     <artifactId>android-mvc</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
 </dependency>
 ```
 
 **Gradle:**
 ```groovy
-compile "com.shipdream:android-mvc:1.3.0"
+compile "com.shipdream:android-mvc:1.4.0"
 ```
 
 ## Dependency injection with reference count
diff --git a/build.gradle b/build.gradle
index 9d51bad..d682628 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ ext {
     gitUrl = 'https://github.com/kejunxia/AndroidMvc.git'   // Git repository URL
     version = [
         major: 1,
-        minor: 3,
+        minor: 4,
         patch : 0
     ]
     libGroup = 'com.shipdream'
diff --git a/documents/sites/Site-MarkDown.md b/documents/sites/Site-MarkDown.md
index 581cff3..b3c9ad9 100644
--- a/documents/sites/Site-MarkDown.md
+++ b/documents/sites/Site-MarkDown.md
@@ -40,13 +40,13 @@ The library is currently release to jCenter and MavenCentral
 <dependency>
     <groupId>com.shipdream</groupId>
     <artifactId>android-mvc</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
 </dependency>
 ```
 
 **Gradle:**
 ```groovy
-compile "com.shipdream:android-mvc:1.3.0"
+compile "com.shipdream:android-mvc:1.4.0"
 ```
 
 ## Samples

From 0363d951320d65245caf3b39ffe6ce6cb1b08a23 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Sun, 25 Oct 2015 19:22:44 +1100
Subject: [PATCH 10/28] Bump up Android Sdk and Support Library

---
 build.gradle                          | 8 ++++----
 library/android-mvc-test/build.gradle | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index d682628..5e006a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.+'
+        classpath 'com.android.tools.build:gradle:1.3.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
@@ -82,13 +82,13 @@ ext {
     shouldPublish = false
 
     androidMinSdkVersion = 14
-    androidCompileSdkVersion = 22
-    supportLibVersion = "22.2.1"
+    androidCompileSdkVersion = 23
+    supportLibVersion = "23.1.0"
     androidTargetSdkVersion = androidCompileSdkVersion
     lib = [
             androidMinSdk: 'com.google.android:android:4.0.1.2',
             androidSupportLib: "com.android.support:appcompat-v7:$supportLibVersion",
-            androidBuildToolVersion: "22.0.1",
+            androidBuildToolVersion: "23.0.1",
             junit: 'junit:junit:4.12',
             mokito: 'org.mockito:mockito-core:1.9.5',
             slf4jApi: "org.slf4j:slf4j-api:$log4jVersion",
diff --git a/library/android-mvc-test/build.gradle b/library/android-mvc-test/build.gradle
index f7215b1..fdabf7a 100644
--- a/library/android-mvc-test/build.gradle
+++ b/library/android-mvc-test/build.gradle
@@ -23,9 +23,9 @@ dependencies {
     compile rootProject.lib.logbackAndroidClassic
 
     // Testing-only dependencies
-    androidTestCompile 'com.android.support.test:runner:0.3'
-    androidTestCompile 'com.android.support.test:rules:0.3'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
+    androidTestCompile 'com.android.support.test:runner:0.4'
+    androidTestCompile 'com.android.support.test:rules:0.4'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
     androidTestCompile "com.android.support:support-annotations:$rootProject.supportLibVersion"
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
 }

From a97750766d955ca02ba702f30dc091e5f24ed1c0 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Thu, 29 Oct 2015 22:34:26 +1100
Subject: [PATCH 11/28] Set reason by fields

---
 .../lib/android/mvc/view/MvcFragment.java     | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
index 6296184..9667995 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
@@ -65,26 +65,6 @@ public static class Reason {
         private boolean isRotated;
         private boolean isPoppedOut;
 
-        void setNewInstance(boolean isNewInstance) {
-            this.isNewInstance = isNewInstance;
-        }
-
-        void setFirstTime(boolean isFirstTime) {
-            this.isFirstTime = isFirstTime;
-        }
-
-        void setRestored(boolean isRestored) {
-            this.isRestored = isRestored;
-        }
-
-        void setRotated(boolean isRotated) {
-            this.isRotated = isRotated;
-        }
-
-        void setPoppedOut(boolean isPoppedOut) {
-            this.isPoppedOut = isPoppedOut;
-        }
-
         /**
          * @return Indicates whether the fragment is a new instance that all its fields need to be
          * reinitialized and configured. This could happen when a fragment is created for the first
@@ -284,24 +264,24 @@ private void doOnViewCreatedCallBack(View view, Bundle savedInstanceState, boole
 
         if (newInstanceChecker == null) {
             newInstanceChecker = new Object();
-            reason.setNewInstance(true);
+            reason.isNewInstance = true;
         } else {
-            reason.setNewInstance(false);
+            reason.isNewInstance = false;
         }
 
         if (orientationChanged) {
-            reason.setRotated(true);
+            reason.isRotated = true;
         }
 
         if (aboutToPopOut) {
-            reason.setPoppedOut(true);
+            reason.isPoppedOut = true;
             aboutToPopOut = false;
         }
 
         if (restoring) {
-            reason.setRestored(true);
+            reason.isRestored = true;
         } else if (!orientationChanged) {
-            reason.setFirstTime(true);
+            reason.isFirstTime = true;
         }
 
         onViewReady(view, savedInstanceState, reason);

From 1f9fe4c8b5a8ba1663468ebb39760cd880655ed0 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Thu, 29 Oct 2015 23:37:45 +1100
Subject: [PATCH 12/28] Use FragmentPagerAdapter instead of
 FragmentStatePagerAdapter in test

---
 ChangeLog.md                                                  | 2 +-
 .../lib/android/mvc/view/viewpager/ViewPagerHomeFragment.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index e2f84d7..65f46b8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -29,7 +29,7 @@ Once root fragment is restored, it should notify all nested fragments they are n
 Fix issue that nested fragments of popping out fragment won't call onReturnFromBackground incorrectly
 
 Version: 1.1.6
-Fix issue that onViewReady is called with incorrect reason - RESTORE which should be FIRST_TIME when the fragment is a page and recreated by FragmentStatePagerAdapter
+Fix issue that onViewReady is called with incorrect reason - RESTORE which should be FIRST_TIME when the fragment is a page and recreated by FragmentPagerAdapter
 
 Version: 1.1.5
 Allow remove preference key from SharedPreferenceService
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/viewpager/ViewPagerHomeFragment.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/viewpager/ViewPagerHomeFragment.java
index 28d8791..89f2051 100644
--- a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/viewpager/ViewPagerHomeFragment.java
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/viewpager/ViewPagerHomeFragment.java
@@ -3,7 +3,7 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
@@ -86,7 +86,7 @@ public void onDestroy() {
         super.onDestroy();
     }
 
-    private class PagerAdapter extends FragmentStatePagerAdapter {
+    private class PagerAdapter extends FragmentPagerAdapter {
         private Class<? extends MvcFragment>[] tabs = new Class[]{
                 TabFragmentA.class,
                 TabFragmentB.class,

From 0bf65733432aa5362a837d3404766a46d90bd2f2 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Thu, 29 Oct 2015 23:53:43 +1100
Subject: [PATCH 13/28] Uplift Android SDK for travis

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35b99b4..63385af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-22.0.1
+    - build-tools-23.0.1
 
     # The SDK version used to compile your project
-    - android-22
+    - android-23
 
     # Additional components
     - extra-google-m2repository
@@ -18,11 +18,11 @@ android:
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
-    # - sys-img-armeabi-v7a-android-22
+    # - sys-img-armeabi-v7a-android-23
 
 # Emulator Management: Create, Start and Wait
 #before_script:
-  #- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  #- echo no | android create avd --force -n test -t android-23 --abi armeabi-v7a
   #- emulator -avd test -no-skin -no-audio -no-window &
   #- android-wait-for-emulator
   #- adb shell input keyevent 82 &

From 24fb91377ddbdfaa5ec3bbafc5880778d7035d95 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Thu, 29 Oct 2015 23:55:29 +1100
Subject: [PATCH 14/28] Update bintray plugin to 1.4

---
 build.gradle                                | 7 +++++--
 extension/service-core/build.gradle         | 5 ++++-
 library/android-mvc-controller/build.gradle | 5 ++++-
 library/android-mvc/build.gradle            | 5 ++++-
 library/poke/build.gradle                   | 5 ++++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5e006a7..89c4151 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,8 +31,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
 
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1'
     }
@@ -129,4 +128,8 @@ tasks.coveralls {
 
     dependsOn jacocoRootReport
     onlyIf { System.env.'CI' }
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.4'
 }
\ No newline at end of file
diff --git a/extension/service-core/build.gradle b/extension/service-core/build.gradle
index 44c59ee..2ea8079 100644
--- a/extension/service-core/build.gradle
+++ b/extension/service-core/build.gradle
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id "com.jfrog.bintray" version "1.4"
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'com.jfrog.bintray'
 
 task sourceJar(type: Jar) {
     from sourceSets.main.java.srcDirs
diff --git a/library/android-mvc-controller/build.gradle b/library/android-mvc-controller/build.gradle
index c8fe718..00c5867 100644
--- a/library/android-mvc-controller/build.gradle
+++ b/library/android-mvc-controller/build.gradle
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id "com.jfrog.bintray" version "1.4"
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'com.jfrog.bintray'
 
 task sourceJar(type: Jar) {
     from sourceSets.main.java.srcDirs
diff --git a/library/android-mvc/build.gradle b/library/android-mvc/build.gradle
index 283c593..4f5bf01 100644
--- a/library/android-mvc/build.gradle
+++ b/library/android-mvc/build.gradle
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id "com.jfrog.bintray" version "1.4"
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
 
 dependencies {
     compile project(':library:android-mvc-controller')
diff --git a/library/poke/build.gradle b/library/poke/build.gradle
index b1b26b7..32487e3 100644
--- a/library/poke/build.gradle
+++ b/library/poke/build.gradle
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id "com.jfrog.bintray" version "1.4"
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'com.jfrog.bintray'
 
 task sourceJar(type: Jar) {
     from sourceSets.main.java.srcDirs

From 84d93f8eb76cfe386f04eb8b567cc370a2039bce Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Thu, 29 Oct 2015 23:58:56 +1100
Subject: [PATCH 15/28] Hide init() away from BaseController but only in
 BaseControllerImpl

---
 .../main/java/com/shipdream/lib/android/mvc/MvcGraph.java   | 4 ++--
 .../lib/android/mvc/controller/BaseController.java          | 6 ------
 .../android/mvc/controller/internal/BaseControllerImpl.java | 1 -
 .../note/controller/internal/TestControllerBase.java        | 3 ++-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
index e32324a..86cf845 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
@@ -498,8 +498,8 @@ public T createInstance() throws ProvideException {
                 registerOnInjectedListener(new OnInjectedListener() {
                     @Override
                     public void onInjected(Object object) {
-                        if (object instanceof BaseController) {
-                            BaseController controller = (BaseController) object;
+                        if (object instanceof BaseControllerImpl) {
+                            BaseControllerImpl controller = (BaseControllerImpl) object;
                             controller.init();
                         }
                         unregisterOnInjectedListener(this);
diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/BaseController.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/BaseController.java
index eeb4362..f4b88ac 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/BaseController.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/BaseController.java
@@ -34,12 +34,6 @@ public interface BaseController<MODEL> {
      */
     MODEL getModel();
 
-    /**
-     * Initialized the controller and create an empty model. If a specific model needs to be bound
-     * to this controller use {@link #bindModel(Object, Object)}
-     */
-    void init();
-
     /**
      * Bind a prepared non-null model to the controller
      * @param sender Who wants to bind it
diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
index 9579baf..4da5a91 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
@@ -60,7 +60,6 @@ interface AndroidPoster {
 
     private MODEL model;
 
-    @Override
     public void init() {
         model = createModelInstance();
         eventBusC2C.register(this);
diff --git a/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java b/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java
index 8c897d1..3ec2488 100644
--- a/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java
+++ b/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java
@@ -18,6 +18,7 @@
 
 import com.shipdream.lib.android.mvc.MvcGraph;
 import com.shipdream.lib.android.mvc.controller.BaseController;
+import com.shipdream.lib.android.mvc.controller.internal.BaseControllerImpl;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
 import com.shipdream.lib.android.mvc.event.bus.internal.EventBusImpl;
 
@@ -59,7 +60,7 @@ public ExecutorService createExecutorService() {
         registerDependencies(mvcGraph);
         controllerToTest = createTestingController();
         mvcGraph.inject(controllerToTest);
-        controllerToTest.init();
+        ((BaseControllerImpl)controllerToTest).init();
     }
 
     @After

From dc3171c072b110e17688e72f8b38e1c55a2adb2b Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Fri, 30 Oct 2015 00:10:16 +1100
Subject: [PATCH 16/28] Replace onAttach(Activity activity) which is deprecated
 in Android SDK 23

---
 .../com/shipdream/lib/android/mvc/view/MvcActivity.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java
index 53ab562..6f81e08 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcActivity.java
@@ -16,7 +16,7 @@
 
 package com.shipdream.lib.android.mvc.view;
 
-import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -146,8 +146,8 @@ protected FragmentManager childFragmentManager() {
          * FIXME: ChildFragmentManager hack - remove this method when the bug is fixed in future android support library
          */
         @Override
-        public void onAttach(Activity activity) {
-            super.onAttach(activity);
+        public void onAttach(Context context) {
+            super.onAttach(context);
 
             if (retainedChildFragmentManager != null) {
                 //restore the last retained child fragment manager to the new

From e3da7a4e692cf1ca2accd663c1627cadd0c7a846 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Fri, 30 Oct 2015 00:19:03 +1100
Subject: [PATCH 17/28] Refactor controller.init to controller.onConstruct

---
 .../java/com/shipdream/lib/android/mvc/MvcGraph.java   |  9 +++------
 .../mvc/controller/internal/BaseControllerImpl.java    | 10 +++++++++-
 .../shipdream/lib/android/mvc/view/MvcFragment.java    |  6 ++++--
 .../controller/internal/WeatherControllerImpl.java     |  4 ++--
 .../note/controller/internal/TestControllerBase.java   |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
index 86cf845..7e6557d 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/MvcGraph.java
@@ -16,7 +16,6 @@
 
 package com.shipdream.lib.android.mvc;
 
-import com.shipdream.lib.android.mvc.controller.BaseController;
 import com.shipdream.lib.android.mvc.controller.internal.AsyncTask;
 import com.shipdream.lib.android.mvc.controller.internal.BaseControllerImpl;
 import com.shipdream.lib.android.mvc.event.bus.EventBus;
@@ -494,14 +493,12 @@ public MvcProvider(List<StateManaged> stateManagedObjects, Class<T> type, Class<
         public T createInstance() throws ProvideException {
             final T newInstance = (T) super.createInstance();
 
-            if (newInstance instanceof BaseController) {
+            if (newInstance instanceof BaseControllerImpl) {
                 registerOnInjectedListener(new OnInjectedListener() {
                     @Override
                     public void onInjected(Object object) {
-                        if (object instanceof BaseControllerImpl) {
-                            BaseControllerImpl controller = (BaseControllerImpl) object;
-                            controller.init();
-                        }
+                        BaseControllerImpl controller = (BaseControllerImpl) object;
+                        controller.onConstruct();
                         unregisterOnInjectedListener(this);
                     }
                 });
diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
index 4da5a91..9b89ffb 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
@@ -60,9 +60,17 @@ interface AndroidPoster {
 
     private MODEL model;
 
-    public void init() {
+    /**
+     * Called when the controller is constructed. Note that it could be called either when the
+     * controller is instantiated for the first time or restored by views.
+     *
+     * See {@link #restoreState(Object)}.
+     */
+    public void onConstruct() {
         model = createModelInstance();
         eventBusC2C.register(this);
+
+        //FIXME: should not be called here
         onInitialized();
     }
 
diff --git a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
index 9667995..e6bca32 100644
--- a/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
+++ b/library/android-mvc/src/main/java/com/shipdream/lib/android/mvc/view/MvcFragment.java
@@ -208,8 +208,10 @@ public void onCreate(Bundle savedInstanceState) {
         }
         injectDependencies();
 
-        if (savedInstanceState != null && !isStateManagedByRootDelegateFragment) {
-            DefaultStateKeeperHolder.restoreControllerStateByTheirOwn(savedInstanceState, this);
+        if (!isStateManagedByRootDelegateFragment) {
+            if (savedInstanceState != null) {
+                DefaultStateKeeperHolder.restoreControllerStateByTheirOwn(savedInstanceState, this);
+            }
         }
     }
 
diff --git a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/WeatherControllerImpl.java b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/WeatherControllerImpl.java
index 4c5f066..1535204 100644
--- a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/WeatherControllerImpl.java
+++ b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/WeatherControllerImpl.java
@@ -52,8 +52,8 @@ protected Class<WeatherModel> getModelClassType() {
     }
 
     @Override
-    public void init() {
-        super.init();
+    public void onConstruct() {
+        super.onConstruct();
         Map<WeatherModel.City, WeatherInfo> weatherWatchlist;
         String savedCities = preferenceService.getString(PREF_KEY_WEATHER_CITIES, null);
         if(savedCities != null) {
diff --git a/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java b/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java
index 3ec2488..f4d7ad8 100644
--- a/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java
+++ b/samples/note/core/src/test/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/TestControllerBase.java
@@ -60,7 +60,7 @@ public ExecutorService createExecutorService() {
         registerDependencies(mvcGraph);
         controllerToTest = createTestingController();
         mvcGraph.inject(controllerToTest);
-        ((BaseControllerImpl)controllerToTest).init();
+        ((BaseControllerImpl)controllerToTest).onConstruct();
     }
 
     @After

From 8e861473efc4b664395a5da36c806aadfd907b38 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Sun, 1 Nov 2015 11:14:54 +1100
Subject: [PATCH 18/28] Remove Controller.OnInitialized since it's usage was
 not as document described. And update documents for corresponding changes

---
 .../internal/BaseControllerImpl.java          | 19 +++++-------------
 .../internal/TestBaseControllerImpl.java      | 10 +++++-----
 .../inject/TestControllerSimpleInject.java    |  4 ++--
 .../controller/LifeCycleTestController.java   |  2 +-
 .../internal/LifeCycleTestControllerImpl.java |  6 +++---
 .../controller/internal/ControllerAImpl.java  |  4 ++--
 .../controller/internal/ControllerBImpl.java  |  4 ++--
 .../controller/internal/ControllerCImpl.java  |  4 ++--
 samples/note/android/src/assets/logback.xml   | 13 ++++++++++++
 .../view/fragment/NoteDetailFragment.java     |  7 ++++++-
 .../view/fragment/NoteTabletLandscape.java    | 20 ++++++++++++++-----
 .../note/controller/NoteController.java       |  2 +-
 .../internal/AppControllerImpl.java           |  5 ++++-
 .../internal/NoteControllerImpl.java          |  8 ++++----
 14 files changed, 65 insertions(+), 43 deletions(-)
 create mode 100644 samples/note/android/src/assets/logback.xml

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
index 9b89ffb..bd1b270 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
@@ -64,14 +64,13 @@ interface AndroidPoster {
      * Called when the controller is constructed. Note that it could be called either when the
      * controller is instantiated for the first time or restored by views.
      *
-     * See {@link #restoreState(Object)}.
+     * <p>The model of the controller will be instantiated by model's default no-argument constructor.
+     * However, if the controller needs to be restored, a new instance of model restored by
+     * {@link #restoreState(Object)} will replace the model created here.</p>
      */
     public void onConstruct() {
         model = createModelInstance();
         eventBusC2C.register(this);
-
-        //FIXME: should not be called here
-        onInitialized();
     }
 
     private MODEL createModelInstance() {
@@ -86,12 +85,6 @@ private MODEL createModelInstance() {
         }
     }
 
-    /**
-     * Called when the controller is newly initialized.
-     */
-    protected void onInitialized() {
-    }
-
     /**
      * Called when the controller is disposed. When the controller is not referenced any more this
      * should be called.
@@ -150,10 +143,8 @@ final public Class<MODEL> getStateType() {
      * Method of {@link StateManaged} that allows {@link StateKeeper} to save and get the state of
      * which is also the model the controller.
      * <p>
-     * Note that if the controller doesn't need to get its state saved and restored
-     * automatically. e.g. The controller always loads resource from remote services so that
-     * its state can be thought persisted by the remote services when {@link #getModelClassType()}
-     * returns null, the method will have no effect.
+     * Note that if the controller doesn't need its state saved and restored automatically return
+     * null in {@link #getModelClassType()} and then this method will have no effect.
      * </p>
      *
      * @param restoredState The restored state by {@link StateKeeper} that will be bound to the
diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/internal/TestBaseControllerImpl.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/internal/TestBaseControllerImpl.java
index 7ef5c22..15b996b 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/internal/TestBaseControllerImpl.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/internal/TestBaseControllerImpl.java
@@ -118,10 +118,10 @@ public void should_be_able_to_send_and_receive_c2c_events() throws Exception {
 
         Controller1 c1 = new Controller1();
         graph.inject(c1);
-        c1.init();
+        c1.onConstruct();
         Controller2 c2 = new Controller2();
         graph.inject(c2);
-        c2.init();
+        c2.onConstruct();
         c2.proxy = proxy;
 
         Event myEvent = new Event(this);
@@ -151,7 +151,7 @@ public void should_log_exception_when_posting_c2c_events_to_null_eventBus() thro
 
         TestController controller = new TestController();
         graph.inject(controller);
-        controller.init();
+        controller.onConstruct();
         controller.setLogger(loggerMock);
         controller.eventBusC2C = null;
 
@@ -171,7 +171,7 @@ public void should_log_exception_when_posting_c2v_events_to_null_eventBus() thro
 
         TestController controller = new TestController();
         graph.inject(controller);
-        controller.init();
+        controller.onConstruct();
         controller.setLogger(loggerMock);
         controller.mEventBusC2V = null;
 
@@ -199,6 +199,6 @@ protected Class<PrivateModel> getModelClassType() {
     public void should_throw_out_runtime_exception_when_unable_to_create_model_instance() throws Exception {
         BadController controller = new BadController();
         graph.inject(controller);
-        controller.init();
+        controller.onConstruct();
     }
 }
diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/TestControllerSimpleInject.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/TestControllerSimpleInject.java
index d9d17ff..90bd1f5 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/TestControllerSimpleInject.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/TestControllerSimpleInject.java
@@ -123,9 +123,9 @@ public void testOnDisposeShouldBeCalledWhenControllerReleased() throws Exception
         graph.register(new LifeCycleTestControllerComponent(lifeCycleProxy));
 
         TestLifCycleView testView = new TestLifCycleView();
-        verify(lifeCycleProxy, times(0)).initCalled();
+        verify(lifeCycleProxy, times(0)).onConstructCalled();
         graph.inject(testView);
-        verify(lifeCycleProxy, times(1)).initCalled();
+        verify(lifeCycleProxy, times(1)).onConstructCalled();
         verify(lifeCycleProxy, times(0)).disposeCalled();
 
         graph.release(testView);
diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/LifeCycleTestController.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/LifeCycleTestController.java
index db1a782..dd20ceb 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/LifeCycleTestController.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/LifeCycleTestController.java
@@ -20,7 +20,7 @@
 
 public interface LifeCycleTestController extends BaseController {
     interface Proxy {
-        void initCalled();
+        void onConstructCalled();
         void disposeCalled();
     }
 }
diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/internal/LifeCycleTestControllerImpl.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/internal/LifeCycleTestControllerImpl.java
index b1ed954..3c2f94a 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/internal/LifeCycleTestControllerImpl.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/inject/testNameMapping/controller/internal/LifeCycleTestControllerImpl.java
@@ -31,9 +31,9 @@ public Class getModelClassType() {
     }
 
     @Override
-    public void onInitialized() {
-        super.onInitialized();
-        proxy.initCalled();
+    public void onConstruct() {
+        super.onConstruct();
+        proxy.onConstructCalled();
     }
 
     @Override
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerAImpl.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerAImpl.java
index 63d2bad..1e82fdb 100644
--- a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerAImpl.java
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerAImpl.java
@@ -30,8 +30,8 @@ public Class<Model> getModelClassType() {
     }
 
     @Override
-    protected void onInitialized() {
-        super.onInitialized();
+    public void onConstruct() {
+        super.onConstruct();
         getModel().setTags(new ArrayList<String>());
     }
 
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerBImpl.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerBImpl.java
index 9c048c2..ecc429a 100644
--- a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerBImpl.java
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerBImpl.java
@@ -30,8 +30,8 @@ public Class<Model> getModelClassType() {
     }
 
     @Override
-    protected void onInitialized() {
-        super.onInitialized();
+    public void onConstruct() {
+        super.onConstruct();
         getModel().setTags(new ArrayList<String>());
     }
 
diff --git a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerCImpl.java b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerCImpl.java
index b1ba546..9306ccd 100644
--- a/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerCImpl.java
+++ b/library/android-mvc-test/src/main/java/com/shipdream/lib/android/mvc/view/injection/controller/internal/ControllerCImpl.java
@@ -30,8 +30,8 @@ public Class<Model> getModelClassType() {
     }
 
     @Override
-    protected void onInitialized() {
-        super.onInitialized();
+    public void onConstruct() {
+        super.onConstruct();
         getModel().setTags(new ArrayList<String>());
     }
 
diff --git a/samples/note/android/src/assets/logback.xml b/samples/note/android/src/assets/logback.xml
new file mode 100644
index 0000000..5f36992
--- /dev/null
+++ b/samples/note/android/src/assets/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+
+    <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
+        <encoder>
+            <pattern>%msg</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="logcat" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java b/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java
index edab720..b895a63 100644
--- a/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java
+++ b/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java
@@ -26,11 +26,15 @@
 import com.shipdream.lib.android.mvc.samples.note.controller.NoteController;
 import com.shipdream.lib.android.mvc.samples.note.model.dto.Note;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.inject.Inject;
 
 public class NoteDetailFragment extends BaseFragment {
     private TextView title;
     private TextView content;
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Inject
     private NoteController noteController;
@@ -68,7 +72,7 @@ public void onResume() {
     @Override
     public void onPause() {
         super.onPause();
-        noteController.updateViewingNote(title.getText().toString(), content.getText().toString());
+        noteController.updateViewingNote(this, title.getText().toString(), content.getText().toString());
     }
 
     private void onEvent(NoteController.EventC2V.OnNoteSelected event) {
@@ -77,5 +81,6 @@ private void onEvent(NoteController.EventC2V.OnNoteSelected event) {
 
     public void onEvent(NoteController.EventC2V.OnNoteUpdated event) {
         Toast.makeText(getActivity(), "Note updated.", Toast.LENGTH_SHORT).show();
+        logger.debug("Note updated by {}", event.getSender().hashCode());
     }
 }
diff --git a/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteTabletLandscape.java b/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteTabletLandscape.java
index fb17464..9a73c62 100644
--- a/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteTabletLandscape.java
+++ b/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteTabletLandscape.java
@@ -25,6 +25,9 @@
 import com.shipdream.lib.android.mvc.samples.note.R;
 
 public class NoteTabletLandscape extends BaseFragment {
+    private final static String LIST_FRAG_TAG = NoteTabletLandscape.class.getSimpleName() + ":ListFrag";
+    private final static String DETAIL_FRAG_TAG = NoteTabletLandscape.class.getSimpleName() + ":DetailFrag";
+
     @Override
     protected int getLayoutResId() {
         return R.layout.fragment_note_large;
@@ -34,13 +37,20 @@ protected int getLayoutResId() {
     public void onViewReady(View view, Bundle savedInstanceState, Reason reason) {
         super.onViewReady(view, savedInstanceState, reason);
         if(getCurrentOrientation() == Configuration.ORIENTATION_LANDSCAPE) {
-            NoteListFragment noteListFragment = new NoteListFragment();
-            NoteDetailFragment noteDetailFragment = new NoteDetailFragment();
-
             FragmentManager fm = getChildFragmentManager();
+
+            NoteListFragment noteListFragment = (NoteListFragment) fm.findFragmentByTag(LIST_FRAG_TAG);
+            if (noteListFragment == null) {
+                noteListFragment = new NoteListFragment();
+            }
+            NoteDetailFragment noteDetailFragment = (NoteDetailFragment) fm.findFragmentByTag(DETAIL_FRAG_TAG);
+            if (noteDetailFragment == null) {
+                noteDetailFragment = new NoteDetailFragment();
+            }
+
             FragmentTransaction trans = fm.beginTransaction();
-            trans.replace(R.id.note_large_leftPane, noteListFragment);
-            trans.replace(R.id.note_large_rightPane, noteDetailFragment);
+            trans.replace(R.id.note_large_leftPane, noteListFragment, LIST_FRAG_TAG);
+            trans.replace(R.id.note_large_rightPane, noteDetailFragment, DETAIL_FRAG_TAG);
             trans.commit();
         }
     }
diff --git a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/NoteController.java b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/NoteController.java
index 5892e86..9761f5e 100644
--- a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/NoteController.java
+++ b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/NoteController.java
@@ -64,7 +64,7 @@ public interface NoteController extends BaseController<NoteModel> {
      * @param title The title
      * @param content The content
      */
-    void updateViewingNote(String title, String content);
+    void updateViewingNote(Object sender, String title, String content);
 
     /**
      * Removes all selected notes and raises {@link EventC2V.OnNoteRemoved}
diff --git a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/AppControllerImpl.java b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/AppControllerImpl.java
index 1e51e51..6c88795 100644
--- a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/AppControllerImpl.java
+++ b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/AppControllerImpl.java
@@ -68,7 +68,10 @@ public Orientation getCurrentOrientation() {
 
     private void showPortrait() {
         NavigationController.Model navModel = navigationController.getModel();
-        String curLocId = navModel.getCurrentLocation().getLocationId();
+        String curLocId = "";
+        if (navModel.getCurrentLocation() != null) {
+            curLocId = navModel.getCurrentLocation().getLocationId();
+        }
         //If we are viewing note, update the navigation history and navigate to proper location
         if(curLocId.equals(LocId.NOTE_HANDSET_DETAIL)
                 || curLocId.equals(LocId.NOTE_HANDSET_LIST)
diff --git a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/NoteControllerImpl.java b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/NoteControllerImpl.java
index a0e0390..c2b5358 100644
--- a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/NoteControllerImpl.java
+++ b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/controller/internal/NoteControllerImpl.java
@@ -50,8 +50,8 @@ public class NoteControllerImpl extends BaseControllerImpl<NoteModel> implements
     private NavigationController navigationController;
 
     @Override
-    protected void onInitialized() {
-        super.onInitialized();
+    public void onConstruct() {
+        super.onConstruct();
 
         String json = preferenceService.getString(PREF_KEY_NOTES, null);
         List<Note> notes;
@@ -122,14 +122,14 @@ public void addNote(String title, String content) {
     }
 
     @Override
-    public void updateViewingNote(String title, String content) {
+    public void updateViewingNote(Object sender, String title, String content) {
         Note note = getModel().getViewingNote();
         if(note != null) {
             note.setTitle(title);
             note.setContent(content);
             note.setUpdateTime(System.currentTimeMillis());
             persistNotes();
-            postC2VEvent(new EventC2V.OnNoteUpdated(this));
+            postC2VEvent(new EventC2V.OnNoteUpdated(sender));
         }
     }
 

From b8ea6a2c25f229ba4299b55e43ea3f0cd6fba5c1 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Sun, 1 Nov 2015 11:36:06 +1100
Subject: [PATCH 19/28] Avoid duplicate calls to save updated note

---
 .../mvc/samples/note/view/fragment/NoteDetailFragment.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java b/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java
index b895a63..ea09a5b 100644
--- a/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java
+++ b/samples/note/android/src/main/java/com/shipdream/lib/android/mvc/samples/note/view/fragment/NoteDetailFragment.java
@@ -72,7 +72,9 @@ public void onResume() {
     @Override
     public void onPause() {
         super.onPause();
-        noteController.updateViewingNote(this, title.getText().toString(), content.getText().toString());
+        if (isVisible()) {
+            noteController.updateViewingNote(this, title.getText().toString(), content.getText().toString());
+        }
     }
 
     private void onEvent(NoteController.EventC2V.OnNoteSelected event) {

From 25143ed639c513eb6c4af3c5f5ab209d89ba8d4f Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Sun, 1 Nov 2015 13:28:25 +1100
Subject: [PATCH 20/28] Add new call back for controllers onRestored()

---
 .../mvc/controller/internal/BaseControllerImpl.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
index bd1b270..f029107 100644
--- a/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
+++ b/library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/controller/internal/BaseControllerImpl.java
@@ -86,8 +86,8 @@ private MODEL createModelInstance() {
     }
 
     /**
-     * Called when the controller is disposed. When the controller is not referenced any more this
-     * should be called.
+     * Called when the controller is disposed. This occurs when the controller is de-referenced and
+     * not retained by any objects.
      */
     @Override
     public void onDisposed() {
@@ -155,6 +155,13 @@ final public void restoreState(MODEL restoredState) {
         if (getModelClassType() != null) {
             bindModel(this, restoredState);
         }
+        onRestored();
+    }
+
+    /**
+     * Called when the controller is restored after {@link #restoreState(Object)} is called.
+     */
+    public void onRestored() {
     }
 
     @Override

From 47a6d2224e0b7646f1cbcdb2915460bedcd0f840 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Sun, 1 Nov 2015 17:16:15 +1100
Subject: [PATCH 21/28] Update ChangeLog

---
 ChangeLog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 65f46b8..909deb6 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,8 @@ Version: 1.4.0
 * Refactor of class AndroidMvc so that controllers can access the MvcGraph
 * EventBusV2V is injectable same as EventBusC2V and EventBusC2C
 * Add method "use" in MvcGraph to consume an injectable classes which doesn't require a class field marked by @Inject
+* Remove BaseControllerImpl.onInitialized and replaced by onConstruct since onInitialized is also called when the controller is restored
+* Add call back BaseControllerImpl.onRestored
 
 Version: 1.3.0
 * Refactor the MvcFragment.Reason object.

From ddb6120c2369a323b1479d02cf89e2ca1675e197 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 20:21:05 +1100
Subject: [PATCH 22/28] Specify gradle wrapper version

---
 library/android-mvc/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/android-mvc/build.gradle b/library/android-mvc/build.gradle
index 4f5bf01..ca6ba9e 100644
--- a/library/android-mvc/build.gradle
+++ b/library/android-mvc/build.gradle
@@ -130,4 +130,8 @@ bintray {
         licenses = ["Apache-2.0"]
         publish = rootProject.ext.shouldPublish
     }
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.4'
 }
\ No newline at end of file

From 0725fcedb833a028370c09cee904586f89a78e07 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 20:38:56 +1100
Subject: [PATCH 23/28] Fix build

---
 build.gradle                     | 4 ----
 library/android-mvc/build.gradle | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 89c4151..18c29d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,8 +128,4 @@ tasks.coveralls {
 
     dependsOn jacocoRootReport
     onlyIf { System.env.'CI' }
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
 }
\ No newline at end of file
diff --git a/library/android-mvc/build.gradle b/library/android-mvc/build.gradle
index ca6ba9e..4f5bf01 100644
--- a/library/android-mvc/build.gradle
+++ b/library/android-mvc/build.gradle
@@ -130,8 +130,4 @@ bintray {
         licenses = ["Apache-2.0"]
         publish = rootProject.ext.shouldPublish
     }
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
 }
\ No newline at end of file

From 33d4b88f0588d1af692bba8797170f71f8afc080 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 20:41:31 +1100
Subject: [PATCH 24/28] Update gradle.properties

---
 gradle/wrapper/gradle-wrapper.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4bd6796..83e4ce0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+- add org.gradle.daemon=true
\ No newline at end of file

From 0bc1b4540b0f4b41e6f51c67fa723e51c6c681ae Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 21:10:09 +1100
Subject: [PATCH 25/28] Fix compile error in samples due to library contract
 changes

---
 .../android/mvc/controller/BaseNavigationControllerTest.java  | 4 ++--
 .../lib/android/mvc/controller/TestRunAsyncTask.java          | 2 +-
 .../simple/controller/internal/TestCounterController.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/BaseNavigationControllerTest.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/BaseNavigationControllerTest.java
index a57ab11..fe9daba 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/BaseNavigationControllerTest.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/BaseNavigationControllerTest.java
@@ -21,13 +21,13 @@
 import org.junit.Before;
 
 public class BaseNavigationControllerTest extends BaseControllerTest{
-    protected NavigationController navigationController;
+    protected NavigationControllerImpl navigationController;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         navigationController = new NavigationControllerImpl();
         graph.inject(navigationController);
-        navigationController.init();
+        navigationController.onConstruct();
     }
 }
diff --git a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/TestRunAsyncTask.java b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/TestRunAsyncTask.java
index f411dcf..7f00e18 100644
--- a/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/TestRunAsyncTask.java
+++ b/library/android-mvc-controller/src/test/java/com/shipdream/lib/android/mvc/controller/TestRunAsyncTask.java
@@ -53,7 +53,7 @@ public void setUp() throws Exception {
 
         controller = new MyControllerImpl();
         graph.inject(controller);
-        controller.init();
+        controller.onConstruct();
 
         eventMonitor = mock(EventMonitor.class);
         eventBusC2V.register(eventMonitor);
diff --git a/samples/simple/src/test/java/com/shipdream/lib/android/mvc/samples/simple/controller/internal/TestCounterController.java b/samples/simple/src/test/java/com/shipdream/lib/android/mvc/samples/simple/controller/internal/TestCounterController.java
index b8bff38..f6a89cf 100644
--- a/samples/simple/src/test/java/com/shipdream/lib/android/mvc/samples/simple/controller/internal/TestCounterController.java
+++ b/samples/simple/src/test/java/com/shipdream/lib/android/mvc/samples/simple/controller/internal/TestCounterController.java
@@ -61,7 +61,7 @@ public static void beforeClass() {
     //The graph used to inject
     private MvcGraph mvcGraph;
 
-    private CounterController counterController;
+    private CounterControllerImpl counterController;
 
     @Before
     public void setUp() throws Exception {
@@ -93,7 +93,7 @@ public ExecutorService createExecutorService() {
         mvcGraph.inject(counterController);
 
         //init controller
-        counterController.init();
+        counterController.onConstruct();
     }
 
     @Test

From e14a47dd44ce13aceb71cd3131f6c38ef4f5efd9 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 21:38:53 +1100
Subject: [PATCH 26/28] Fix issue weather cannot be loaded due to weather API
 changes

---
 .../note/android/src/{ => main}/assets/logback.xml   |  1 -
 .../service/http/internal/WeatherServiceImpl.java    | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename samples/note/android/src/{ => main}/assets/logback.xml (99%)

diff --git a/samples/note/android/src/assets/logback.xml b/samples/note/android/src/main/assets/logback.xml
similarity index 99%
rename from samples/note/android/src/assets/logback.xml
rename to samples/note/android/src/main/assets/logback.xml
index 5f36992..f5f8ed9 100644
--- a/samples/note/android/src/assets/logback.xml
+++ b/samples/note/android/src/main/assets/logback.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
     <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
         <encoder>
             <pattern>%msg</pattern>
diff --git a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/service/http/internal/WeatherServiceImpl.java b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/service/http/internal/WeatherServiceImpl.java
index 240cb36..fca61e0 100644
--- a/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/service/http/internal/WeatherServiceImpl.java
+++ b/samples/note/core/src/main/java/com/shipdream/lib/android/mvc/samples/note/service/http/internal/WeatherServiceImpl.java
@@ -23,13 +23,18 @@
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.List;
 
 public class WeatherServiceImpl implements WeatherService{
+    private final static String APPKEY = "e28e969eb96b3d4929abd12d42a9513d";
     private OkHttpClient httpClient;
     private Gson gson;
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     public WeatherServiceImpl() {
         httpClient = new OkHttpClient();
@@ -45,14 +50,15 @@ public WeatherListResponse getWeathers(List<Integer> ids) throws IOException {
             }
             idsStr += String.valueOf(id);
         }
-        String url = String.format("http://api.openweathermap.org/data/2.5/group?id=%s&units=metric",
-                URLEncoder.encode(idsStr, "UTF-8"));
+        String url = String.format("http://api.openweathermap.org/data/2.5/group?id=%s&appId=%s",
+                URLEncoder.encode(idsStr, "UTF-8"), APPKEY);
         Request request = new Request.Builder()
                 .url(url)
                 .get()
                 .build();
         Response resp = httpClient.newCall(request).execute();
-        String responseStr = resp.toString();
+        String responseStr = resp.body().string();
+        logger.debug("Weather Service Response: {}", responseStr);
         return gson.fromJson(responseStr, WeatherListResponse.class);
     }
 }

From 091585d65587fc8a3436340f2d382cf829054d9b Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 22:11:37 +1100
Subject: [PATCH 27/28] Update document to include jCenter badge

---
 README.md                        | 5 ++++-
 documents/sites/Site-MarkDown.md | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c64879a..bfe46e8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # AndroidMvc Framework
 [![Build Status](https://travis-ci.org/kejunxia/AndroidMvc.svg?branch=ci-travis)](https://travis-ci.org/kejunxia/AndroidMvc)
 [![Coverage Status](https://coveralls.io/repos/kejunxia/AndroidMvc/badge.svg)](https://coveralls.io/r/kejunxia/AndroidMvc)
+[![Download](https://api.bintray.com/packages/kejunxia/maven/android-mvc/images/download.svg)](https://bintray.com/kejunxia/maven/android-mvc/_latestVersion)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc)
 
 # Website
@@ -26,7 +27,9 @@
    See [**Source code** here](https://github.com/kejunxia/AndroidMvc/tree/master/samples/note) and download [**Sample APK** here](https://docs.google.com/uc?authuser=0&id=0BwcZml9gnwoZOHcxZFI3Z0ZGUUk&export=download)
 
 ## Download
-The library is currently release to jCenter and MavenCentral
+The library is currently released to both
+* jCenter [![Download](https://api.bintray.com/packages/kejunxia/maven/android-mvc/images/download.svg)](https://bintray.com/kejunxia/maven/android-mvc/_latestVersion)
+* Maven Central [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc)
 
 **Maven:**
 ```xml
diff --git a/documents/sites/Site-MarkDown.md b/documents/sites/Site-MarkDown.md
index b3c9ad9..d0ea921 100644
--- a/documents/sites/Site-MarkDown.md
+++ b/documents/sites/Site-MarkDown.md
@@ -33,7 +33,9 @@ First of all, let's look at some problems of the Android development below:
   - Well tested by jUnit and instrument test with Espresso.
 
 ## Download
-The library is currently release to jCenter and MavenCentral
+The library is currently released to both
+* jCenter [![Download](https://api.bintray.com/packages/kejunxia/maven/android-mvc/images/download.svg)](https://bintray.com/kejunxia/maven/android-mvc/_latestVersion)
+* Maven Central [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc)
 
 **Maven:**
 ```xml

From 3f993e207e61a17e1b5373f6bc0a3e0c25126485 Mon Sep 17 00:00:00 2001
From: Kejun Xia <ideablast@gmail.com>
Date: Mon, 2 Nov 2015 22:30:21 +1100
Subject: [PATCH 28/28] Use referenced version in readme and on website

---
 README.md                        | 4 ++--
 documents/sites/Site-MarkDown.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index bfe46e8..27a442f 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,13 @@ The library is currently released to both
 <dependency>
     <groupId>com.shipdream</groupId>
     <artifactId>android-mvc</artifactId>
-    <version>1.4.0</version>
+    <version>[LatestVersion]</version>
 </dependency>
 ```
 
 **Gradle:**
 ```groovy
-compile "com.shipdream:android-mvc:1.4.0"
+compile "com.shipdream:android-mvc:[LatestVersion]"
 ```
 
 ## Dependency injection with reference count
diff --git a/documents/sites/Site-MarkDown.md b/documents/sites/Site-MarkDown.md
index d0ea921..c00d186 100644
--- a/documents/sites/Site-MarkDown.md
+++ b/documents/sites/Site-MarkDown.md
@@ -42,13 +42,13 @@ The library is currently released to both
 <dependency>
     <groupId>com.shipdream</groupId>
     <artifactId>android-mvc</artifactId>
-    <version>1.4.0</version>
+    <version>[LatestVersion]</version>
 </dependency>
 ```
 
 **Gradle:**
 ```groovy
-compile "com.shipdream:android-mvc:1.4.0"
+compile "com.shipdream:android-mvc:[LatestVersion]"
 ```
 
 ## Samples