diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-05-19 17:32:15 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-05-19 17:32:15 +0200 |
| commit | a704a33e2b31a7312f35f33251faaf1017b982d9 (patch) | |
| tree | fa1d8ed645485f1ff8f8220671fc199abc8fc8a4 /src/de/danoeh/antennapod/storage/PodDBAdapter.java | |
| parent | 11fb8589090d0715bb907b5f1e2c77644e3c86ff (diff) | |
| download | AntennaPod-a704a33e2b31a7312f35f33251faaf1017b982d9.zip | |
Split DownloadStatus into two separate classes
DownloadStatus is now used only for finished downloads, whereas
DownloadRequest is used for running/unfinished downloads
Diffstat (limited to 'src/de/danoeh/antennapod/storage/PodDBAdapter.java')
| -rw-r--r-- | src/de/danoeh/antennapod/storage/PodDBAdapter.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/src/de/danoeh/antennapod/storage/PodDBAdapter.java index 72c96b961..dcc9533a5 100644 --- a/src/de/danoeh/antennapod/storage/PodDBAdapter.java +++ b/src/de/danoeh/antennapod/storage/PodDBAdapter.java @@ -14,12 +14,12 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; import de.danoeh.antennapod.AppConfig; -import de.danoeh.antennapod.asynctask.DownloadStatus; import de.danoeh.antennapod.feed.Chapter; import de.danoeh.antennapod.feed.Feed; import de.danoeh.antennapod.feed.FeedImage; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedMedia; +import de.danoeh.antennapod.service.download.DownloadStatus; /** * Implements methods for accessing the database @@ -456,16 +456,8 @@ public class PodDBAdapter { * */ public long setDownloadStatus(DownloadStatus status) { ContentValues values = new ContentValues(); - if (status.getFeedFile() != null) { - values.put(KEY_FEEDFILE, status.getFeedFile().getId()); - if (status.getFeedFile().getClass() == Feed.class) { - values.put(KEY_FEEDFILETYPE, Feed.FEEDFILETYPE_FEED); - } else if (status.getFeedFile().getClass() == FeedImage.class) { - values.put(KEY_FEEDFILETYPE, FeedImage.FEEDFILETYPE_FEEDIMAGE); - } else if (status.getFeedFile().getClass() == FeedMedia.class) { - values.put(KEY_FEEDFILETYPE, FeedMedia.FEEDFILETYPE_FEEDMEDIA); - } - } + values.put(KEY_FEEDFILE, status.getFeedfileId()); + values.put(KEY_FEEDFILETYPE, status.getFeedfileType()); values.put(KEY_REASON, status.getReason()); values.put(KEY_SUCCESSFUL, status.isSuccessful()); values.put(KEY_COMPLETION_DATE, status.getCompletionDate().getTime()); @@ -679,11 +671,11 @@ public class PodDBAdapter { + "=0", null, null, null, KEY_PUBDATE + " DESC"); return c; } - + public final Cursor getUnreadItemIdsCursor() { open(); - Cursor c = db.query(TABLE_NAME_FEED_ITEMS, new String[]{KEY_ID}, KEY_READ - + "=0", null, null, null, KEY_PUBDATE + " DESC"); + Cursor c = db.query(TABLE_NAME_FEED_ITEMS, new String[] { KEY_ID }, + KEY_READ + "=0", null, null, null, KEY_PUBDATE + " DESC"); return c; } |