Skip to content

fix(player): show clear-queue confirmation when tapping a new video #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rumi-sketches wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(player): show clear-queue confirmation when tapping a new video #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 additions & 7 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,14 +996,17 @@ public void selectAndLoadVideo(final int newServiceId,
@Nullable final String newUrl,
@NonNull final String newTitle,
@Nullable final PlayQueue newQueue) {
if (isPlayerAvailable() && newQueue != null && playQueue != null
&& playQueue.getItem() != null && !playQueue.getItem().getUrl().equals(newUrl)) {
// Preloading can be disabled since playback is surely being replaced.
player.disablePreloadingOfCurrentTrack();
}
loadVideoIfUserConfirms(newUrl, () -> {
if (isPlayerAvailable() && newQueue != null && playQueue != null
&& playQueue.getItem() != null
&& !playQueue.getItem().getUrl().equals(newUrl)) {
// Preloading can be disabled since playback is surely being replaced.
player.disablePreloadingOfCurrentTrack();
}

setInitialData(newServiceId, newUrl, newTitle, newQueue);
startLoading(false, true);
setInitialData(newServiceId, newUrl, newTitle, newQueue);
startLoading(false, true);
});
}

private void prepareAndHandleInfoIfNeededAfterDelay(final StreamInfo info,
Expand Down Expand Up @@ -2510,10 +2513,12 @@ private StackItem findQueueInStack(final PlayQueue queue) {

private void replaceQueueIfUserConfirms(final Runnable onAllow) {
@Nullable final PlayQueue activeQueue = isPlayerAvailable() ? player.getPlayQueue() : null;
final boolean hasMultiItemQueue = activeQueue != null && activeQueue.size() > 1;

// Player will have STATE_IDLE when a user pressed back button
if (isClearingQueueConfirmationRequired(activity)
&& playerIsNotStopped()
&& hasMultiItemQueue
&& activeQueue != null
&& !activeQueue.equals(playQueue)) {
showClearingQueueConfirmation(onAllow);
Expand All @@ -2522,6 +2527,33 @@ && playerIsNotStopped()
}
}

/**
* Same purpose as {@link #replaceQueueIfUserConfirms(Runnable)}, but meant to be called
* before the new stream's data has been loaded (e.g. from {@link #selectAndLoadVideo}),
* i.e. before {@link #playQueue} has been updated to reflect the new target. Since
* {@link #playQueue} cannot be used for comparison yet, the queue currently playing in the
* active player is compared directly against the URL of the stream about to be loaded.
*
* @param newUrl the url of the stream that is about to replace the active one, if confirmed
* @param onAllow the action to run once the navigation is allowed to proceed
*/
private void loadVideoIfUserConfirms(@Nullable final String newUrl, final Runnable onAllow) {
@Nullable final PlayQueue activeQueue = isPlayerAvailable() ? player.getPlayQueue() : null;
@Nullable final PlayQueueItem activeItem =
activeQueue != null ? activeQueue.getItem() : null;
final boolean hasMultiItemQueue = activeQueue != null && activeQueue.size() > 1;

if (isClearingQueueConfirmationRequired(activity)
&& playerIsNotStopped()
&& hasMultiItemQueue
&& activeItem != null
&& !activeItem.getUrl().equals(newUrl)) {
showClearingQueueConfirmation(onAllow);
} else {
onAllow.run();
}
}

private void showClearingQueueConfirmation(final Runnable onAllow) {
new AlertDialog.Builder(activity)
.setTitle(R.string.clear_queue_confirmation_description)
Expand Down