Age | Commit message (Collapse) | Author |
|
|
|
|
|
andrewgaul-findbugs
Conflicts:
src/de/danoeh/antennapod/activity/DownloadActivity.java
src/de/danoeh/antennapod/asynctask/OpmlExportWorker.java
src/de/danoeh/antennapod/feed/Feed.java
src/de/danoeh/antennapod/feed/FeedItem.java
src/de/danoeh/antennapod/feed/FeedMedia.java
src/de/danoeh/antennapod/service/download/DownloadStatus.java
src/de/danoeh/antennapod/storage/DownloadRequester.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
|
|
git://github.com/andrewgaul/AntennaPod into andrewgaul-http-downloader-check-size
Conflicts:
src/de/danoeh/antennapod/service/download/HttpDownloader.java
|
|
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
|
|
- DownloadService should now terminate properly as soon as all downloads have been completed.
- Notification bug ("0 downloads left" notification) should be fixed
|
|
This commit may address symptoms seen in #187 and #197 where
AntennaPod did not flag incomplete downloads as failed.
|
|
This commit fixes 36 of the 109 warnings.
|
|
git://github.com/andrewgaul/AntennaPod into andrewgaul-buffered-output-stream-flush
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch andrewgaul-buffered-output-stream-flush
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified: src/de/danoeh/antennapod/service/download/HttpDownloader.java
# modified: tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# (commit or discard the untracked or modified content in submodules)
#
# modified: submodules/ActionBarSherlock (modified content, untracked content)
# modified: submodules/ViewPagerIndicator (modified content, untracked content)
# modified: submodules/dslv (modified content, untracked content)
#
|
|
|
|
This ensures that IOException due to writes are thrown in the main
code path instead of the exceptional code path. Specifically for
HttpDownloader this ensures that IOUtils.closeQuietly does not swallow
a failed write.
|
|
|
|
DownloadStatus is now used only for finished downloads, whereas
DownloadRequest is used for running/unfinished downloads
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
If an HTTP request returns an error code 301 or 302, follow redirects to the
new location.
|
|
downloaded.
|
|
|
|
|
|
|
|
download log
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|