1 files changed, 77 insertions, 69 deletions

diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java
index 0e1fe35e0..ffce518bf 100644
--- a/src/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.fragment;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -7,91 +8,98 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.util.playback.Playable;
 
-/** Displays the cover and the title of a FeedItem. */
+/**
+ * Displays the cover and the title of a FeedItem.
+ */
 public class CoverFragment extends Fragment implements
-		AudioplayerContentFragment {
-	private static final String TAG = "CoverFragment";
-	private static final String ARG_PLAYABLE = "arg.playable";
+        AudioplayerContentFragment {
+    private static final String TAG = "CoverFragment";
+    private static final String ARG_PLAYABLE = "arg.playable";
 
-	private Playable media;
+    private Playable media;
 
-	private ImageView imgvCover;
+    private ImageView imgvCover;
 
-	private boolean viewCreated = false;
+    private boolean viewCreated = false;
 
-	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);
-		}
-		return f;
-	}
+    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);
+        }
+        return f;
+    }
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setRetainInstance(true);
-		Bundle args = getArguments();
-		if (args != null) {
-			media = args.getParcelable(ARG_PLAYABLE);
-		} else {
-			Log.e(TAG, TAG + " was called with invalid arguments");
-		}
-	}
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        Bundle args = getArguments();
+        if (args != null) {
+            media = args.getParcelable(ARG_PLAYABLE);
+        } else {
+            Log.e(TAG, TAG + " was called with invalid arguments");
+        }
+    }
 
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		View root = inflater.inflate(R.layout.cover_fragment, container, false);
-		imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
-		viewCreated = true;
-		return root;
-	}
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.cover_fragment, container, false);
+        imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
+        viewCreated = true;
+        return root;
+    }
 
-	private void loadMediaInfo() {
-		if (media != null) {
-			imgvCover.post(new Runnable() {
+    private void loadMediaInfo() {
+        if (media != null) {
+            imgvCover.post(new Runnable() {
 
-				@Override
-				public void run() {
-					ImageLoader.getInstance().loadCoverBitmap(
-							media, imgvCover);
-				}
-			});
-		} else {
-			Log.w(TAG, "loadMediaInfo was called while media was null");
-		}
-	}
+                @Override
+                public void run() {
+                    Context c = getActivity();
+                    if (c != null) {
+                        PicassoProvider.getMediaMetadataPicassoInstance(c)
+                                .load(media.getImageUri())
+                                .into(imgvCover);
+                    }
+                }
+            });
+        } else {
+            Log.w(TAG, "loadMediaInfo was called while media was null");
+        }
+    }
 
-	@Override
-	public void onStart() {
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "On Start");
-		super.onStart();
-		if (media != null) {
-			if (BuildConfig.DEBUG)
-				Log.d(TAG, "Loading media info");
-			loadMediaInfo();
-		} else {
-			Log.w(TAG, "Unable to load media info: media was null");
-		}
-	}
+    @Override
+    public void onStart() {
+        if (BuildConfig.DEBUG)
+            Log.d(TAG, "On Start");
+        super.onStart();
+        if (media != null) {
+            if (BuildConfig.DEBUG)
+                Log.d(TAG, "Loading media info");
+            loadMediaInfo();
+        } else {
+            Log.w(TAG, "Unable to load media info: media was null");
+        }
+    }
 
-	@Override
-	public void onDataSetChanged(Playable media) {
-		this.media = media;
-		if (viewCreated) {
-			loadMediaInfo();
-		}
+    @Override
+    public void onDataSetChanged(Playable media) {
+        this.media = media;
+        if (viewCreated) {
+            loadMediaInfo();
+        }
 
-	}
+    }
 
 }