Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1753 from mfietz/issue/simpleanimator_npe

Browse Source 
Fix RecyclerView reorder crash
This commit is contained in:
Tom Hennen 2016-03-10 16:35:11 -05:00
commit cac5667744
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
View File

@ -202,7 +202,8 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
@Override @Override
public long getItemId(int position) { public long getItemId(int position) {
return position; FeedItem item = itemAccess.getItem(position);
return item != null ? item.getId() : RecyclerView.NO_POSITION;
} }
@Override @Override

6
app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
View File

@ -109,6 +109,12 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
return selectedItem; return selectedItem;
} }
@Override
public long getItemId(int position) {
FeedItem item = itemAccess.getItem(position);
return item != null ? item.getId() : RecyclerView.NO_POSITION;
}
public int getItemCount() { public int getItemCount() {
return itemAccess.getCount(); return itemAccess.getCount();
} }

1
app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
View File

@ -337,6 +337,7 @@ public class AllEpisodesFragment extends Fragment {
MainActivity mainActivity = activity.get(); MainActivity mainActivity = activity.get();
listAdapter = new AllEpisodesRecycleAdapter(mainActivity, itemAccess, listAdapter = new AllEpisodesRecycleAdapter(mainActivity, itemAccess,
new DefaultActionButtonCallback(mainActivity), showOnlyNewEpisodes()); new DefaultActionButtonCallback(mainActivity), showOnlyNewEpisodes());
listAdapter.setHasStableIds(true);
recyclerView.setAdapter(listAdapter); recyclerView.setAdapter(listAdapter);
} }
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();

1
app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
View File

@ -474,6 +474,7 @@ public class QueueFragment extends Fragment {
MainActivity activity = (MainActivity) getActivity(); MainActivity activity = (MainActivity) getActivity();
recyclerAdapter = new QueueRecyclerAdapter(activity, itemAccess, recyclerAdapter = new QueueRecyclerAdapter(activity, itemAccess,
new DefaultActionButtonCallback(activity), itemTouchHelper); new DefaultActionButtonCallback(activity), itemTouchHelper);
recyclerAdapter.setHasStableIds(true);
recyclerView.setAdapter(recyclerAdapter); recyclerView.setAdapter(recyclerAdapter);
} }
if(queue == null || queue.size() == 0) { if(queue == null || queue.size() == 0) {

2
app/src/main/res/layout/queue_fragment.xml
View File

@ -23,7 +23,7 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_below="@id/divider" android:layout_below="@id/divider"
android:scrollbars="vertical"/> android:scrollbars="vertical"/>