1 files changed, 24 insertions, 9 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index d82c7b8f7..24c9fc425 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -47,6 +47,7 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.QueueSorter;
 import de.danoeh.antennapod.core.util.gui.FeedItemUndoToken;
@@ -66,12 +67,14 @@ public class QueueFragment extends Fragment {
             EventDistributor.DOWNLOAD_QUEUED |
             EventDistributor.PLAYER_STATUS_UPDATE;
 
+    private TextView infoBar;
     private DragSortListView listView;
     private QueueListAdapter listAdapter;
     private TextView txtvEmpty;
     private ProgressBar progLoading;
 
     private ContextMenu contextMenu;
+    private AdapterView.AdapterContextMenuInfo lastMenuInfo = null;
 
     private UndoBarController<FeedItemUndoToken> undoBarController;
 
@@ -325,16 +328,20 @@ public class QueueFragment extends Fragment {
         }
 
         contextMenu = menu;
+        lastMenuInfo = (AdapterView.AdapterContextMenuInfo) menuInfo;
         LongList queueIds = new LongList(queue.size());
         for(FeedItem queueItem : queue) {
             queueIds.add(queueItem.getId());
         }
-        FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, true, queueIds);
+        FeedItemMenuHandler.onPrepareMenu(getActivity(), contextMenuInterface, item, true, queueIds);
     }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
+        if(menuInfo == null) {
+            menuInfo = lastMenuInfo;
+        }
         FeedItem selectedItem = itemAccess.getItem(menuInfo.position);
 
         if (selectedItem == null) {
@@ -358,6 +365,7 @@ public class QueueFragment extends Fragment {
         ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.queue_label);
 
         View root = inflater.inflate(R.layout.queue_fragment, container, false);
+        infoBar = (TextView) root.findViewById(R.id.info_bar);
         listView = (DragSortListView) root.findViewById(android.R.id.list);
         txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
         progLoading = (ProgressBar) root.findViewById(R.id.progLoading);
@@ -426,7 +434,7 @@ public class QueueFragment extends Fragment {
                     long itemId = token.getFeedItemId();
                     FeedItem item = DBReader.getFeedItem(context, itemId);
                     FeedMedia media = item.getMedia();
-                    if(media != null && media.hasAlmostEnded() && UserPreferences.isAutoDelete()) {
+                    if(media != null && media.hasAlmostEnded() && item.getFeed().getPreferences().getCurrentAutoDelete()) {
                         DBWriter.deleteFeedMediaOfItem(context, media.getId());
                     }
                 }
@@ -464,18 +472,25 @@ public class QueueFragment extends Fragment {
         // we need to refresh the options menu because it sometimes
         // needs data that may have just been loaded.
         getActivity().supportInvalidateOptionsMenu();
-    }
 
-    private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
-        @Override
-        public void onContentChanged() {
-            if (listAdapter != null && !blockDownloadObserverUpdate) {
-                listAdapter.notifyDataSetChanged();
+        // refresh information bar
+        String info = queue.size() + getString(R.string.episodes_suffix);
+        if(queue.size() > 0) {
+            long duration = 0;
+            for(FeedItem item : queue) {
+                if(item.getMedia() != null) {
+                    duration += item.getMedia().getDuration();
+                }
             }
+            info += " \u2022 ";
+            info += Converter.getDurationStringLocalized(getActivity(), duration);
         }
+        infoBar.setText(info);
+    }
 
+    private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
         @Override
-        public void onDownloadDataAvailable(List<Downloader> downloaderList) {
+        public void onContentChanged(List<Downloader> downloaderList) {
             QueueFragment.this.downloaderList = downloaderList;
             if (listAdapter != null && !blockDownloadObserverUpdate) {
                 listAdapter.notifyDataSetChanged();