diff options
| author | Tom Hennen <tom.hennen@gmail.com> | 2013-08-16 11:14:01 -0400 |
|---|---|---|
| committer | Tom Hennen <tom.hennen@gmail.com> | 2013-08-16 11:14:01 -0400 |
| commit | 82bdfe05ac9ced9ffff2469e8ec1dacf88a3f166 (patch) | |
| tree | 1943278704d17b88cf4d2c61fca618c743ce55af /src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java | |
| parent | 07277b2fef6dcb1470ef18c55947b50ed710a7d5 (diff) | |
| parent | 3994d02ddfb52a4418951a22bb72f55f85a76fbb (diff) | |
| download | AntennaPod-82bdfe05ac9ced9ffff2469e8ec1dacf88a3f166.zip | |
Merge branch 'develop' of https://github.com/danieloeh/AntennaPod into move-to-top
Diffstat (limited to 'src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java | 9 |
1 files changed, 6 insertions, 3 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 { |