Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- Bugfix: The no-token dialog was shown every time a feed was refreshed if the user wasn't logged in and had clicked the "flattr this" button before
|
|
Other changes:
- Changed FlattrStatusFetcher into Thread-subclass
- Changed auto-flattr mechanism so that it's compatible with the updated PlaybackService
- Changed a couple of strings
Conflicts:
src/de/danoeh/antennapod/storage/DBReader.java
src/de/danoeh/antennapod/storage/DBWriter.java
src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java
|
|
|
|
|
|
|
|
|
|
|
|
with items received from the flattr api
* added method for resetting flattr status of all feeds and items
This adresses https://github.com/danieloeh/AntennaPod/pull/331#issuecomment-32112929
items 1 and 3.
followup on #331
|
|
|
|
Feed/FeedItem to database
* fix race condition when fetching FlattrStatus
* fix missing copy of Flattr status in Feed.updateFromOther()
* fix feed reading from db, was missing FlattrStatus
followup on #331
|
|
|
|
git://github.com/peschmae0/AntennaPod into flattr_queue_autoflattr
Conflicts:
src/de/danoeh/antennapod/storage/DBReader.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Might resolve problems with failed downloads being reported as successful
|
|
flattr) into a single commit, rebased onto the current development branch
|
|
|
|
|
|
PlaybackController/ExternalPlayerFragment
|
|
Conflicts:
AndroidManifest.xml
res/values/arrays.xml
res/values/strings.xml
res/xml/preferences.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
|
|
|
|
|
|
Conflicts:
proguard.cfg
src/de/danoeh/antennapod/storage/DBTasks.java
|
|
|
|
feed:// is now replaced with http://
|
|
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
|
|
|
|
|
|
|
|
into playback-speed-tmp
Conflicts:
src/de/danoeh/antennapod/activity/AudioplayerActivity.java
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/service/PlaybackService.java
src/de/danoeh/antennapod/util/playback/PlaybackController.java
|
|
Conflicts:
pom.xml
src/de/danoeh/antennapod/service/PlaybackService.java
src/de/danoeh/antennapod/util/playback/PlaybackController.java
|
|
|
|
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
|
|
|
|
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
|
|
Makes it possible to get number of (new, in progress) episodes of a feed without loading the whole list of items
|
|
|
|
|