Made sure that the downloaded-attribute of FeedFile does not reach an inconsistent state

(downloaded=false and file_url != null)

src/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java

@@ -181,7 +181,7 @@ public abstract class OnlineFeedViewActivity extends ActionBarActivity {
     }
 
     private void parseFeed() {
-        if (feed == null || feed.getFile_url() == null) {
+        if (feed == null || feed.getFile_url() == null && feed.isDownloaded()) {
             throw new IllegalStateException(
                     "feed must be non-null and downloaded when parseFeed is called");
         }

src/de/danoeh/antennapod/adapter/FeedlistAdapter.java

@@ -118,7 +118,7 @@ public class FeedlistAdapter extends BaseAdapter {
                 holder.inProgressEpisodesLabel.setVisibility(View.INVISIBLE);
             }
         }
-		final String imageUrl = (feed.getImage() != null) ? feed.getImage()
+		final String imageUrl = (feed.getImage() != null && feed.getImage().isDownloaded()) ? feed.getImage()
 				.getFile_url() : null;
 		imageLoader.loadThumbnailBitmap(
 				feed.getImage(),

src/de/danoeh/antennapod/feed/FeedFile.java

@@ -2,84 +2,104 @@ package de.danoeh.antennapod.feed;
 
 import java.io.File;
 
-/** Represents a component of a Feed that has to be downloaded */
+/**
+ * Represents a component of a Feed that has to be downloaded
+ */
 public abstract class FeedFile extends FeedComponent {
 
-	protected String file_url;
+    protected String file_url;
-	protected String download_url;
+    protected String download_url;
-	protected boolean downloaded;
+    protected boolean downloaded;
 
-	public FeedFile(String file_url, String download_url, boolean downloaded) {
+    /**
-		super();
+     * Creates a new FeedFile object.
-		this.file_url = file_url;
+     *
-		this.download_url = download_url;
+     * @param file_url     The location of the FeedFile. If this is null, the downloaded-attribute
-		this.downloaded = downloaded;
+     *                     will automatically be set to false.
-	}
+     * @param download_url The location where the FeedFile can be downloaded.
+     * @param downloaded   true if the FeedFile has been downloaded, false otherwise. This parameter
+     *                     will automatically be interpreted as false if the file_url is null.
+     */
+    public FeedFile(String file_url, String download_url, boolean downloaded) {
+        super();
+        this.file_url = file_url;
+        this.download_url = download_url;
+        this.downloaded = (file_url != null) && downloaded;
+    }
 
-	public FeedFile() {
+    public FeedFile() {
         this(null, null, false);
     }
 
-	public abstract int getTypeAsInt();
+    public abstract int getTypeAsInt();
 
-	/**
+    /**
-	 * Update this FeedFile's attributes with the attributes from another
+     * Update this FeedFile's attributes with the attributes from another
-	 * FeedFile. This method should only update attributes which where read from
+     * FeedFile. This method should only update attributes which where read from
-	 * the feed.
+     * the feed.
-	 */
+     */
-	public void updateFromOther(FeedFile other) {
+    public void updateFromOther(FeedFile other) {
-		super.updateFromOther(other);
+        super.updateFromOther(other);
-		this.download_url = other.download_url;
+        this.download_url = other.download_url;
-	}
+    }
 
-	/**
+    /**
-	 * Compare's this FeedFile's attribute values with another FeedFile's
+     * Compare's this FeedFile's attribute values with another FeedFile's
-	 * attribute values. This method will only compare attributes which were
+     * attribute values. This method will only compare attributes which were
-	 * read from the feed.
+     * read from the feed.
-	 * 
+     *
-	 * @return true if attribute values are different, false otherwise
+     * @return true if attribute values are different, false otherwise
-	 */
+     */
-	public boolean compareWithOther(FeedFile other) {
+    public boolean compareWithOther(FeedFile other) {
-		if (super.compareWithOther(other)) {
+        if (super.compareWithOther(other)) {
-			return true;
+            return true;
-		}
+        }
-		if (!download_url.equals(other.download_url)) {
+        if (!download_url.equals(other.download_url)) {
-			return true;
+            return true;
-		}
+        }
-		return false;
+        return false;
-	}
+    }
-	
-	/** Returns true if the file exists at file_url. */
-	public boolean fileExists() {
-		if (file_url == null) {
-			return false;
-		} else {
-			File f = new File(file_url);
-			return f.exists();
-		}
-	}
 
-	public String getFile_url() {
+    /**
-		return file_url;
+     * Returns true if the file exists at file_url.
-	}
+     */
+    public boolean fileExists() {
+        if (file_url == null) {
+            return false;
+        } else {
+            File f = new File(file_url);
+            return f.exists();
+        }
+    }
 
-	public void setFile_url(String file_url) {
+    public String getFile_url() {
-		this.file_url = file_url;
+        return file_url;
-	}
+    }
 
-	public String getDownload_url() {
+    /**
-		return download_url;
+     * Changes the file_url of this FeedFile. Setting this value to
-	}
+     * null will also set the downloaded-attribute to false.
+     */
+    public void setFile_url(String file_url) {
+        this.file_url = file_url;
+        if (file_url == null) {
+            downloaded = false;
+        }
+    }
 
-	public void setDownload_url(String download_url) {
+    public String getDownload_url() {
-		this.download_url = download_url;
+        return download_url;
-	}
+    }
 
-	public boolean isDownloaded() {
+    public void setDownload_url(String download_url) {
-		return downloaded;
+        this.download_url = download_url;
-	}
+    }
 
-	public void setDownloaded(boolean downloaded) {
+    public boolean isDownloaded() {
-		this.downloaded = downloaded;
+        return downloaded;
-	}
+    }
+
+    public void setDownloaded(boolean downloaded) {
+        this.downloaded = downloaded;
+    }
 }