[TIMOB-26202] Fix Ti.UI.Window references

tidev · Jul 21, 2018 · abc1b78 · abc1b78
1 parent c097d7b
commit abc1b78
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 6 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewProxy.java
@@ -675,6 +675,7 @@ private void cleanupSections()
 	{
 		ArrayList<TableViewSectionProxy> sections = getSectionsArray();
 		for (TableViewSectionProxy section : sections) {
+			section.releaseViews();
 			section.setParent(null);
 		}
 		sections.clear();

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewRowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TableViewRowProxy.java
@@ -274,6 +274,10 @@ public void releaseViews()
 	{
 		super.releaseViews();
 
+		if (tableViewItem != null) {
+			tableViewItem.release();
+			tableViewItem = null;
+		}
 		if (controls != null) {
 			for (TiViewProxy control : controls) {
 				control.releaseKroll();
@@ -288,10 +292,6 @@ public void release()
 
 		releaseViews();
 
-		if (tableViewItem != null) {
-			tableViewItem.release();
-			tableViewItem = null;
-		}
 		if (controls != null) {
 			controls.clear();
 			controls = null;

diff --git a/.../modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableViewRowProxyItem.java b/.../modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableViewRowProxyItem.java
@@ -655,6 +655,9 @@ public void release()
 			views.clear();
 			views = null;
 		}
+		if (item != null) {
+			item = null;
+		}
 		if (content != null) {
 			content.removeAllViews();
 			content = null;

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -1571,14 +1571,19 @@ protected void onDestroy()
 
 		//LW windows
 		if (window == null && view != null) {
-			view.releaseViews();
 			view.release();
 			view = null;
 		}
+		if (view != null) {
+			view.releaseViews();
+			view = null;
+		}
 
 		if (window != null) {
+			if (windowStack.contains(window)) {
+				removeWindowFromStack(window);
+			}
 			window.closeFromActivity(isFinishing);
-			window.releaseViews();
 			window.releaseKroll();
 			window = null;
 		}

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiViewProxy.java
@@ -634,6 +634,13 @@ public void releaseViews()
 		KrollRuntime.suggestGC();
 	}
 
+	@Override
+	public void release()
+	{
+		releaseViews();
+		super.release();
+	}
+
 	/**
 	 * Implementing classes should use this method to create and return the appropriate view.
 	 * @param activity the context activity.

diff --git a/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java b/android/titanium/src/java/org/appcelerator/titanium/proxy/TiWindowProxy.java
@@ -525,4 +525,24 @@ protected boolean hasActivityTransitions()
 		final boolean animated = TiConvert.toBoolean(getProperties(), TiC.PROPERTY_ANIMATED, true);
 		return (LOLLIPOP_OR_GREATER && animated && sharedElementPairs != null && !sharedElementPairs.isEmpty());
 	}
+
+	@Override
+	public void releaseViews()
+	{
+		if (view != null) {
+			if (children != null) {
+				for (TiViewProxy p : children) {
+					p.releaseViews();
+				}
+			}
+			view = null;
+		}
+		if (runtimeHandler != null) {
+			runtimeHandler = null;
+		}
+		if (mainHandler != null) {
+			mainHandler = null;
+		}
+		setModelListener(null);
+	}
 }