diff options
Diffstat (limited to 'src/de/danoeh')
-rw-r--r-- | src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java | 9 | ||||
-rw-r--r-- | src/de/danoeh/antennapod/util/QueueAccess.java | 11 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java index 77dae303e..e376b08b8 100644 --- a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java +++ b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java @@ -51,6 +51,7 @@ public class OrganizeQueueActivity extends ActionBarActivity implements listView = (DragSortListView) findViewById(android.R.id.list); listView.setDropListener(dropListener); listView.setRemoveListener(removeListener); + listView.setEmptyView(findViewById(android.R.id.empty)); loadData(); undoBarController = new UndoBarController(findViewById(R.id.undobar), @@ -155,9 +156,11 @@ public class OrganizeQueueActivity extends ActionBarActivity implements public void onUndo(Parcelable token) { // Perform the undo UndoToken undoToken = (UndoToken) token; - long itemId = undoToken.getFeedItemId(); - int position = undoToken.getPosition(); - DBWriter.addQueueItemAt(OrganizeQueueActivity.this, itemId, position, false); + if (token != null) { + long itemId = undoToken.getFeedItemId(); + int position = undoToken.getPosition(); + DBWriter.addQueueItemAt(OrganizeQueueActivity.this, itemId, position, false); + } } private static class OrganizeAdapter extends BaseAdapter { 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<FeedItem> 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<FeedItem> 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; } |