From 07277b2fef6dcb1470ef18c55947b50ed710a7d5 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Wed, 14 Aug 2013 15:12:14 -0400 Subject: [PATCH 1/3] added a 'move to top' function to DBWriter that puts the provided item at the top of the queue. There may be a way to do this while re-using the existing move function. Perhaps a helper is in order. --- .../danoeh/antennapod/storage/DBWriter.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/de/danoeh/antennapod/storage/DBWriter.java b/src/de/danoeh/antennapod/storage/DBWriter.java index 5cdd6aee4..4b0dd9c2d 100644 --- a/src/de/danoeh/antennapod/storage/DBWriter.java +++ b/src/de/danoeh/antennapod/storage/DBWriter.java @@ -456,7 +456,41 @@ public class DBWriter { }); } + + /** + * Moves the specified item to the top of the queue. + * + * @param context A context that is used for opening a database connection. + * @param selectedItem The item to move to the top of the queue + * @param broadcastUpdate true if this operation should trigger a QueueUpdateBroadcast. This option should be set to + * false if the caller wants to avoid unexpected updates of the GUI. + * @throws IndexOutOfBoundsException if (to < 0 || to >= queue.size()) || (from < 0 || from >= queue.size()) + */ + public static Future moveQueueItemToTop(final Context context, final FeedItem selectedItem, final boolean broadcastUpdate) { + return dbExec.submit(new Runnable() { + @Override + public void run() { + final PodDBAdapter adapter = new PodDBAdapter(context); + adapter.open(); + final List queue = DBReader + .getQueue(context, adapter); + + if (queue != null) { + if (queue.remove(selectedItem)) { + // it was removed, put it on the front + queue.add(0, selectedItem); + } else { + Log.e(TAG, "moveQueueItemToTop: Could not move to top, no such item"); + } + } else { + Log.e(TAG, "moveQueueItemToTop: Could not move to top, no queue"); + } + adapter.close(); + } + }); + } + /** * Changes the position of a FeedItem in the queue. * From 2d83b39c27a32f51776dac14b032a72e0c3fbef8 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 16 Aug 2013 14:39:54 -0400 Subject: [PATCH 2/3] added move to top to individual items in the episode queue. Move to bottom coming soon. --- res/menu/feeditem.xml | 6 ++++- res/values/strings.xml | 1 + .../danoeh/antennapod/storage/DBWriter.java | 23 +++++++++++++++---- .../util/menuhandler/FeedItemMenuHandler.java | 3 +++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml index 09b7fa6b0..2d952d3c3 100644 --- a/res/menu/feeditem.xml +++ b/res/menu/feeditem.xml @@ -67,6 +67,10 @@ android:showAsAction="collapseActionView" android:title="@string/support_label"> - + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index b3f9975cb..5fb778825 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -250,5 +250,6 @@ Folder is not empty The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway? Choose default folder + Move to top \ No newline at end of file diff --git a/src/de/danoeh/antennapod/storage/DBWriter.java b/src/de/danoeh/antennapod/storage/DBWriter.java index 9946783e9..c34f134ff 100644 --- a/src/de/danoeh/antennapod/storage/DBWriter.java +++ b/src/de/danoeh/antennapod/storage/DBWriter.java @@ -480,11 +480,24 @@ public class DBWriter { .getQueue(context, adapter); if (queue != null) { - if (queue.remove(selectedItem)) { - // it was removed, put it on the front - queue.add(0, selectedItem); - } else { - Log.e(TAG, "moveQueueItemToTop: Could not move to top, no such item"); + // it seems like there should be a better way to get + // the item we need, but iterating seems to be the + // only way + for (FeedItem item : queue) { + if (item.getId() == selectedItem.getId()) { + if (queue.remove(item)) { + queue.add(0, item); + Log.d(TAG, "moveQueueItemToTop: moved"); + adapter.setQueue(queue); + if (broadcastUpdate) { + EventDistributor.getInstance() + .sendQueueUpdateBroadcast(); + } + } else { + Log.e(TAG, "moveQueueItemToTop: Could not move to top, no such item"); + } + break; + } } } else { Log.e(TAG, "moveQueueItemToTop: Could not move to top, no queue"); diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java index aa029f672..4b99b47fb 100644 --- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java +++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java @@ -150,6 +150,9 @@ public class FeedItemMenuHandler { DBTasks.playMedia(context, selectedItem.getMedia(), true, true, true); break; + case R.id.move_to_top_item: + DBWriter.moveQueueItemToTop(context, selectedItem, true); + break; case R.id.visit_website_item: Uri uri = Uri.parse(selectedItem.getLink()); context.startActivity(new Intent(Intent.ACTION_VIEW, uri)); From b886c38308a4e7ff9ab733e52b3703962d789fbf Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 16 Aug 2013 15:19:56 -0400 Subject: [PATCH 3/3] * updated code to reuse existing function for moving items in the queue * added 'move to bottom' --- res/menu/feeditem.xml | 5 ++ res/values/strings.xml | 3 +- .../danoeh/antennapod/storage/DBWriter.java | 67 +++++++++---------- .../util/menuhandler/FeedItemMenuHandler.java | 5 +- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml index 2d952d3c3..644b71081 100644 --- a/res/menu/feeditem.xml +++ b/res/menu/feeditem.xml @@ -72,5 +72,10 @@ android:showAsAction="collapseActionView" android:title="@string/move_to_top_label"> + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 5fb778825..7b45a7201 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -127,6 +127,8 @@ Organize queue Undo Item removed + Move to top + Move to bottom Flattr sign-in @@ -250,6 +252,5 @@ Folder is not empty The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway? Choose default folder - Move to top \ No newline at end of file diff --git a/src/de/danoeh/antennapod/storage/DBWriter.java b/src/de/danoeh/antennapod/storage/DBWriter.java index c34f134ff..d879f3c83 100644 --- a/src/de/danoeh/antennapod/storage/DBWriter.java +++ b/src/de/danoeh/antennapod/storage/DBWriter.java @@ -467,44 +467,39 @@ public class DBWriter { * @param selectedItem The item to move to the top of the queue * @param broadcastUpdate true if this operation should trigger a QueueUpdateBroadcast. This option should be set to * false if the caller wants to avoid unexpected updates of the GUI. - * @throws IndexOutOfBoundsException if (to < 0 || to >= queue.size()) || (from < 0 || from >= queue.size()) */ - public static Future moveQueueItemToTop(final Context context, final FeedItem selectedItem, final boolean broadcastUpdate) { - return dbExec.submit(new Runnable() { - - @Override - public void run() { - final PodDBAdapter adapter = new PodDBAdapter(context); - adapter.open(); - final List queue = DBReader - .getQueue(context, adapter); - - if (queue != null) { - // it seems like there should be a better way to get - // the item we need, but iterating seems to be the - // only way - for (FeedItem item : queue) { - if (item.getId() == selectedItem.getId()) { - if (queue.remove(item)) { - queue.add(0, item); - Log.d(TAG, "moveQueueItemToTop: moved"); - adapter.setQueue(queue); - if (broadcastUpdate) { - EventDistributor.getInstance() - .sendQueueUpdateBroadcast(); - } - } else { - Log.e(TAG, "moveQueueItemToTop: Could not move to top, no such item"); - } - break; - } - } - } else { - Log.e(TAG, "moveQueueItemToTop: Could not move to top, no queue"); - } - adapter.close(); + public static Future moveQueueItemToTop(final Context context, final long itemId, final boolean broadcastUpdate) { + List queueIdList = DBReader.getQueueIDList(context); + int currentLocation = 0; + for (long id : queueIdList) { + if (id == itemId) { + return moveQueueItem(context, currentLocation, 0, true); } - }); + currentLocation++; + } + Log.e(TAG, "moveQueueItemToTop: item not found"); + return null; + } + + /** + * Moves the specified item to the bottom of the queue. + * + * @param context A context that is used for opening a database connection. + * @param selectedItem The item to move to the bottom of the queue + * @param broadcastUpdate true if this operation should trigger a QueueUpdateBroadcast. This option should be set to + * false if the caller wants to avoid unexpected updates of the GUI. + */ + public static Future moveQueueItemToBottom(final Context context, final long itemId, final boolean broadcastUpdate) { + List queueIdList = DBReader.getQueueIDList(context); + int currentLocation = 0; + for (long id : queueIdList) { + if (id == itemId) { + return moveQueueItem(context, currentLocation, queueIdList.size() - 1, true); + } + currentLocation++; + } + Log.e(TAG, "moveQueueItemToBottom: item not found"); + return null; } /** diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java index 4b99b47fb..0116dbf21 100644 --- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java +++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java @@ -151,7 +151,10 @@ public class FeedItemMenuHandler { true); break; case R.id.move_to_top_item: - DBWriter.moveQueueItemToTop(context, selectedItem, true); + DBWriter.moveQueueItemToTop(context, selectedItem.getId(), true); + break; + case R.id.move_to_bottom_item: + DBWriter.moveQueueItemToBottom(context, selectedItem.getId(), true); break; case R.id.visit_website_item: Uri uri = Uri.parse(selectedItem.getLink());