fixed e2e

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

@@ -43,6 +43,14 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 		this.contentView = contentView;
 	}
 
+	public void setLayout(Layout layout) {
+		this.layout = layout;
+	}
+
+	public Layout getLayout() {
+		return layout;
+	}
+
 	@Nullable
 	public View getContentView() {
 		return contentView;
@@ -55,7 +63,9 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (!(contentView instanceof LayoutStack) || !((LayoutStack) contentView).onBackPressed()) {
+		if (layout instanceof LayoutStack && ((LayoutStack) layout).onBackPressed()) {
+			// do nothing, layout pops
+		} else {
 			super.onBackPressed();
 		}
 	}

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -37,6 +37,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
 				final Layout rootView = factory.create(layoutTree);
 				activity().setContentView(rootView.getView());
+				activity().setLayout(rootView);
 			}
 		});
 	}
@@ -49,7 +50,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
 				final Layout rootView = factory.create(layoutTree);
-				((LayoutStack) activity().getContentView()).push(rootView);
+				((LayoutStack) activity().getLayout()).push(rootView);
 			}
 		});
 	}
@@ -59,7 +60,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				((LayoutStack) activity().getContentView()).pop();
+				((LayoutStack) activity().getLayout()).pop();
 			}
 		});
 	}