Removed return parameter of loadMediaInfo

We return true anyways. The call for actually loading is asynchronous,
so returning anything here does not make sense.

Reduces likelihood of loader being interrupted to just load the same
item again when the state changes.

11 files changed, 36 insertions, 26 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 76359ddc0..41d881905 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -135,8 +135,8 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             }
 
             @Override
-            public boolean loadMediaInfo() {
-                return MediaplayerActivity.this.loadMediaInfo();
+            public void loadMediaInfo() {
+                MediaplayerActivity.this.loadMediaInfo();
             }
 
             @Override
@@ -459,16 +459,15 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
      * to the PlaybackService to ensure that the activity has the right
      * FeedMedia object.
      */
-    boolean loadMediaInfo() {
+    void loadMediaInfo() {
         Log.d(TAG, "loadMediaInfo()");
-        if(controller == null || controller.getMedia() == null) {
-            return false;
+        if (controller == null || controller.getMedia() == null) {
+            return;
         }
         showTimeLeft = UserPreferences.shouldShowRemainingTime();
         onPositionObserverUpdate();
         checkFavorite();
         updatePlaybackSpeedButton();
-        return true;
     }
 
     void updatePlaybackSpeedButton() {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 749681d4a..15d0bec4a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -132,17 +132,13 @@ public class VideoplayerActivity extends MediaplayerActivity {
     }
 
     @Override
-    protected boolean loadMediaInfo() {
-        if (!super.loadMediaInfo() || controller == null) {
-            return false;
-        }
+    protected void loadMediaInfo() {
+        super.loadMediaInfo();
         Playable media = controller.getMedia();
         if (media != null) {
             getSupportActionBar().setSubtitle(media.getEpisodeTitle());
             getSupportActionBar().setTitle(media.getFeedTitle());
-            return true;
         }
-        return false;
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
index 98f6cc117..91c030749 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
@@ -45,6 +45,11 @@ public class PlaybackControlsDialog extends DialogFragment {
                 setupUi();
                 setupAudioTracks();
             }
+
+            @Override
+            public void loadMediaInfo() {
+
+            }
         };
         controller.init();
         setupUi();
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
index f1a41d753..25a80f680 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
@@ -55,6 +55,11 @@ public class SleepTimerDialog extends DialogFragment {
             public void onSleepTimerUpdate() {
                 updateTime();
             }
+
+            @Override
+            public void loadMediaInfo() {
+                updateTime();
+            }
         };
         controller.init();
         timeUpdater = Observable.interval(1, TimeUnit.SECONDS)
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
index 1fc7a77b2..5b1f593c5 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java
@@ -64,6 +64,11 @@ public class VariableSpeedDialog extends DialogFragment {
             public void onPlaybackSpeedChange() {
                 updateSpeed();
             }
+
+            @Override
+            public void loadMediaInfo() {
+                updateSpeed();
+            }
         };
         controller.init();
         speedSeekBar.setController(controller);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
index 8ff8866e0..34833f442 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
@@ -365,9 +365,8 @@ public class AudioPlayerFragment extends Fragment implements
             }
 
             @Override
-            public boolean loadMediaInfo() {
+            public void loadMediaInfo() {
                 AudioPlayerFragment.this.loadMediaInfo();
-                return true;
             }
 
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
index 624345907..c044bc0bf 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -72,9 +72,8 @@ public class ChaptersFragment extends Fragment {
         super.onStart();
         controller = new PlaybackController(getActivity()) {
             @Override
-            public boolean loadMediaInfo() {
+            public void loadMediaInfo() {
                 ChaptersFragment.this.loadMediaInfo();
-                return true;
             }
 
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index 0132305a3..ff64841cc 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -117,9 +117,8 @@ public class CoverFragment extends Fragment {
         super.onStart();
         controller = new PlaybackController(getActivity()) {
             @Override
-            public boolean loadMediaInfo() {
+            public void loadMediaInfo() {
                 CoverFragment.this.loadMediaInfo();
-                return true;
             }
 
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 3ca35a37f..a65782b54 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -108,8 +108,8 @@ public class ExternalPlayerFragment extends Fragment {
             }
 
             @Override
-            public boolean loadMediaInfo() {
-                return ExternalPlayerFragment.this.loadMediaInfo();
+            public void loadMediaInfo() {
+                ExternalPlayerFragment.this.loadMediaInfo();
             }
 
             @Override
@@ -170,11 +170,11 @@ public class ExternalPlayerFragment extends Fragment {
         }
     }
 
-    private boolean loadMediaInfo() {
+    private void loadMediaInfo() {
         Log.d(TAG, "Loading media info");
         if (controller == null) {
             Log.w(TAG, "loadMediaInfo was called while PlaybackController was null!");
-            return false;
+            return;
         }
 
         if (disposable != null) {
@@ -186,7 +186,6 @@ public class ExternalPlayerFragment extends Fragment {
                 .subscribe(this::updateUi,
                         error -> Log.e(TAG, Log.getStackTraceString(error)),
                         () -> ((MainActivity) getActivity()).setPlayerVisible(false));
-        return true;
     }
 
     private void updateUi(Playable media) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 18a61f1e6..3b9f038e6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -140,9 +140,8 @@ public class ItemDescriptionFragment extends Fragment {
         super.onStart();
         controller = new PlaybackController(getActivity()) {
             @Override
-            public boolean loadMediaInfo() {
+            public void loadMediaInfo() {
                 load();
-                return true;
             }
 
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index fd9da89e4..fa2c82623 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -238,7 +238,12 @@ public class ItemFragment extends Fragment {
     public void onStart() {
         super.onStart();
         EventBus.getDefault().register(this);
-        controller = new PlaybackController(getActivity());
+        controller = new PlaybackController(getActivity()) {
+            @Override
+            public void loadMediaInfo() {
+                // Do nothing
+            }
+        };
         controller.init();
     }