Organizing the queue now works, several bugfixes etc.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/de/danoeh/antennapod/activity/ItemviewActivity.java b/src/de/danoeh/antennapod/activity/ItemviewActivity.java
index 4568c535a..eb8d71bbe 100644
--- a/src/de/danoeh/antennapod/activity/ItemviewActivity.java
+++ b/src/de/danoeh/antennapod/activity/ItemviewActivity.java
@@ -22,6 +22,7 @@ import de.danoeh.antennapod.fragment.ItemlistFragment;
 import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.storage.DownloadRequestException;
+import de.danoeh.antennapod.util.QueueAccess;
 import de.danoeh.antennapod.util.StorageUtils;
 import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
 
@@ -149,13 +150,13 @@ public class ItemviewActivity extends SherlockFragmentActivity {
 	@Override
 	public boolean onPrepareOptionsMenu(final Menu menu) {
 		return FeedItemMenuHandler.onPrepareMenu(
-				new FeedItemMenuHandler.MenuInterface() {
+                new FeedItemMenuHandler.MenuInterface() {
 
-					@Override
-					public void setItemVisibility(int id, boolean visible) {
-						menu.findItem(id).setVisible(visible);
-					}
-				}, item, true);
+                    @Override
+                    public void setItemVisibility(int id, boolean visible) {
+                        menu.findItem(id).setVisible(visible);
+                    }
+                }, item, true, QueueAccess.NotInQueueAccess());
 	}
 
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
diff --git a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
index f7e55d06f..38f0b5ae6 100644
--- a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
+++ b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
@@ -113,9 +113,10 @@ public class OrganizeQueueActivity extends SherlockListActivity implements
 
 		@Override
 		public void drop(int from, int to) {
-
+            final FeedItem item = queue.remove(from);
+            queue.add(to, item);
+            adapter.notifyDataSetChanged();
             DBWriter.moveQueueItem(OrganizeQueueActivity.this, from, to, true);
-			//adapter.notifyDataSetChanged();
 		}
 	};