Skip to content

Add PlayQueueItem equals and hashCode #12347

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

Merged
Isira-Seneviratne merged 5 commits into from
Jul 9, 2025
Merged

Add PlayQueueItem equals and hashCode #12347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
690af88
Add PlayQueueItem equals and hashCode
Isira-Seneviratne Jun 11, 2025
e2a02a1
Fix some issues
Isira-Seneviratne Jun 11, 2025
bb7873d
Fix Sonar warning
Isira-Seneviratne Jun 11, 2025
c2b6c71
Rename .java to .kt
Isira-Seneviratne Jul 4, 2025
31f8dd0
Convert play queue classes to Kotlin
Isira-Seneviratne Jul 4, 2025
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
12 changes: 5 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 @@ -852,8 +852,7 @@ private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
if (playQueue == null) {
playQueue = new SinglePlayQueue(result);
}
if (stack.isEmpty() || !stack.peek().getPlayQueue()
Copy link
Copy Markdown
Contributor

@HatakeKakashri HatakeKakashri Jun 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be possible to use == operator here now.

Copy link
Copy Markdown
Member Author

@Isira-Seneviratne Isira-Seneviratne Jul 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's only possible for Kotlin.

.equalStreams(playQueue)) {
if (stack.isEmpty() || !stack.peek().getPlayQueue().equals(playQueue)) {
stack.push(new StackItem(serviceId, url, title, playQueue));
}
}
Expand Down Expand Up @@ -1739,7 +1738,7 @@ public void onQueueUpdate(final PlayQueue queue) {
// deleted/added items inside Channel/Playlist queue and makes possible to have
// a history of played items
@Nullable final StackItem stackPeek = stack.peek();
if (stackPeek != null && !stackPeek.getPlayQueue().equalStreams(queue)) {
if (stackPeek != null && !stackPeek.getPlayQueue().equals(queue)) {
@Nullable final PlayQueueItem playQueueItem = queue.getItem();
if (playQueueItem != null) {
stack.push(new StackItem(playQueueItem.getServiceId(), playQueueItem.getUrl(),
Expand Down Expand Up @@ -1803,7 +1802,7 @@ public void onMetadataUpdate(final StreamInfo info, final PlayQueue queue) {
// They are not equal when user watches something in popup while browsing in fragment and
// then changes screen orientation. In that case the fragment will set itself as
// a service listener and will receive initial call to onMetadataUpdate()
if (!queue.equalStreams(playQueue)) {
if (!queue.equals(playQueue)) {
return;
}

Expand Down Expand Up @@ -2075,7 +2074,7 @@ private StackItem findQueueInStack(final PlayQueue queue) {
final Iterator<StackItem> iterator = stack.descendingIterator();
while (iterator.hasNext()) {
final StackItem next = iterator.next();
if (next.getPlayQueue().equalStreams(queue)) {
if (next.getPlayQueue().equals(queue)) {
item = next;
break;
}
Expand All @@ -2089,8 +2088,7 @@ private void replaceQueueIfUserConfirms(final Runnable onAllow) {
// Player will have STATE_IDLE when a user pressed back button
if (isClearingQueueConfirmationRequired(activity)
&& playerIsNotStopped()
&& activeQueue != null
&& !activeQueue.equalStreams(playQueue)) {
&& !Objects.equals(activeQueue, playQueue)) {
showClearingQueueConfirmation(onAllow);
} else {
onAllow.run();
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/schabi/newpipe/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public void handleIntent(@NonNull final Intent intent) {
&& newQueue.size() == 1 && newQueue.getItem() != null
&& playQueue != null && playQueue.size() == 1 && playQueue.getItem() != null
&& newQueue.getItem().getUrl().equals(playQueue.getItem().getUrl())
&& newQueue.getItem().getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just ran into issues with this. Please ensure to keep constants while converting to kotlin in the futur. I reverted the removal of the RECOVERY_UNSET constant in #13202

&& newQueue.getItem().getRecoveryPosition() != Long.MIN_VALUE) {
// Player can have state = IDLE when playback is stopped or failed
// and we should retry in this case
if (simpleExoPlayer.getPlaybackState()
Expand Down Expand Up @@ -425,7 +425,7 @@ public void handleIntent(@NonNull final Intent intent) {
&& !samePlayQueue
&& !newQueue.isEmpty()
&& newQueue.getItem() != null
&& newQueue.getItem().getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
&& newQueue.getItem().getRecoveryPosition() == Long.MIN_VALUE) {
databaseUpdateDisposable.add(recordManager.loadStreamState(newQueue.getItem())
.observeOn(AndroidSchedulers.mainThread())
// Do not place initPlayback() in doFinally() because
Expand Down Expand Up @@ -1588,7 +1588,7 @@ public void onPlaybackSynchronize(@NonNull final PlayQueueItem item, final boole
}

// sync the player index with the queue index, and seek to the correct position
if (item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
if (item.getRecoveryPosition() != Long.MIN_VALUE) {
simpleExoPlayer.seekTo(playQueueIndex, item.getRecoveryPosition());
playQueue.unsetRecovery(playQueueIndex);
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
import io.reactivex.rxjava3.schedulers.Schedulers;
import io.reactivex.rxjava3.subjects.PublishSubject;

import static org.schabi.newpipe.BuildConfig.DEBUG;
import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException;
import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException;
import static org.schabi.newpipe.player.playqueue.PlayQueue.DEBUG;
import static org.schabi.newpipe.util.ServiceHelper.getCacheExpirationMillis;

public class MediaSourceManager {
Expand Down
Loading