Merge pull request #52 from nohana/feature/fixHeaderCrash

consider header click event
nohana · Jan 5, 2017 · b275d0c · b275d0c
2 parents cec0e52 + ec22007
commit b275d0c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/laevatein/src/main/java/com/laevatein/internal/ui/AlbumListFragment.java b/laevatein/src/main/java/com/laevatein/internal/ui/AlbumListFragment.java
@@ -33,9 +33,9 @@
 
 /**
  * @author KeithYokoma
- * @since 2014/03/20
  * @version 1.0.0
  * @hide
+ * @since 2014/03/20
  */
 public class AlbumListFragment extends Fragment implements
         AdapterView.OnItemClickListener,
@@ -87,7 +87,13 @@ public void onDestroyView() {
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        AlbumListViewHelper.callOnSelect(mListener, (Cursor) parent.getItemAtPosition(position));
+        Cursor cursor = (Cursor) parent.getItemAtPosition(position);
+        if (cursor == null) {
+            //avoid moving selection to header
+            AlbumListViewHelper.setCheckedState(this, mCollection.getCurrentSelection());
+            return;
+        }
+        AlbumListViewHelper.callOnSelect(mListener, cursor);
         AlbumListViewHelper.setCheckedState(this, position);
         mCollection.setStateCurrentSelection(position);
     }