findParentStackControllerForChildId

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

@@ -66,22 +66,16 @@ public class Navigator extends ParentController {
 	}
 
 	public void push(final String fromId, final ViewController viewController) {
-		ViewController found = findControllerById(fromId);
-		if (found == null) return;
-
-		StackController parentStackController = found.getParentStackController();
-		if (parentStackController == null) return;
-
-		parentStackController.push(viewController);
+		StackController parentStackController = findParentStackControllerForChildId(fromId);
+		if (parentStackController != null) {
+			parentStackController.push(viewController);
+		}
 	}
 
 	public void pop(final String fromId) {
-		ViewController found = findControllerById(fromId);
-		if (found == null) return;
-
-		StackController parentStackController = found.getParentStackController();
-		if (parentStackController == null) return;
-
-		parentStackController.pop();
+		StackController parentStackController = findParentStackControllerForChildId(fromId);
+		if (parentStackController != null) {
+			parentStackController.pop();
+		}
 	}
 }

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -24,6 +25,7 @@ public abstract class ParentController extends ViewController {
 
 	public abstract Collection<ViewController> getChildControllers();
 
+	@Nullable
 	public ViewController findControllerById(final String id) {
 		ViewController fromSuper = super.findControllerById(id);
 		if (fromSuper != null) {
@@ -37,4 +39,10 @@ public abstract class ParentController extends ViewController {
 
 		return null;
 	}
+
+	@Nullable
+	public StackController findParentStackControllerForChildId(final String childId) {
+		ViewController found = findControllerById(childId);
+		return found != null ? found.getParentStackController() : null;
+	}
 }

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

@@ -90,4 +90,30 @@ public class ParentControllerTest extends BaseTest {
 		assertThat(uut.findControllerById("child1")).isEqualTo(child1);
 		assertThat(uut.findControllerById("child2")).isEqualTo(child2);
 	}
+
+	@Test
+	public void findParentStackControllerForChildId() throws Exception {
+		ViewController child1 = new SimpleViewController(activity, "child1");
+		ViewController child2 = new SimpleViewController(activity, "child2");
+
+		final StackController someInnerStack = new StackController(activity, "stack1");
+		someInnerStack.push(child1);
+		someInnerStack.push(child2);
+
+		ParentController uut = new ParentController(activity, "uut") {
+			@Override
+			public Collection<ViewController> getChildControllers() {
+				return Arrays.<ViewController>asList(someInnerStack);
+			}
+
+			@NonNull
+			@Override
+			protected View createView() {
+				return new FrameLayout(activity);
+			}
+		};
+
+		assertThat(uut.findParentStackControllerForChildId("not existing child")).isNull();
+		assertThat(uut.findParentStackControllerForChildId("child2")).isEqualTo(someInnerStack);
+	}
 }