Skip to content

Commit c0d229a

Browse files
snaik20Profpatsch
authored andcommitted
Addressed review comments
1 parent f974bf1 commit c0d229a

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

app/src/main/java/org/schabi/newpipe/player/Player.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
4646
import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
4747
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
48-
import static java.util.Objects.requireNonNull;
4948
import static java.util.concurrent.TimeUnit.MILLISECONDS;
5049

5150
import android.content.BroadcastReceiver;
@@ -87,8 +86,8 @@
8786
import org.schabi.newpipe.error.ErrorInfo;
8887
import org.schabi.newpipe.error.ErrorUtil;
8988
import org.schabi.newpipe.error.UserAction;
90-
import org.schabi.newpipe.extractor.stream.AudioStream;
9189
import org.schabi.newpipe.extractor.Image;
90+
import org.schabi.newpipe.extractor.stream.AudioStream;
9291
import org.schabi.newpipe.extractor.stream.StreamInfo;
9392
import org.schabi.newpipe.extractor.stream.StreamType;
9493
import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -119,9 +118,9 @@
119118
import org.schabi.newpipe.util.DependentPreferenceHelper;
120119
import org.schabi.newpipe.util.ListHelper;
121120
import org.schabi.newpipe.util.NavigationHelper;
122-
import org.schabi.newpipe.util.image.PicassoHelper;
123121
import org.schabi.newpipe.util.SerializedCache;
124122
import org.schabi.newpipe.util.StreamTypeUtil;
123+
import org.schabi.newpipe.util.image.PicassoHelper;
125124

126125
import java.util.List;
127126
import java.util.Optional;
@@ -416,9 +415,12 @@ public void handleIntent(@NonNull final Intent intent) {
416415
== com.google.android.exoplayer2.Player.STATE_IDLE) {
417416
simpleExoPlayer.prepare();
418417
}
418+
// Seeks to a specific index and position in the player if the queue index has changed.
419419
if (playQueue.getIndex() != newQueue.getIndex()) {
420-
simpleExoPlayer.seekTo(newQueue.getIndex(),
421-
requireNonNull(newQueue.getItem()).getRecoveryPosition());
420+
final PlayQueueItem queueItem = newQueue.getItem();
421+
if (queueItem != null) {
422+
simpleExoPlayer.seekTo(newQueue.getIndex(), queueItem.getRecoveryPosition());
423+
}
422424
}
423425
simpleExoPlayer.setPlayWhenReady(playWhenReady);
424426

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserConnector.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -120,20 +120,20 @@ class MediaBrowserConnector(playerService: PlayerService) : PlaybackPreparer {
120120

121121
private fun createPlaylistMediaItem(playlist: PlaylistLocalItem): MediaBrowserCompat.MediaItem {
122122
val builder = MediaDescriptionCompat.Builder()
123-
val isRemote = playlist is PlaylistRemoteEntity
124-
builder.setMediaId(createMediaIdForInfoItem(isRemote, playlist.uid))
123+
builder
124+
.setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid))
125125
.setTitle(playlist.orderingName)
126-
.setIconUri(Uri.parse(playlist.thumbnailUrl))
126+
.setIconUri(playlist.thumbnailUrl?.let { Uri.parse(it) })
127127

128128
val extras = Bundle()
129129
extras.putString(
130130
MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE,
131-
playerService.resources.getString(R.string.tab_bookmarks)
131+
playerService.resources.getString(R.string.tab_bookmarks),
132132
)
133133
builder.setExtras(extras)
134134
return MediaBrowserCompat.MediaItem(
135135
builder.build(),
136-
MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
136+
MediaBrowserCompat.MediaItem.FLAG_BROWSABLE,
137137
)
138138
}
139139

0 commit comments

Comments
 (0)