Merge branch 'master' of https://github.com/Leafly-com/StickyGridHeaders

Leafly-com · Jun 29, 2016 · 24d89a9 · 24d89a9
2 parents b6281b7 + bc45924
commit 24d89a9
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Library/src/com/tonicartos/widget/stickygridheaders/StickyGridHeadersBaseAdapterWrapper.java b/Library/src/com/tonicartos/widget/stickygridheaders/StickyGridHeadersBaseAdapterWrapper.java
@@ -249,8 +249,12 @@ public void unregisterDataSetObserver(DataSetObserver observer) {
     }
 
     private FillerView getFillerView(View convertView, ViewGroup parent, View lastViewSeen) {
-        FillerView fillerView = (FillerView)convertView;
-        if (fillerView == null) {
+        FillerView fillerView;
+
+        if (convertView instanceof FillerView) {
+            fillerView = (FillerView)convertView;
+        }
+        else {
             fillerView = new FillerView(mContext);
         }
 
@@ -261,8 +265,12 @@ private FillerView getFillerView(View convertView, ViewGroup parent, View lastVi
 
     private HeaderFillerView getHeaderFillerView(int headerPosition, View convertView,
             ViewGroup parent) {
-        HeaderFillerView headerFillerView = (HeaderFillerView)convertView;
-        if (headerFillerView == null) {
+        HeaderFillerView headerFillerView;
+
+        if (convertView instanceof HeaderFillerView) {
+            headerFillerView = (HeaderFillerView)convertView;
+        }
+        else {
             headerFillerView = new HeaderFillerView(mContext);
         }