Position of playing queue item can now be changed

src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java

@@ -72,10 +72,7 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		@Override
 		public void drop(int from, int to) {
 			FeedManager manager = FeedManager.getInstance();
-			int offset = (manager.firstQueueItemIsPlaying()) ? 1 : 0;
+			manager.moveQueueItem(OrganizeQueueActivity.this, from, to, false);
-
-			manager.moveQueueItem(OrganizeQueueActivity.this, from + offset, to
-					+ offset, false);
 			adapter.notifyDataSetChanged();
 		}
 	};
@@ -85,7 +82,6 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		@Override
 		public void remove(int which) {
 			FeedManager manager = FeedManager.getInstance();
-
 			manager.removeQueueItem(OrganizeQueueActivity.this,
 					(FeedItem) getListAdapter().getItem(which));
 		}
@@ -174,21 +170,12 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		@Override
 		public int getCount() {
 			int queueSize = manager.getQueueSize(true);
-			if (manager.firstQueueItemIsPlaying()) {
+			return queueSize;
-				return queueSize - 1;
-			} else {
-				return queueSize;
-			}
 		}
 
 		@Override
 		public FeedItem getItem(int position) {
-			if (manager.firstQueueItemIsPlaying() && position < getCount()) {
+			return manager.getQueueItemAtIndex(position, true);
-				return manager.getQueueItemAtIndex(position + 1, true);
-			} else {
-				return manager.getQueueItemAtIndex(position, true);
-			}
-
 		}
 
 		@Override

src/de/danoeh/antennapod/feed/FeedManager.java

@@ -117,8 +117,8 @@ public class FeedManager {
 
 	/**
 	 * Play FeedMedia and start the playback service + launch Mediaplayer
-	 * Activity. The FeedItem belonging to the media is moved to the top of the
+	 * Activity. The FeedItem will be added at the top of the queue if it isn't
-	 * queue.
+	 * in there yet.
 	 * 
 	 * @param context
 	 *            for starting the playbackservice
@@ -156,9 +156,7 @@ public class FeedManager {
 				context.startActivity(PlaybackService.getPlayerActivityIntent(
 						context, media));
 			}
-			if (queue.contains(media.getItem())) {
+			if (!queue.contains(media.getItem())) {
-				moveQueueItem(context, queue.indexOf(media.getItem()), 0, true);
-			} else {
 				addQueueItemAt(context, media.getItem(), 0, false);
 			}
 		} catch (MediaFileNotFoundException e) {
@@ -1630,10 +1628,10 @@ public class FeedManager {
 		if (AppConfig.DEBUG)
 			Log.d(TAG, "Extracting Queue");
 		Cursor cursor = adapter.getQueueCursor();
-		
+
 		// Sort cursor results by ID with TreeMap
 		TreeMap<Integer, FeedItem> map = new TreeMap<Integer, FeedItem>();
-		
+
 		if (cursor.moveToFirst()) {
 			do {
 				int index = cursor.getInt(PodDBAdapter.KEY_ID_INDEX);
@@ -1650,7 +1648,7 @@ public class FeedManager {
 			} while (cursor.moveToNext());
 		}
 		cursor.close();
-		
+
 		for (Map.Entry<Integer, FeedItem> entry : map.entrySet()) {
 			FeedItem item = entry.getValue();
 			queue.add(item);
@@ -1797,18 +1795,23 @@ public class FeedManager {
 	}
 
 	/**
-	 * Returns true if the first item in the queue is currently being played or
+	 * Returns the index of the episode that is currently being played in the
-	 * false otherwise. If the queue is empty, this method will also return
+	 * queue or -1 if the queue is empty or no episode in the queue is being
-	 * false.
+	 * played.
 	 * */
-	public boolean firstQueueItemIsPlaying() {
+	public int getQueuePlayingEpisodeIndex() {
 		FeedManager manager = FeedManager.getInstance();
 		int queueSize = manager.getQueueSize(true);
 		if (queueSize == 0) {
-			return false;
+			return -1;
 		} else {
-			FeedItem item = getQueueItemAtIndex(0, true);
+			for (int x = 0; x < queueSize; x++) {
-			return item.getState() == FeedItem.State.PLAYING;
+				FeedItem item = getQueueItemAtIndex(x, true);
+				if (item.getState() == FeedItem.State.PLAYING) {
+					return x;
+				}
+			}
+			return -1;
 		}
 	}