diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-10 16:10:32 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-10 16:10:32 +0200 |
| commit | 8e16ad08c883615f64c21fcc4c54c1a565bf0b1b (patch) | |
| tree | 0cdf31c66ae5a065e30ab7184943ed8710211d13 /tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java | |
| parent | dddc01e2e4911e0e07eb68c797472255414b6f7f (diff) | |
| parent | 26fad34b6501adba7720c8728732d18bc613472b (diff) | |
| download | AntennaPod-8e16ad08c883615f64c21fcc4c54c1a565bf0b1b.zip | |
Merge branch 'feedmanager_removal' into develop
Conflicts:
src/de/danoeh/antennapod/activity/DownloadLogActivity.java
src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
src/de/danoeh/antennapod/activity/ItemviewActivity.java
src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/fragment/EpisodesFragment.java
src/de/danoeh/antennapod/fragment/FeedlistFragment.java
src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
src/de/danoeh/antennapod/fragment/ItemlistFragment.java
Diffstat (limited to 'tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java')
| -rw-r--r-- | tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java b/tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java index 24d48bce4..470a08881 100644 --- a/tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java +++ b/tests/src/de/danoeh/antennapod/test/HttpDownloaderTest.java @@ -6,8 +6,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import de.danoeh.antennapod.asynctask.DownloadStatus; import de.danoeh.antennapod.feed.Feed; +import de.danoeh.antennapod.service.download.DownloadStatus; import de.danoeh.antennapod.service.download.Downloader; import de.danoeh.antennapod.service.download.DownloaderCallback; import de.danoeh.antennapod.service.download.HttpDownloader; |