diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-05 14:57:37 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-05 14:57:37 +0200 |
commit | 75b13431fed4dbc4e259ead8a3762143be740432 (patch) | |
tree | 0107281d2021c326d3acb557b0ad1c1d36019d2e /src/de/danoeh/antennapod/storage/DBReader.java | |
parent | 3f5e2faff941f220c7a882bfba4f86e85219d7ba (diff) | |
parent | 95148ace8e44df4fa3b8cc6b6afc83bed6be4d04 (diff) | |
download | AntennaPod-75b13431fed4dbc4e259ead8a3762143be740432.zip |
Merge branch 'develop' into feedmanager_removal
Conflicts:
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/feed/FeedManager.java
src/de/danoeh/antennapod/service/PlaybackService.java
src/de/danoeh/antennapod/service/download/DownloadService.java
src/de/danoeh/antennapod/service/download/DownloadStatus.java
src/de/danoeh/antennapod/service/download/HttpDownloader.java
src/de/danoeh/antennapod/storage/DownloadRequester.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
src/de/danoeh/antennapod/util/playback/PlaybackController.java
Diffstat (limited to 'src/de/danoeh/antennapod/storage/DBReader.java')
-rw-r--r-- | src/de/danoeh/antennapod/storage/DBReader.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/de/danoeh/antennapod/storage/DBReader.java b/src/de/danoeh/antennapod/storage/DBReader.java index ababcdf78..4f08c2b00 100644 --- a/src/de/danoeh/antennapod/storage/DBReader.java +++ b/src/de/danoeh/antennapod/storage/DBReader.java @@ -19,6 +19,7 @@ import de.danoeh.antennapod.feed.ID3Chapter; import de.danoeh.antennapod.feed.SimpleChapter; import de.danoeh.antennapod.feed.VorbisCommentChapter; import de.danoeh.antennapod.service.download.*; +import de.danoeh.antennapod.util.DownloadError; import de.danoeh.antennapod.util.comparator.DownloadStatusComparator; import de.danoeh.antennapod.util.comparator.FeedItemPubdateComparator; @@ -428,7 +429,7 @@ public final class DBReader { logCursor .getLong(PodDBAdapter.KEY_COMPLETION_DATE_INDEX)); downloadLog.add(new DownloadStatus(id, title, feedfileId, - feedfileType, successful, reason, completionDate, + feedfileType, successful, DownloadError.fromCode(reason), completionDate, reasonDetailed)); } while (logCursor.moveToNext()); |