Fix removing only fully watched videos from playlist #8259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timarnoldev
approved these changes
Apr 19, 2022
opusforlife2
changed the title
Stypox
requested changes
May 2, 2022
Comment on lines
421
to
432
| final StreamStateEntity streamStateEntity = streamStatesIter.next(); | ||
| final long duration = playlistItem.toStreamInfoItem().getDuration(); | ||
| boolean isFinished = false; | ||
| if (streamStateEntity != null) { | ||
| isFinished = streamStateEntity.isFinished(duration); | ||
| } | ||
| final boolean isNotWatchedItem = (streamStateEntity != null | ||
| && !isFinished); | ||
| if (indexInHistory < 0) { | ||
| notWatchedItems.add(playlistItem); | ||
| } else if (isNotWatchedItem) { | ||
| notWatchedItems.add(playlistItem); |
There was a problem hiding this comment.
The logic was difficult to understand, this is clearer in my opinion (also keep the newline)
Suggested change
| final StreamStateEntity streamStateEntity = streamStatesIter.next(); | |
| final long duration = playlistItem.toStreamInfoItem().getDuration(); | |
| boolean isFinished = false; | |
| if (streamStateEntity != null) { | |
| isFinished = streamStateEntity.isFinished(duration); | |
| } | |
| final boolean isNotWatchedItem = (streamStateEntity != null | |
| && !isFinished); | |
| if (indexInHistory < 0) { | |
| notWatchedItems.add(playlistItem); | |
| } else if (isNotWatchedItem) { | |
| notWatchedItems.add(playlistItem); | |
| final StreamStateEntity streamStateEntity = streamStatesIter.next(); | |
| final long duration = playlistItem.toStreamInfoItem().getDuration(); | |
| if (indexInHistory < 0 || (streamStateEntity != null && streamStateEntity.isFinished(duration))) { | |
| notWatchedItems.add(playlistItem); |
There was a problem hiding this comment.
I think it is indexInHistory < 0 || (streamStateEntity != null && !streamStateEntity.isFinished(duration)), there should be
a "!" before streamStateEntity.isFinished(duration)
There was a problem hiding this comment.
OK, I have modified it.
Stypox
changed the title
Stypox
requested changes
May 5, 2022
app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
Show resolved
Hide resolved
Stypox
approved these changes
May 5, 2022
|
Kudos, SonarCloud Quality Gate passed! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is it?
Description of the changes in your PR
Before fixing, in the playlist view press "Remove watched', then press "OK", no videos are removed. After fixing, all completely watched videos can be removed.
Before/After Screenshots/Screen Record
before.mp4
After.mp4
Fixes the following issue(s)
APK testing
The APK can be found by going to the "Checks" tab below the title. On the left pane, click on "CI", scroll down to "artifacts" and click "app" to download the zip file which contains the debug APK of this PR.
Due diligence