summaryrefslogtreecommitdiff
path: root/core/src/main/java/de/danoeh
diff options
context:
space:
mode:
authorMartin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>2015-03-26 00:19:46 +0100
committerMartin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>2015-03-26 00:19:46 +0100
commit2aec26aa8e7a3d01928518eab85d5b5c07c2655d (patch)
tree3862735c33c2bc5f866b5d4a77f65d7cba59032e /core/src/main/java/de/danoeh
parentd280a32c23b3a302888e1f6f0636a8116709dc95 (diff)
downloadAntennaPod-2aec26aa8e7a3d01928518eab85d5b5c07c2655d.zip
Fixes non-working app tests, especially GUI tests
Diffstat (limited to 'core/src/main/java/de/danoeh')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
index b01747f7f..c6f24367e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
@@ -2,10 +2,10 @@ package de.danoeh.antennapod.core.feed;
import android.net.Uri;
-import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
-
import java.io.File;
+import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+
public class FeedImage extends FeedFile implements PicassoImageResource {
public static final int FEEDFILETYPE_FEEDIMAGE = 1;
@@ -65,6 +65,8 @@ public class FeedImage extends FeedFile implements PicassoImageResource {
public Uri getImageUri() {
if (file_url != null && downloaded) {
return Uri.fromFile(new File(file_url));
+ } else if(download_url != null) {
+ return Uri.parse(download_url);
} else {
return null;
}