summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2015-05-12 10:03:41 +0200
committerMartin Fietz <Martin.Fietz@gmail.com>2015-05-19 11:58:39 +0200
commitdfdfa82b4b0cc0768fd17afcd9fc19b4dabdb177 (patch)
tree6ba30869fee761aa26c1573621ed64c82e9f1eb0 /core/src
parent1bf02167887247b543f6e821d02ac641ba6039b8 (diff)
downloadAntennaPod-dfdfa82b4b0cc0768fd17afcd9fc19b4dabdb177.zip
Fix download bar displacement
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java5
-rw-r--r--core/src/main/res/values/strings.xml8
2 files changed, 5 insertions, 8 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
index 44be0e3c5..73e414c6a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
@@ -173,11 +173,8 @@ public class Feed extends FeedFile implements FlattrThing, PicassoImageResource
/**
* Returns true if at least one item in the itemlist is unread.
*
- * @param enableEpisodeFilter true if this method should only count items with episodes if
- * the 'display only episodes' - preference is set to true by the
- * user.
*/
- public boolean hasNewItems(boolean enableEpisodeFilter) {
+ public boolean hasNewItems() {
for (FeedItem item : items) {
if (item.getState() == FeedItem.State.UNREAD) {
if (item.getMedia() != null) {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 4400fc7f2..c6308fa7b 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -80,10 +80,10 @@
<string name="browse_gpoddernet_label">Browse gpodder.net</string>
<!-- Actions on feeds -->
- <string name="mark_all_read_label">Mark all as read</string>
- <string name="mark_all_read_msg">Marked all episodes as read</string>
- <string name="mark_all_read_confirmation_msg">Please confirm that you want to mark all episodes as being read.</string>
- <string name="mark_all_read_feed_confirmation_msg">Please confirm that you want to mark all episodes in this feed as being read.</string>
+ <string name="mark_all_read_label">Mark all as played</string>
+ <string name="mark_all_read_msg">Marked all episodes as played</string>
+ <string name="mark_all_read_confirmation_msg">Please confirm that you want to mark all episodes as being played.</string>
+ <string name="mark_all_read_feed_confirmation_msg">Please confirm that you want to mark all episodes in this feed as being played.</string>
<string name="show_info_label">Show information</string>
<string name="remove_feed_label">Remove podcast</string>
<string name="share_link_label">Share website link</string>