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
|
|
|
|
|
|
|
|
|
|
|
|
git://github.com/peschmae0/AntennaPod into flattr_queue_autoflattr
Conflicts:
src/de/danoeh/antennapod/storage/DBReader.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
res/values/strings.xml
src/de/danoeh/antennapod/storage/DBTasks.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
|
|
|
|
|
|
flattr) into a single commit, rebased onto the current development branch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Use custom namespace for "showAsAction" and "getMenuInflater" instead of "new MenuInflater"
|
|
|
|
|
|
|
|
|
|
Conflicts:
AndroidManifest.xml
res/values/arrays.xml
res/values/strings.xml
res/xml/preferences.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
|
|
|
|
|
|
|
|
|
|
Turned off at the moment
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
proguard.cfg
src/de/danoeh/antennapod/storage/DBTasks.java
|
|
|
|
|
|
|