Fix a bug on playNext

This commit is contained in:
CappielloAntonio 2021-12-30 20:49:28 +01:00
parent 0c8a3035b6
commit c046533d49
3 changed files with 4 additions and 9 deletions

View file

@ -170,7 +170,7 @@ public class MediaManager {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
if (mediaBrowserListenableFuture.isDone()) { if (mediaBrowserListenableFuture.isDone()) {
if (playImmediatelyAfter) { if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
enqueueDatabase(songs, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex()); enqueueDatabase(songs, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
mediaBrowserListenableFuture.get().addMediaItems(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItems(context, songs)); mediaBrowserListenableFuture.get().addMediaItems(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItems(context, songs));
} else { } else {
@ -192,7 +192,7 @@ public class MediaManager {
mediaBrowserListenableFuture.addListener(() -> { mediaBrowserListenableFuture.addListener(() -> {
try { try {
if (mediaBrowserListenableFuture.isDone()) { if (mediaBrowserListenableFuture.isDone()) {
if (playImmediatelyAfter) { if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
enqueueDatabase(song, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex()); enqueueDatabase(song, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
mediaBrowserListenableFuture.get().addMediaItem(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItem(context, song)); mediaBrowserListenableFuture.get().addMediaItem(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItem(context, song));
} else { } else {

View file

@ -59,13 +59,14 @@ public class MainActivity extends BaseActivity {
connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this); connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this);
connectivityStatusReceiverManager(true); connectivityStatusReceiverManager(true);
init();
checkConnectionType(); checkConnectionType();
} }
@Override @Override
protected void onStart() { protected void onStart() {
super.onStart(); super.onStart();
init(); initServiceContent();
} }
@Override @Override
@ -94,7 +95,6 @@ public class MainActivity extends BaseActivity {
initBottomSheet(); initBottomSheet();
initNavigation(); initNavigation();
initServiceContent();
if (PreferenceUtil.getInstance(this).getToken() != null) { if (PreferenceUtil.getInstance(this).getToken() != null) {
goFromLogin(); goFromLogin();

View file

@ -97,11 +97,6 @@ public class PlayerBottomSheetFragment extends Fragment {
initializeMediaBrowser(); initializeMediaBrowser();
bindMediaController(); bindMediaController();
}
@Override
public void onResume() {
super.onResume();
setMediaBrowserListenableFuture(); setMediaBrowserListenableFuture();
} }