Merge pull request #4940 from ByteHamster/more-reliable-chapters

More reliable chapter loading

1 files changed, 7 insertions, 10 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index ae8d1a45e..fb37222f7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -51,7 +51,7 @@ import java.util.List;
  * Communicates with the playback service. GUI classes should use this class to
  * control playback instead of communicating with the PlaybackService directly.
  */
-public class PlaybackController {
+public abstract class PlaybackController {
 
     private static final String TAG = "PlaybackController";
     private static final int INVALID_TIME = -1;
@@ -193,7 +193,6 @@ public class PlaybackController {
                             bound = activity.bindService(optionalIntent.get(), mConnection, 0);
                         } else {
                             status = PlayerStatus.STOPPED;
-                            setupGUI();
                             handleStatus();
                         }
                     } else {
@@ -331,8 +330,6 @@ public class PlaybackController {
         }
     };
 
-    public void setupGUI() {}
-
     public void onPositionObserverUpdate() {}
 
 
@@ -431,7 +428,10 @@ public class PlaybackController {
     }
 
     private void checkMediaInfoLoaded() {
-        mediaInfoLoaded = (mediaInfoLoaded || loadMediaInfo());
+        if (!mediaInfoLoaded) {
+            loadMediaInfo();
+        }
+        mediaInfoLoaded = true;
     }
 
     private void updatePlayButtonAppearance(int resource, CharSequence contentDescription) {
@@ -446,9 +446,7 @@ public class PlaybackController {
         return null;
     }
 
-    public boolean loadMediaInfo() {
-        return false;
-    }
+    public abstract void loadMediaInfo();
 
     public  void onAwaitingVideoSurface()  {}
 
@@ -463,10 +461,9 @@ public class PlaybackController {
             status = info.playerStatus;
             media = info.playable;
 
-            setupGUI();
-            handleStatus();
             // make sure that new media is loaded if it's available
             mediaInfoLoaded = false;
+            handleStatus();
 
         } else {
             Log.e(TAG,