1 files changed, 32 insertions, 7 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index 88d748c5a..7bb9c60e4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.fragment;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -18,6 +19,10 @@ import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.greenrobot.event.EventBus;
+import io.reactivex.Maybe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Displays the cover and the title of a FeedItem.
@@ -31,6 +36,7 @@ public class CoverFragment extends Fragment {
     private TextView txtvEpisodeTitle;
     private ImageView imgvCover;
     private PlaybackController controller;
+    private Disposable disposable;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -44,11 +50,24 @@ public class CoverFragment extends Fragment {
     }
 
     private void loadMediaInfo() {
-        Playable media = controller.getMedia();
-        if (media == null) {
-            Log.w(TAG, "loadMediaInfo was called while media was null");
-            return;
+        if (disposable != null) {
+            disposable.dispose();
         }
+        disposable = Maybe.create(emitter -> {
+                    Playable media = controller.getMedia();
+                    if (media != null) {
+                        emitter.onSuccess(media);
+                    } else {
+                        emitter.onComplete();
+                    }
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(media -> displayMediaInfo((Playable) media),
+                        error -> Log.e(TAG, Log.getStackTraceString(error)));
+    }
+
+    private void displayMediaInfo(@NonNull Playable media) {
         txtvPodcastTitle.setText(media.getFeedTitle());
         txtvEpisodeTitle.setText(media.getEpisodeTitle());
         Glide.with(this)
@@ -73,9 +92,6 @@ public class CoverFragment extends Fragment {
         controller = new PlaybackController(getActivity(), false) {
             @Override
             public boolean loadMediaInfo() {
-                if (getMedia() == null) {
-                    return false;
-                }
                 CoverFragment.this.loadMediaInfo();
                 return true;
             }
@@ -99,4 +115,13 @@ public class CoverFragment extends Fragment {
         controller.release();
         controller = null;
     }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        if (disposable != null) {
+            disposable.dispose();
+        }
+    }
 }