diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-03-26 18:35:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-26 18:35:02 +0100 |
commit | 3452bc50d40e183bac1c0e700a7fb2b8e03b61b0 (patch) | |
tree | fc82276a5b8c9ce32b63e3aef9b5a579ce4d5958 | |
parent | 66cc86a76b973f9754c9f7ec1f52e7537179ed9a (diff) | |
parent | 208d42cc7ea12f0fa704e9959d8e3df7d977f8db (diff) | |
download | AntennaPod-3452bc50d40e183bac1c0e700a7fb2b8e03b61b0.zip |
Merge pull request #5051 from ByteHamster/fix-crash-media-null
Fix crash when resuming while there is no playable
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java index 3466f6ce8..8ac7b941a 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java @@ -10,6 +10,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.fragment.app.Fragment; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.util.playback.Playable; import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.core.util.playback.Timeline; import de.danoeh.antennapod.view.ShownotesWebView; @@ -82,9 +83,15 @@ public class ItemDescriptionFragment extends Fragment { webViewLoader.dispose(); } webViewLoader = Maybe.<String>create(emitter -> { - Timeline timeline = new Timeline(getActivity(), controller.getMedia()); - emitter.onSuccess(timeline.processShownotes()); - }).subscribeOn(Schedulers.io()) + Playable media = controller.getMedia(); + if (media != null) { + Timeline timeline = new Timeline(getActivity(), media); + emitter.onSuccess(timeline.processShownotes()); + } else { + emitter.onComplete(); + } + }) + .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(data -> { webvDescription.loadDataWithBaseURL("https://127.0.0.1", data, "text/html", |