Fix manageViewSubcription when there isn't any view attached

rx/src/main/java/net/grandcentrix/thirtyinch/rx/RxTiPresenterSubscriptionHandler.java

@@ -36,12 +36,15 @@ public RxTiPresenterSubscriptionHandler(final TiPresenter presenter) {
             public void onChange(final TiPresenter.State state,
                     final boolean beforeLifecycleEvent) {
                 if (state == TiPresenter.State.VIEW_DETACHED && beforeLifecycleEvent) {
-                    // unsubscribe all UI subscriptions created in wakeUp() and added
+                    // unsubscribe all UI subscriptions created in onAttachView() and added
                     // via manageViewSubscription(Subscription)
                     if (mUiSubscriptions != null) {
                         mUiSubscriptions.unsubscribe();
+                        mUiSubscriptions = null;
                     }
-                    // there is no reuse possible. recreation works fine
+                }
+
+                if (state == TiPresenter.State.VIEW_ATTACHED && beforeLifecycleEvent) {
                     mUiSubscriptions = new CompositeSubscription();
                 }
 

rx/src/test/java/net/grandcentrix/thirtyinch/rx/RxTiPresenterSubscriptionHandlerTest.java

@@ -91,42 +91,61 @@ public void testManageSubscription_WithDestroy_ShouldUnsubscribe() throws Except
         testSubscriber.assertUnsubscribed();
     }
 
-    @Test(expected = AssertionError.class)
-    public void testManageViewSubscription_DetachBeforeAttach_ShouldThrowAssertError()
+    @Test
+    public void testManageViewSubscription_WithDetachSingleSub_ShouldUnsubscribe()
             throws Exception {
         mPresenter.create();
+        mPresenter.attachView(mView);
         TestSubscriber<Integer> testSubscriber = new TestSubscriber<>();
 
         mSubscriptionHandler.manageViewSubscription(testSubscriber);
-        mPresenter.detachView();
+        assertThat(testSubscriber.isUnsubscribed(), equalTo(false));
 
+        mPresenter.detachView();
         testSubscriber.assertUnsubscribed();
     }
 
     @Test
-    public void testManageViewSubscription_WithDetachSingleSub_ShouldUnsubscribe()
-            throws Exception {
+    public void testManageViewSubscription_WithDetachView_ShouldUnsubscribe() throws Exception {
         mPresenter.create();
         mPresenter.attachView(mView);
         TestSubscriber<Integer> testSubscriber = new TestSubscriber<>();
 
         mSubscriptionHandler.manageViewSubscription(testSubscriber);
-        assertThat(testSubscriber.isUnsubscribed(), equalTo(false));
-
         mPresenter.detachView();
+
         testSubscriber.assertUnsubscribed();
     }
 
     @Test
-    public void testManageViewSubscription_WithDetachView_ShouldUnsubscribe() throws Exception {
+    public void testManageViewSubscription_manageBeforeViewAttached_ShouldThrowIllegalStateException()
+            throws Exception {
         mPresenter.create();
-        mPresenter.attachView(mView);
         TestSubscriber<Integer> testSubscriber = new TestSubscriber<>();
 
-        mSubscriptionHandler.manageViewSubscription(testSubscriber);
+        try {
+            mSubscriptionHandler.manageViewSubscription(testSubscriber);
+            fail("no exception");
+        } catch (Exception e) {
+            assertThat(e.getMessage(), containsString("when there is no view"));
+        }
+    }
+
+    @Test
+    public void testManageViewSubscription_manageAfterDetach_ShouldThrowIllegalStateException()
+            throws Exception {
+        mPresenter.create();
+        mPresenter.attachView(mView);
         mPresenter.detachView();
 
-        testSubscriber.assertUnsubscribed();
+        TestSubscriber<Integer> testSubscriber = new TestSubscriber<>();
+
+        try {
+            mSubscriptionHandler.manageViewSubscription(testSubscriber);
+            fail("no exception");
+        } catch (Exception e) {
+            assertThat(e.getMessage(), containsString("when there is no view"));
+        }
     }
 
     @Test