From f42746555ec5d4434c7e2484bd8dd26aa09e4b65 Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Thu, 15 Aug 2013 19:24:16 +0200 Subject: Removing last item in the queue didn't work --- src/de/danoeh/antennapod/util/QueueAccess.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/de/danoeh/antennapod/util/QueueAccess.java') diff --git a/src/de/danoeh/antennapod/util/QueueAccess.java b/src/de/danoeh/antennapod/util/QueueAccess.java index ce9d11429..7a1c7fef2 100644 --- a/src/de/danoeh/antennapod/util/QueueAccess.java +++ b/src/de/danoeh/antennapod/util/QueueAccess.java @@ -51,9 +51,8 @@ public abstract class QueueAccess { if (items == null) { return false; } - Iterator it = items.iterator(); - for (FeedItem i = it.next(); it.hasNext(); i = it.next()) { - if (i.getId() == id) { + for (FeedItem item : items) { + if (item.getId() == id) { return true; } } @@ -63,8 +62,10 @@ public abstract class QueueAccess { @Override public boolean remove(long id) { Iterator it = items.iterator(); - for (FeedItem i = it.next(); it.hasNext(); i = it.next()) { - if (i.getId() == id) { + FeedItem item; + while (it.hasNext()) { + item = it.next(); + if (item.getId() == id) { it.remove(); return true; } -- cgit v1.2.3