Merge pull request #9784 from ypbnv/TIMOB-25693

[TIMOB-25693] Android: Possible memory leak when setting ListSections on a ListView
tidev · Feb 26, 2018 · aa9d174 · aa9d174
2 parents 9aa6579 + d5ea1ce
commit aa9d174
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -895,8 +895,11 @@ public View layoutHeaderOrFooterView(TiViewProxy viewProxy)
 
 	protected void processSections(Object[] sections)
 	{
-
+		for (ListSectionProxy listSectionProxy : this.sections) {
+			listSectionProxy.releaseViews();
+		}
 		this.sections.clear();
+
 		for (int i = 0; i < sections.length; i++) {
 			processSection(sections[i], -1);
 		}

diff --git a/android/runtime/common/src/java/org/appcelerator/kroll/KrollObject.java b/android/runtime/common/src/java/org/appcelerator/kroll/KrollObject.java
@@ -6,6 +6,7 @@
  */
 package org.appcelerator.kroll;
 
+import java.lang.ref.WeakReference;
 import java.util.HashMap;
 
 import org.appcelerator.kroll.common.AsyncResult;
@@ -27,7 +28,7 @@ public abstract class KrollObject implements Handler.Callback
 	protected HashMap<String, Boolean> hasListenersForEventType = new HashMap<String, Boolean>();
 	protected Handler handler;
 
-	private KrollProxySupport proxySupport;
+	private WeakReference<KrollProxySupport> proxySupport;
 
 	public KrollObject()
 	{
@@ -40,7 +41,7 @@ public KrollObject()
 	 */
 	public void setProxySupport(KrollProxySupport proxySupport)
 	{
-		this.proxySupport = proxySupport;
+		this.proxySupport = new WeakReference<KrollProxySupport>(proxySupport);
 	}
 
 	/**
@@ -66,8 +67,8 @@ public boolean hasListeners(String event)
 	public void setHasListenersForEventType(String event, boolean hasListeners)
 	{
 		hasListenersForEventType.put(event, hasListeners);
-		if (proxySupport != null) {
-			proxySupport.onHasListenersChanged(event, hasListeners);
+		if (proxySupport != null && proxySupport.get() != null) {
+			proxySupport.get().onHasListenersChanged(event, hasListeners);
 		}
 	}
 
@@ -78,8 +79,8 @@ public void setHasListenersForEventType(String event, boolean hasListeners)
 	 */
 	public void onEventFired(String event, Object data)
 	{
-		if (proxySupport != null) {
-			proxySupport.onEventFired(event, data);
+		if (proxySupport != null && proxySupport.get() != null) {
+			proxySupport.get().onEventFired(event, data);
 		}
 	}
 

diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiUIView.java
@@ -1278,8 +1278,8 @@ public void release()
 				remove(child);
 			}
 			children.clear();
+			children = null;
 		}
-		children = null;
 		proxy = null;
 		layoutParams = null;
 	}