Merge pull request #27 from grandcentrix/bugfix/view_is_null_before_s…

…ubscriptions_are_unsubscribed Fix view beeing null before unsubscribing from Subscriptions
GCX-HCI · Nov 4, 2016 · ef4ed67 · ef4ed67
2 parents e3e7718 + d5e62a6
commit ef4ed67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/thirtyinch/src/main/java/net/grandcentrix/thirtyinch/TiPresenter.java b/thirtyinch/src/main/java/net/grandcentrix/thirtyinch/TiPresenter.java
@@ -265,8 +265,8 @@ public final void detachView() {
                     + " did not call through to super.onDetachView()");
         }
 
-        mView = null;
         moveToState(State.VIEW_DETACHED, true);
+        mView = null;
     }
 
     /**

diff --git a/thirtyinch/src/test/java/net/grandcentrix/thirtyinch/TiLifecycleObserverTest.java b/thirtyinch/src/test/java/net/grandcentrix/thirtyinch/TiLifecycleObserverTest.java
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static junit.framework.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.mockito.Mockito.mock;
@@ -161,7 +162,7 @@ public void testSleep() throws Exception {
             @Override
             public void onChange(final TiPresenter.State state,
                     final boolean beforeLifecycleEvent) {
-                states.add(new Object[]{state, beforeLifecycleEvent});
+                states.add(new Object[]{state, beforeLifecycleEvent, mPresenter.getView()});
             }
         });
 
@@ -172,10 +173,12 @@ public void onChange(final TiPresenter.State state,
         final Object[] beforeLast = states.get(states.size() - 2);
         assertEquals(beforeLast[0], TiPresenter.State.VIEW_DETACHED);
         assertEquals(beforeLast[1], false);
+        assertNotNull(beforeLast[2]);
 
         final Object[] last = states.get(states.size() - 1);
         assertEquals(last[0], TiPresenter.State.VIEW_DETACHED);
         assertEquals(last[1], true);
+        assertNotNull(last[2]);
     }
 
     @Test
@@ -185,7 +188,7 @@ public void testWakeup() throws Exception {
             @Override
             public void onChange(final TiPresenter.State state,
                     final boolean beforeLifecycleEvent) {
-                states.add(new Object[]{state, beforeLifecycleEvent});
+                states.add(new Object[]{state, beforeLifecycleEvent, mPresenter.getView()});
             }
         });
 
@@ -195,9 +198,11 @@ public void onChange(final TiPresenter.State state,
         final Object[] beforeLast = states.get(states.size() - 2);
         assertEquals(beforeLast[0], TiPresenter.State.VIEW_ATTACHED);
         assertEquals(beforeLast[1], false);
+        assertNotNull(beforeLast[2]);
 
         final Object[] last = states.get(states.size() - 1);
         assertEquals(last[0], TiPresenter.State.VIEW_ATTACHED);
         assertEquals(last[1], true);
+        assertNotNull(last[2]);
     }
 }