Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4340 from damoasda/FeedItemlistFragment-NPE-fix 

Fix NullPointerException in FeedItemlistFragment when deleting a podcast
This commit is contained in:
H. Lehmann 2020-08-03 22:02:39 +02:00 committed by GitHub
parent de70873e96 46b886baa3
commit 5a56fb6f0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
View File

@ -358,7 +358,7 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
if (event.hasChangedFeedUpdateStatus(isUpdatingFeed)) { if (event.hasChangedFeedUpdateStatus(isUpdatingFeed)) {
updateSyncProgressBarVisibility(); updateSyncProgressBarVisibility();
} }
if (adapter != null && update.mediaIds.length > 0) { if (adapter != null && update.mediaIds.length > 0 && feed != null) {
for (long mediaId : update.mediaIds) { for (long mediaId : update.mediaIds) {
int pos = FeedItemUtil.indexOfItemWithMediaId(feed.getItems(), mediaId); int pos = FeedItemUtil.indexOfItemWithMediaId(feed.getItems(), mediaId);
if (pos >= 0) { if (pos >= 0) {
@ -398,7 +398,7 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onFeedListChanged(FeedListUpdateEvent event) { public void onFeedListChanged(FeedListUpdateEvent event) {
if (event.contains(feed)) { if (feed != null && event.contains(feed)) {
updateUi(); updateUi();
} }
} }
@ -425,7 +425,9 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
} }
recyclerView.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
adapter.updateItems(feed.getItems()); if (feed != null) {
adapter.updateItems(feed.getItems());
}
getActivity().supportInvalidateOptionsMenu(); getActivity().supportInvalidateOptionsMenu();
updateSyncProgressBarVisibility(); updateSyncProgressBarVisibility();
@ -553,4 +555,4 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
holder.coverHolder.setVisibility(View.GONE); holder.coverHolder.setVisibility(View.GONE);
} }
} }
} }