Merge branch 'develop'

1 files changed, 8 insertions, 13 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 943ddeec7..1d3fcefba 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -33,22 +33,15 @@ public class CoverFragment extends Fragment implements MediaplayerInfoContentFra
 
     public static CoverFragment newInstance(Playable item) {
         CoverFragment f = new CoverFragment();
-        if (item != null) {
-            Bundle args = new Bundle();
-            args.putParcelable(ARG_PLAYABLE, item);
-            f.setArguments(args);
-        }
+        f.media = item;
         return f;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Bundle args = getArguments();
-        if (args != null) {
-            media = args.getParcelable(ARG_PLAYABLE);
-        } else {
-            Log.e(TAG, TAG + " was called with invalid arguments");
+        if (media == null) {
+            Log.e(TAG, TAG + " was called without media");
         }
     }
 
@@ -67,7 +60,7 @@ public class CoverFragment extends Fragment implements MediaplayerInfoContentFra
             txtvPodcastTitle.setText(media.getFeedTitle());
             txtvEpisodeTitle.setText(media.getEpisodeTitle());
             Glide.with(this)
-                    .load(media.getImageUri())
+                    .load(media.getImageLocation())
                     .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
                     .dontAnimate()
                     .fitCenter()
@@ -98,11 +91,13 @@ public class CoverFragment extends Fragment implements MediaplayerInfoContentFra
 
     @Override
     public void onMediaChanged(Playable media) {
-        if(!isAdded() || this.media == media) {
+        if(this.media == media) {
             return;
         }
         this.media = media;
-        loadMediaInfo();
+        if (isAdded()) {
+            loadMediaInfo();
+        }
     }
 
 }