Add support for Android Auto

app/src/main/AndroidManifest.xml

@@ -64,6 +64,9 @@
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService"/>
+            </intent-filter>
         </service>
 
         <activity
@@ -424,5 +427,10 @@
         <meta-data
             android:name="com.samsung.android.multidisplay.keep_process_alive"
             android:value="true" />
+        <!-- Android Auto -->
+        <meta-data android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+        <meta-data android:name="com.google.android.gms.car.notification.SmallIcon"
+            android:resource="@mipmap/ic_launcher" />
     </application>
 </manifest>

app/src/main/java/org/schabi/newpipe/database/LocalItem.kt

@@ -0,0 +1,18 @@
+package org.schabi.newpipe.database
+
+/**
+ * Represents a generic item that can be stored locally. This can be a playlist, a stream, etc.
+ */
+interface LocalItem {
+    /**
+     * The type of local item. Can be null if the type is unknown or not applicable.
+     */
+    val localItemType: LocalItemType?
+
+    enum class LocalItemType {
+        PLAYLIST_LOCAL_ITEM,
+        PLAYLIST_REMOTE_ITEM,
+        PLAYLIST_STREAM_ITEM,
+        STATISTIC_STREAM_ITEM,
+    }
+}

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt

@@ -3,6 +3,8 @@ package org.schabi.newpipe.database.history.model
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
 import org.schabi.newpipe.database.stream.model.StreamEntity
+import org.schabi.newpipe.extractor.stream.StreamInfoItem
+import org.schabi.newpipe.util.image.ImageStrategy
 import java.time.OffsetDateTime
 
 data class StreamHistoryEntry(
@@ -27,4 +29,17 @@ data class StreamHistoryEntry(
         return this.streamEntity.uid == other.streamEntity.uid && streamId == other.streamId &&
             accessDate.isEqual(other.accessDate)
     }
+
+    fun toStreamInfoItem(): StreamInfoItem =
+        StreamInfoItem(
+            streamEntity.serviceId,
+            streamEntity.url,
+            streamEntity.title,
+            streamEntity.streamType,
+        ).apply {
+            duration = streamEntity.duration
+            uploaderName = streamEntity.uploader
+            uploaderUrl = streamEntity.uploaderUrl
+            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+        }
 }

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.kt

@@ -0,0 +1,28 @@
+package org.schabi.newpipe.database.playlist
+
+import org.schabi.newpipe.database.LocalItem
+
+/**
+ * Represents a playlist item stored locally.
+ */
+interface PlaylistLocalItem : LocalItem {
+    /**
+     * The name used for ordering this item within the playlist. Can be null.
+     */
+    val orderingName: String?
+
+    /**
+     * The index used to display this item within the playlist.
+     */
+    var displayIndex: Long
+
+    /**
+     * The unique identifier for this playlist item.
+     */
+    val uid: Long
+
+    /**
+     * The URL of the thumbnail image for this playlist item. Can be null.
+     */
+    val thumbnailUrl: String?
+}

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java

@@ -71,4 +71,9 @@ public long getUid() {
     public void setDisplayIndex(final long displayIndex) {
         this.displayIndex = displayIndex;
     }
+
+    @Override
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
 }

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt

@@ -22,19 +22,20 @@ data class PlaylistStreamEntry(
     @ColumnInfo(name = PlaylistStreamEntity.JOIN_INDEX)
     val joinIndex: Int
 ) : LocalItem {
-
     @Throws(IllegalArgumentException::class)
-    fun toStreamInfoItem(): StreamInfoItem {
-        val item = StreamInfoItem(streamEntity.serviceId, streamEntity.url, streamEntity.title, streamEntity.streamType)
-        item.duration = streamEntity.duration
-        item.uploaderName = streamEntity.uploader
-        item.uploaderUrl = streamEntity.uploaderUrl
-        item.thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
-
-        return item
-    }
-
-    override fun getLocalItemType(): LocalItem.LocalItemType {
-        return LocalItem.LocalItemType.PLAYLIST_STREAM_ITEM
-    }
+    fun toStreamInfoItem() =
+        StreamInfoItem(
+            streamEntity.serviceId,
+            streamEntity.url,
+            streamEntity.title,
+            streamEntity.streamType,
+        ).apply {
+            duration = streamEntity.duration
+            uploaderName = streamEntity.uploader
+            uploaderUrl = streamEntity.uploaderUrl
+            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+        }
+
+    override val localItemType: LocalItem.LocalItemType
+        get() = LocalItem.LocalItemType.PLAYLIST_STREAM_ITEM
 }

