Merge branch 'master' of https://github.com/AntennaPod/AntennaPod into AntennaPod-master

core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java

1 files changed, 61 insertions, 0 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 ce77229d9..ca8543b4c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.fragment;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
@@ -30,11 +31,16 @@ import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
 import de.danoeh.antennapod.adapter.QueueListAdapter;
 import de.danoeh.antennapod.core.asynctask.DownloadObserver;
 import de.danoeh.antennapod.core.feed.EventDistributor;
+import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
+import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.storage.DownloadRequester;
+import de.danoeh.antennapod.core.util.QueueSorter;
 import de.danoeh.antennapod.menuhandler.MenuItemUtils;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 
@@ -57,6 +63,7 @@ public class QueueFragment extends Fragment {
 
     private boolean itemsLoaded = false;
     private boolean viewsCreated = false;
+    private boolean isUpdatingFeeds = false;
 
     private AtomicReference<Activity> activity = new AtomicReference<Activity>();
 
@@ -125,10 +132,19 @@ public class QueueFragment extends Fragment {
         resetViewState();
     }
 
+    private final MenuItemUtils.UpdateRefreshMenuItemChecker updateRefreshMenuItemChecker = new MenuItemUtils.UpdateRefreshMenuItemChecker() {
+        @Override
+        public boolean isRefreshing() {
+            return DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds();
+        }
+    };
+
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         if (itemsLoaded && !MenuItemUtils.isActivityDrawerOpen((NavDrawerActivity) getActivity())) {
+            inflater.inflate(R.menu.queue, menu);
+
             final SearchView sv = new SearchView(getActivity());
             MenuItemUtils.addSearchItem(menu, sv);
             sv.setQueryHint(getString(R.string.search_hint));
@@ -145,7 +161,45 @@ public class QueueFragment extends Fragment {
                     return false;
                 }
             });
+            isUpdatingFeeds = MenuItemUtils.updateRefreshMenuItem(menu, R.id.refresh_item, updateRefreshMenuItemChecker);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (!super.onOptionsItemSelected(item)) {
+            switch (item.getItemId()) {
+                case R.id.refresh_item:
+                    List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
+                    if (feeds != null) {
+                        DBTasks.refreshAllFeeds(getActivity(), feeds);
+                    }
+                    return true;
+                case R.id.queue_sort_alpha_asc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.ALPHA_ASC, true);
+                    return true;
+                case R.id.queue_sort_alpha_desc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.ALPHA_DESC, true);
+                    return true;
+                case R.id.queue_sort_date_asc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.DATE_ASC, true);
+                    return true;
+                case R.id.queue_sort_date_desc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.DATE_DESC, true);
+                    return true;
+                case R.id.queue_sort_duration_asc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.DURATION_ASC, true);
+                    return true;
+                case R.id.queue_sort_duration_desc:
+                    QueueSorter.sort(getActivity(), QueueSorter.Rule.DURATION_DESC, true);
+                    return true;
+                default:
+                    return false;
+            }
+        } else {
+            return true;
         }
+
     }
 
     @Override
@@ -258,6 +312,10 @@ public class QueueFragment extends Fragment {
             downloadObserver.onResume();
         }
         listAdapter.notifyDataSetChanged();
+
+        // 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() {
@@ -307,6 +365,9 @@ public class QueueFragment extends Fragment {
         public void update(EventDistributor eventDistributor, Integer arg) {
             if ((arg & EVENTS) != 0) {
                 startItemLoader();
+                if (isUpdatingFeeds != updateRefreshMenuItemChecker.isRefreshing()) {
+                    getActivity().supportInvalidateOptionsMenu();
+                }
             }
         }
     };