Revert "Merge pull request TeamNewPipe#12044 from TeamNewPipe/android-auto"

This reverts commit ddb318a.

Author: whistlingwoods

app/src/main/AndroidManifest.xml

@@ -65,9 +65,6 @@
             <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
@@ -358,10 +355,5 @@
         <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/MainActivity.java

@@ -878,8 +878,7 @@ private void openMiniPlayerUponPlayerStarted() {
                 @Override
                 public void onReceive(final Context context, final Intent intent) {
                     if (Objects.equals(intent.getAction(),
-                            VideoDetailFragment.ACTION_PLAYER_STARTED)
-                            && PlayerHolder.getInstance().isPlayerOpen()) {
+                            VideoDetailFragment.ACTION_PLAYER_STARTED)) {
                         openMiniPlayerIfMissing();
                         // At this point the player is added 100%, we can unregister. Other actions
                         // are useless since the fragment will not be removed after that.
@@ -891,10 +890,6 @@ public void onReceive(final Context context, final Intent intent) {
             final IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(VideoDetailFragment.ACTION_PLAYER_STARTED);
             registerReceiver(broadcastReceiver, intentFilter);
-
-            // If the PlayerHolder is not bound yet, but the service is running, try to bind to it.
-            // Once the connection is established, the ACTION_PLAYER_STARTED will be sent.
-            PlayerHolder.getInstance().tryBindIfNeeded(this);
         }
     }
 

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

@@ -3,8 +3,6 @@ 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(
@@ -29,17 +27,4 @@ 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.java

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.database.playlist;
 
-import androidx.annotation.Nullable;
-
 import org.schabi.newpipe.database.LocalItem;
 
 public interface PlaylistLocalItem extends LocalItem {
@@ -12,7 +10,4 @@ public interface PlaylistLocalItem extends LocalItem {
     long getUid();
 
     void setDisplayIndex(long displayIndex);
-
-    @Nullable
-    String getThumbnailUrl();
 }

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

@@ -9,8 +9,6 @@
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_STREAM_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_URL;
 
-import androidx.annotation.Nullable;
-
 public class PlaylistMetadataEntry implements PlaylistLocalItem {
     public static final String PLAYLIST_STREAM_COUNT = "streamCount";
 
@@ -73,10 +71,4 @@ public long getUid() {
     public void setDisplayIndex(final long displayIndex) {
         this.displayIndex = displayIndex;
     }
-
-    @Nullable
-    @Override
-    public String getThumbnailUrl() {
-        return thumbnailUrl;
-    }
 }

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java

@@ -34,7 +34,7 @@ public interface PlaylistRemoteDAO extends BasicDAO<PlaylistRemoteEntity> {
 
     @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
             + REMOTE_PLAYLIST_ID + " = :playlistId")
-    Flowable<PlaylistRemoteEntity> getPlaylist(long playlistId);
+    Flowable<List<PlaylistRemoteEntity>> getPlaylist(long playlistId);
 
     @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
             + REMOTE_PLAYLIST_URL + " = :url AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java

@@ -2,7 +2,6 @@
 
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -135,8 +134,6 @@ public void setName(final String name) {
         this.name = name;
     }
 
-    @Nullable
-    @Override
     public String getThumbnailUrl() {
         return thumbnailUrl;
     }

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

@@ -261,14 +261,11 @@ private void onSharedPreferencesChanged(final SharedPreferences sharedPreference
     // Service management
     //////////////////////////////////////////////////////////////////////////*/
     @Override
-    public void onServiceConnected(@NonNull final PlayerService connectedPlayerService) {
-        playerService = connectedPlayerService;
-    }
-
-    @Override
-    public void onPlayerConnected(@NonNull final Player connectedPlayer,
-                                  final boolean playAfterConnect) {
+    public void onServiceConnected(final Player connectedPlayer,
+                                   final PlayerService connectedPlayerService,
+                                   final boolean playAfterConnect) {
         player = connectedPlayer;
+        playerService = connectedPlayerService;
 
         // It will do nothing if the player is not in fullscreen mode
         hideSystemUiIfNeeded();
@@ -300,18 +297,11 @@ && isAutoplayEnabled()
         updateOverlayPlayQueueButtonVisibility();
     }
 
-    @Override
-    public void onPlayerDisconnected() {
-        player = null;
-        // the binding could be null at this point, if the app is finishing
-        if (binding != null) {
-            restoreDefaultBrightness();
-        }
-    }
-
     @Override
     public void onServiceDisconnected() {
         playerService = null;
+        player = null;
+        restoreDefaultBrightness();
     }
 
 
@@ -2008,16 +1998,13 @@ public void onPlayerError(final PlaybackException error, final boolean isCatchab
 
     @Override
     public void onServiceStopped() {
-        // the binding could be null at this point, if the app is finishing
-        if (binding != null) {
-            setOverlayPlayPauseImage(false);
-            if (currentInfo != null) {
-                updateOverlayData(currentInfo.getName(),
-                        currentInfo.getUploaderName(),
-                        currentInfo.getThumbnails());
-            }
-            updateOverlayPlayQueueButtonVisibility();
+        setOverlayPlayPauseImage(false);
+        if (currentInfo != null) {
+            updateOverlayData(currentInfo.getName(),
+                    currentInfo.getUploaderName(),
+                    currentInfo.getThumbnails());
         }
+        updateOverlayPlayQueueButtonVisibility();
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt

@@ -7,16 +7,3 @@ import androidx.core.os.BundleCompat
 inline fun <reified T : Parcelable> Bundle.parcelableArrayList(key: String?): ArrayList<T>? {
     return BundleCompat.getParcelableArrayList(this, key, T::class.java)
 }
-
-fun Bundle?.toDebugString(): String {
-    if (this == null) {
-        return "null"
-    }
-    val string = StringBuilder("Bundle{")
-    for (key in this.keySet()) {
-        @Suppress("DEPRECATION") // we want this[key] to return items of any type
-        string.append(" ").append(key).append(" => ").append(this[key]).append(";")
-    }
-    string.append(" }")
-    return string.toString()
-}

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

@@ -26,10 +26,6 @@ public Flowable<List<PlaylistRemoteEntity>> getPlaylists() {
         return playlistRemoteTable.getPlaylists().subscribeOn(Schedulers.io());
     }
 
-    public Flowable<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());