Merge pull request #691 from mfietz/issue/app-tests

Fixes non-working app tests, especially GUI tests

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;
         }