Only load chapters when actually needed

2 files changed, 7 insertions, 7 deletions

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 c1eff4e84..7f0326019 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
@@ -102,7 +102,7 @@ public class AudioPlayerFragment extends Fragment implements
         toolbar.setOnMenuItemClickListener(this);
 
         ExternalPlayerFragment externalPlayerFragment = new ExternalPlayerFragment();
-        getFragmentManager().beginTransaction()
+        getChildFragmentManager().beginTransaction()
                 .replace(R.id.playerFragment, externalPlayerFragment, ExternalPlayerFragment.TAG)
                 .commit();
 
@@ -127,7 +127,7 @@ public class AudioPlayerFragment extends Fragment implements
         sbPosition.setOnSeekBarChangeListener(this);
 
         pager = root.findViewById(R.id.pager);
-        AudioPlayerPagerAdapter pagerAdapter = new AudioPlayerPagerAdapter(getFragmentManager());
+        AudioPlayerPagerAdapter pagerAdapter = new AudioPlayerPagerAdapter(getChildFragmentManager());
         pager.setAdapter(pagerAdapter);
         // Required for getChildAt(int) in ViewPagerBottomSheetBehavior to return the correct page
         pager.setOffscreenPageLimit(NUM_CONTENT_FRAGMENTS);
@@ -355,12 +355,10 @@ public class AudioPlayerFragment extends Fragment implements
         updatePosition(new PlaybackPositionEvent(controller.getPosition(), controller.getDuration()));
         updatePlaybackSpeedButton(media);
         setupOptionsMenu(media);
+    }
 
-        if (media != null) {
-            List<Chapter> chapters = controller.getMedia().getChapters();
-            boolean hasChapters = chapters != null && !chapters.isEmpty();
-            pageIndicator.setDisabledPage(hasChapters ? -1 : 2);
-        }
+    public void setHasChapters(boolean hasChapters) {
+        pageIndicator.setDisabledPage(hasChapters ? -1 : 2);
     }
 
     @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 dc27e1f83..6d693f6cb 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -128,6 +128,7 @@ public class ChaptersFragment extends Fragment {
         disposable = Maybe.create(emitter -> {
             Playable media = controller.getMedia();
             if (media != null) {
+                media.loadChapterMarks();
                 emitter.onSuccess(media);
             } else {
                 emitter.onComplete();
@@ -146,6 +147,7 @@ public class ChaptersFragment extends Fragment {
             return;
         }
         adapter.setMedia(media);
+        ((AudioPlayerFragment) getParentFragment()).setHasChapters(adapter.getItemCount() > 0);
         int positionOfCurrentChapter = getCurrentChapter(media);
         updateChapterSelection(positionOfCurrentChapter);
     }