From 72cd0154806e23b5a55059c73d6431ca11def1b6 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Tue, 21 Jun 2022 19:34:19 +0200 Subject: [PATCH] Fix 2 NPEs reported on Google Play --- .../java/de/danoeh/antennapod/fragment/FeedInfoFragment.java | 3 +++ .../core/service/download/DownloadServiceNotification.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java index 7902a4988..bca0f8640 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java @@ -185,6 +185,9 @@ public class FeedInfoFragment extends Fragment implements Toolbar.OnMenuItemClic @Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); + if (header == null || infoContainer == null) { + return; + } int horizontalSpacing = (int) getResources().getDimension(R.dimen.additional_horizontal_spacing); header.setPadding(horizontalSpacing, header.getPaddingTop(), horizontalSpacing, header.getPaddingBottom()); infoContainer.setPadding(horizontalSpacing, infoContainer.getPaddingTop(), diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java index 96ac08c6d..e24922ab0 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java @@ -132,7 +132,7 @@ public class DownloadServiceNotification { StringBuilder sb = new StringBuilder(); for (int i = 0; i < statuses.size(); i++) { - if (statuses.get(i).isSuccessful()) { + if (statuses.get(i) == null || statuses.get(i).isSuccessful()) { continue; } sb.append("• ").append(statuses.get(i).getTitle());