app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt

@@ -26,19 +26,21 @@ class StreamStatisticsEntry(
     @ColumnInfo(name = STREAM_WATCH_COUNT)
     val watchCount: Long
 ) : LocalItem {
-    fun toStreamInfoItem(): StreamInfoItem {
-        val item = StreamInfoItem(streamEntity.serviceId, streamEntity.url, streamEntity.title, streamEntity.streamType)
-        item.duration = streamEntity.duration
-        item.uploaderName = streamEntity.uploader
-        item.uploaderUrl = streamEntity.uploaderUrl
-        item.thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
-
-        return item
-    }
-
-    override fun getLocalItemType(): LocalItem.LocalItemType {
-        return LocalItem.LocalItemType.STATISTIC_STREAM_ITEM
-    }
+    fun toStreamInfoItem() =
+        StreamInfoItem(
+            streamEntity.serviceId,
+            streamEntity.url,
+            streamEntity.title,
+            streamEntity.streamType,
+        ).apply {
+            duration = streamEntity.duration
+            uploaderName = streamEntity.uploader
+            uploaderUrl = streamEntity.uploaderUrl
+            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+        }
+
+    override val localItemType: LocalItem.LocalItemType
+        get() = LocalItem.LocalItemType.STATISTIC_STREAM_ITEM
 
     companion object {
         const val STREAM_LATEST_DATE = "latestAccess"

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -229,14 +229,15 @@ public final class VideoDetailFragment
     private ContentObserver settingsContentObserver;
     @Nullable
     private PlayerService playerService;
+    @Nullable
     private Player player;
     private final PlayerHolder playerHolder = PlayerHolder.getInstance();
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service management
     //////////////////////////////////////////////////////////////////////////*/
     @Override
-    public void onServiceConnected(final Player connectedPlayer,
+    public void onServiceConnected(@Nullable final Player connectedPlayer,
                                    final PlayerService connectedPlayerService,
                                    final boolean playAfterConnect) {
         player = connectedPlayer;

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java

@@ -163,7 +163,7 @@ public static Disposable createCorrespondingDialog(
      * @return the disposable that was created
      */
     public static Disposable showForPlayQueue(
-            final Player player,
+            @NonNull final Player player,
             @NonNull final FragmentManager fragmentManager) {
 
         final List<StreamEntity> streamEntities = Stream.of(player.getPlayQueue())

app/src/main/java/org/schabi/newpipe/local/playlist/RemotePlaylistManager.java

@@ -26,6 +26,10 @@ public Flowable<List<PlaylistRemoteEntity>> getPlaylists() {
         return playlistRemoteTable.getPlaylists().subscribeOn(Schedulers.io());
     }
 
+    public Flowable<List<PlaylistRemoteEntity>> getPlaylist(final long playlistId) {
+        return playlistRemoteTable.getPlaylist(playlistId).subscribeOn(Schedulers.io());
+    }
+
     public Flowable<List<PlaylistRemoteEntity>> getPlaylist(final PlaylistInfo info) {
         return playlistRemoteTable.getPlaylist(info.getServiceId(), info.getUrl())
                 .subscribeOn(Schedulers.io());

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

@@ -61,6 +61,7 @@ public final class PlayQueueActivity extends AppCompatActivity
 
     private static final int MENU_ID_AUDIO_TRACK = 71;
 
+    @Nullable
     private Player player;
 
     private boolean serviceBound;
@@ -137,30 +138,38 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 NavigationHelper.openSettings(this);
                 return true;
             case R.id.action_append_playlist:
-                PlaylistDialog.showForPlayQueue(player, getSupportFragmentManager());
+                if (player != null) {
+                    PlaylistDialog.showForPlayQueue(player, getSupportFragmentManager());
+                }
                 return true;
             case R.id.action_playback_speed:
                 openPlaybackParameterDialog();
                 return true;
             case R.id.action_mute:
-                player.toggleMute();
+                if (player != null) {
+                    player.toggleMute();
+                }
                 return true;
             case R.id.action_system_audio:
                 startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
                 return true;
             case R.id.action_switch_main:
-                this.player.setRecovery();
-                NavigationHelper.playOnMainPlayer(this, player.getPlayQueue(), true);
+                if (player != null) {
+                    this.player.setRecovery();
+                    NavigationHelper.playOnMainPlayer(this, player.getPlayQueue(), true);
+                }
                 return true;
             case R.id.action_switch_popup:
-                if (PermissionHelper.isPopupEnabledElseAsk(this)) {
+                if (PermissionHelper.isPopupEnabledElseAsk(this) && player != null) {
                     this.player.setRecovery();
                     NavigationHelper.playOnPopupPlayer(this, player.getPlayQueue(), true);
                 }
                 return true;
             case R.id.action_switch_background:
-                this.player.setRecovery();
-                NavigationHelper.playOnBackgroundPlayer(this, player.getPlayQueue(), true);
+                if (player != null) {
+                    this.player.setRecovery();
+                    NavigationHelper.playOnBackgroundPlayer(this, player.getPlayQueue(), true);
+                }
                 return true;
         }
 
@@ -309,7 +318,7 @@ public void onMove(final int sourceIndex, final int targetIndex) {
 
             @Override
             public void onSwiped(final int index) {
-                if (index != -1) {
+                if (index != -1 && player != null) {
                     player.getPlayQueue().remove(index);
                 }
             }
@@ -659,7 +668,7 @@ private void buildAudioTrackMenu() {
      * @param itemId index of the selected item
      */
     private void onAudioTrackClick(final int itemId) {
-        if (player.getCurrentMetadata() == null) {
+        if (player == null || player.getCurrentMetadata() == null) {
             return;
         }
         player.getCurrentMetadata().getMaybeAudioTrack().ifPresent(audioTrack -> {

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

@@ -86,8 +86,8 @@
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
-import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.Image;
+import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -118,9 +118,9 @@
 import org.schabi.newpipe.util.DependentPreferenceHelper;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.StreamTypeUtil;
+import org.schabi.newpipe.util.image.PicassoHelper;
 
 import java.util.List;
 import java.util.Optional;
@@ -302,7 +302,7 @@ public Player(@NonNull final PlayerService service) {
         // notification ui in the UIs list, since the notification depends on the media session in
         // PlayerUi#initPlayer(), and UIs.call() guarantees UI order is preserved.
         UIs = new PlayerUiList(
-                new MediaSessionPlayerUi(this),
+                new MediaSessionPlayerUi(this, service.getSessionConnector()),
                 new NotificationPlayerUi(this)
         );
     }
@@ -415,6 +415,13 @@ public void handleIntent(@NonNull final Intent intent) {
                     == com.google.android.exoplayer2.Player.STATE_IDLE) {
                 simpleExoPlayer.prepare();
             }
+            // Seeks to a specific index and position in the player if the queue index has changed.
+            if (playQueue.getIndex() != newQueue.getIndex()) {
+                final PlayQueueItem queueItem = newQueue.getItem();
+                if (queueItem != null) {
+                    simpleExoPlayer.seekTo(newQueue.getIndex(), queueItem.getRecoveryPosition());
+                }
+            }
             simpleExoPlayer.setPlayWhenReady(playWhenReady);
 
         } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false)