Merge pull request etsy#85 from lzanita09/patch-1

denizmveli · denizmveli · commit 18e9ae8251ff · 2014-04-06T13:03:59.000-04:00
Merged pull request etsy#86 - Fixed setAdapter bug
diff --git a/library/src/main/java/com/etsy/android/grid/ExtendableListView.java b/library/src/main/java/com/etsy/android/grid/ExtendableListView.java
@@ -265,7 +265,7 @@ public void setAdapter(final ListAdapter adapter) {
         }
 
         mDataChanged = true;
-        mItemCount = adapter != null ? adapter.getCount() : 0;
+        mItemCount = mAdapter != null ? mAdapter.getCount() : 0;
 
         if (adapter != null) {
             adapter.registerDataSetObserver(mObserver);

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public void setAdapter(final ListAdapter adapter) {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`mDataChanged = true;`
`268`		`- mItemCount = adapter != null ? adapter.getCount() : 0;`
	`268`	`+ mItemCount = mAdapter != null ? mAdapter.getCount() : 0;`
`269`	`269`
`270`	`270`	`if (adapter != null) {`
`271`	`271`	`adapter.registerDataSetObserver(mObserver);`