viewController holds ref to navigationController

lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -3,7 +3,6 @@ package com.reactnativenavigation;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
-import android.view.View;
 import android.widget.FrameLayout;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -11,7 +10,6 @@ import com.reactnativenavigation.layout.Layout;
 import com.reactnativenavigation.layout.impl.StackLayout;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
-	private View contentView;
 	private Layout layout;
 
 	@Override
@@ -39,11 +37,6 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 		app().getInitializer().onActivityDestroyed(this);
 	}
 
-	@Override
-	public void setContentView(View contentView) {
-		super.setContentView(contentView);
-		this.contentView = contentView;
-	}
 
 	public void setLayout(Layout layout) {
 		this.layout = layout;
@@ -53,11 +46,6 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 		return layout;
 	}
 
-	@Nullable
-	public View getContentView() {
-		return contentView;
-	}
-
 	@Override
 	public void invokeDefaultOnBackPressed() {
 		onBackPressed();

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/NavigationController.java

@@ -8,7 +8,7 @@ public class NavigationController extends ViewController {
 
 	public NavigationController(ViewController... childControllers) {
 		for (ViewController childController : childControllers) {
-			this.childControllers.push(childController);
+			push(childController);
 		}
 	}
 
@@ -18,6 +18,7 @@ public class NavigationController extends ViewController {
 
 	public void push(final ViewController child) {
 		childControllers.push(child);
+		child.setNavigationController(this);
 	}
 
 	public void pop() {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -1,9 +1,11 @@
 package com.reactnativenavigation.viewcontrollers;
 
+import android.support.annotation.Nullable;
 import android.view.View;
 
 public class ViewController {
 	private View view;
+	private NavigationController navigationController;
 
 	public View getView() {
 		return view;
@@ -12,4 +14,13 @@ public class ViewController {
 	public void setView(final View view) {
 		this.view = view;
 	}
+
+	@Nullable
+	public NavigationController getNavigationController() {
+		return navigationController;
+	}
+
+	void setNavigationController(final NavigationController navigationController) {
+		this.navigationController = navigationController;
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigationControllerTest.java

@@ -63,4 +63,13 @@ public class NavigationControllerTest extends BaseTest {
 		assertThat(uut.isEmpty()).isFalse();
 	}
 
+	@Test
+	public void pushAssignsRefToSelfOnPushedController() throws Exception {
+		assertThat(child1.getNavigationController()).isNull();
+		uut.push(child1);
+		assertThat(child1.getNavigationController()).isEqualTo(uut);
+
+		NavigationController anotherNavController = new NavigationController(child2);
+		assertThat(child2.getNavigationController()).isEqualTo(anotherNavController);
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ViewControllerTest.java

@@ -10,14 +10,27 @@ import org.robolectric.shadow.api.Shadow;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class ViewControllerTest extends BaseTest {
+
+	private ViewController uut;
+
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		uut = new ViewController();
+	}
+
 	@Test
 	public void holdsAView() throws Exception {
-		ViewController uut = new ViewController();
 		assertThat(uut.getView()).isNull();
 		View view = Shadow.newInstanceOf(View.class);
 		uut.setView(view);
 		assertThat(uut.getView()).isEqualTo(view);
 	}
 
-
+	@Test
+	public void holdsAReferenceToNavigationControllerOrNull() throws Exception {
+		assertThat(uut.getNavigationController()).isNull();
+		NavigationController nav = new NavigationController(uut);
+		assertThat(uut.getNavigationController()).isEqualTo(nav);
+	}
 }