Merge pull request emilsjolander#353 from seato/seato/issue-352-memor…

…y-leaks Issue 352: Clean up some memory leaks originating in the adapter's deleg...
jmxgrobby · Apr 6, 2015 · c308473 · c308473
2 parents 168bbd5 + 89141f2
commit c308473
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/library/src/se/emilsjolander/stickylistheaders/AdapterWrapper.java b/library/src/se/emilsjolander/stickylistheaders/AdapterWrapper.java
@@ -29,7 +29,7 @@ interface OnHeaderClickListener {
 		void onHeaderClick(View header, int itemPosition, long headerId);
 	}
 
-	final StickyListHeadersAdapter mDelegate;
+	StickyListHeadersAdapter mDelegate;
 	private final List<View> mHeaderCache = new LinkedList<View>();
 	private final Context mContext;
 	private Drawable mDivider;

diff --git a/library/src/se/emilsjolander/stickylistheaders/SectionIndexerAdapterWrapper.java b/library/src/se/emilsjolander/stickylistheaders/SectionIndexerAdapterWrapper.java
@@ -6,7 +6,7 @@
 class SectionIndexerAdapterWrapper extends
 		AdapterWrapper implements SectionIndexer {
 
-	final SectionIndexer mSectionIndexerDelegate;
+	SectionIndexer mSectionIndexerDelegate;
 
 	SectionIndexerAdapterWrapper(Context context,
 			StickyListHeadersAdapter delegate) {

diff --git a/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java b/library/src/se/emilsjolander/stickylistheaders/StickyListHeadersListView.java
@@ -654,6 +654,12 @@ private boolean requireSdkVersion(int versionCode) {
 
     public void setAdapter(StickyListHeadersAdapter adapter) {
         if (adapter == null) {
+            if (mAdapter instanceof SectionIndexerAdapterWrapper) {
+                ((SectionIndexerAdapterWrapper) mAdapter).mSectionIndexerDelegate = null;
+            }
+            if (mAdapter != null) {
+                mAdapter.mDelegate = null;
+            }
             mList.setAdapter(null);
             clearHeader();
             return;