Merge branch 'master' into develop

1 files changed, 5 insertions, 15 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java b/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java
index cfa35ea29..3b9d6a08d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/menuhandler/MenuItemUtils.java
@@ -11,31 +11,21 @@ import de.danoeh.antennapod.core.R;
 public class MenuItemUtils {
 
     /**
-     * Changes the appearance of a MenuItem depending on whether the given UpdateRefreshMenuItemChecker
-     * is refreshing or not. If it returns true, the menu item will be replaced by an indeterminate progress
-     * bar, otherwise the progress bar will be hidden.
-     *
      * @param menu    The menu that the MenuItem belongs to
      * @param resId   The id of the MenuItem
-     * @param checker Is used for checking whether to show the progress indicator or not.
-     * @return The returned value of the UpdateRefreshMenuItemChecker's isRefreshing() method.
      */
-    public static boolean updateRefreshMenuItem(Menu menu, int resId, UpdateRefreshMenuItemChecker checker) {
+    public static void updateRefreshMenuItem(Menu menu, int resId, boolean isRefreshing) {
         // expand actionview if feeds are being downloaded, collapse otherwise
         MenuItem refreshItem = menu.findItem(resId);
-        if (checker.isRefreshing()) {
-            refreshItem.setActionView(R.layout.refresh_action_view);
-            return true;
+        if (isRefreshing) {
+            if (refreshItem.getActionView() == null) {
+                refreshItem.setActionView(R.layout.refresh_action_view);
+            }
         } else {
             refreshItem.setActionView(null);
-            return false;
         }
     }
 
-    public interface UpdateRefreshMenuItemChecker {
-        boolean isRefreshing();
-    }
-
     /**
      * When pressing a context menu item, Android calls onContextItemSelected
      * for ALL fragments in arbitrary order, not just for the fragment that the