fix(android): null out Ti.UI.Window's navigationWindow property befor…

…e close event

android/modules/ui/src/java/ti/modules/titanium/ui/NavigationWindowProxy.java

@@ -48,8 +48,7 @@ public void popToRootWindow(@Kroll.argument(optional = true) Object arg)
 		// Keep first "root" window
 		for (int i = windows.size() - 1; i > 0; i--) {
 			TiWindowProxy window = windows.get(i);
-			window.close(arg);
-			windows.remove(window);
+			closeWindow(window, arg);
 		}
 	}
 
@@ -99,9 +98,10 @@ public void closeWindow(Object childToClose, @Kroll.argument(optional = true) Ob
 			return;
 		}
 
-		windows.remove(childToClose);
-		((TiWindowProxy) childToClose).close(arg);
-		((TiWindowProxy) childToClose).setNavigationWindow(null);
+		TiWindowProxy window = (TiWindowProxy) childToClose;
+		windows.remove(window);
+		window.setNavigationWindow(null);
+		window.close(arg);
 	}
 
 	@Override

tests/Resources/ti.ui.navigationwindow.test.js

@@ -149,30 +149,29 @@ describe.windowsMissing('Titanium.UI.NavigationWindow', function () {
 		nav = Ti.UI.createNavigationWindow({
 			window: rootWindow
 		});
-		should(nav.popToRootWindow).be.a.function;
+		should(nav.popToRootWindow).be.a.Function();
 
-		rootWindow.addEventListener('open', function () {
-			setTimeout(function () {
-				nav.openWindow(subWindow);
-			}, 1);
+		rootWindow.addEventListener('open', function open() {
+			rootWindow.removeEventListener('open', open);
+			setTimeout(() => nav.openWindow(subWindow), 1);
 		});
 
-		subWindow.addEventListener('close', function () {
+		subWindow.addEventListener('close', function close () {
+			subWindow.removeEventListener('close', close);
 			try {
 				should(subWindow.navigationWindow).not.be.ok(); // null or undefined
 				// how else can we tell it got closed? I don't think a visible check is right...
 				// win should not be closed!
 				should(rootWindow.navigationWindow).eql(nav);
-				finish();
 			} catch (err) {
-				finish(err);
+				return finish(err);
 			}
+			finish();
 		});
 
-		subWindow.addEventListener('open', function () {
-			setTimeout(function () {
-				nav.popToRootWindow();
-			}, 1);
+		subWindow.addEventListener('open', function open() {
+			subWindow.removeEventListener('open', open);
+			setTimeout(() => nav.popToRootWindow(), 1);
 		});
 
 		nav.open();