From fc5418637332f7257c08574bff204fdb238999e2 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 26 Oct 2020 10:56:27 +0100 Subject: Fixed NPEs related to bottom sheet --- app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 3 +++ .../java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index fffe5be60..8ada58b3a 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -166,6 +166,9 @@ public class MainActivity extends CastEnabledActivity { public void onSlide(@NonNull View view, float slideOffset) { AudioPlayerFragment audioPlayer = (AudioPlayerFragment) getSupportFragmentManager() .findFragmentByTag(AudioPlayerFragment.TAG); + if (audioPlayer == null) { + return; + } float condensedSlideOffset = Math.max(0.0f, Math.min(0.2f, slideOffset - 0.2f)) / 0.2f; audioPlayer.getExternalPlayerHolder().setAlpha(1 - condensedSlideOffset); audioPlayer.getExternalPlayerHolder().setVisibility( diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java index e32fdb095..f456a8268 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java @@ -135,7 +135,12 @@ public class AudioPlayerFragment extends Fragment implements pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { @Override public void onPageSelected(int position) { - pager.post(() -> ((MainActivity) getActivity()).getBottomSheet().updateScrollingChild()); + pager.post(() -> { + if (getActivity() != null) { + // By the time this is posted, the activity might be closed again. + ((MainActivity) getActivity()).getBottomSheet().updateScrollingChild(); + } + }); } }); pageIndicator = root.findViewById(R.id.page_indicator); -- cgit v1.2.3