From 3c3d313bec9f40559b38d05ff3185a52bc330a84 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 6 Dec 2022 11:39:33 +0100
Subject: [PATCH] fix the parsing of the videoID when importing playlists in
 some cases

---
 .../main/java/com/github/libretube/api/PlaylistsHelper.kt    | 5 +++--
 .../java/com/github/libretube/ui/fragments/PlayerFragment.kt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt b/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
index 4036d97df..1698c9645 100644
--- a/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
+++ b/app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
@@ -1,6 +1,7 @@
 package com.github.libretube.api
 
 import android.content.Context
+import android.net.Uri
 import android.util.Log
 import com.github.libretube.R
 import com.github.libretube.api.obj.Playlist
@@ -195,7 +196,7 @@ object PlaylistsHelper {
             addToPlaylist(
                 playlistId,
                 *playlist.videos.map {
-                    it.substringAfter("=")
+                    Uri.parse(it).getQueryParameter("v")!!
                 }.toTypedArray()
             )
         }
@@ -231,7 +232,7 @@ object PlaylistsHelper {
         return if (loggedIn()) PlaylistType.PRIVATE else PlaylistType.LOCAL
     }
 
-    fun getPrivatePlaylistType(playlistId: String): PlaylistType {
+    private fun getPrivatePlaylistType(playlistId: String): PlaylistType {
         if (playlistId.all { it.isDigit() }) return PlaylistType.LOCAL
         if (playlistId.matches(pipedPlaylistRegex)) return PlaylistType.PRIVATE
         return PlaylistType.PUBLIC
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 0944ca697..42385f3fb 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -463,7 +463,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
             binding.playerDescriptionArrow.animate().rotation(0F).setDuration(250).start()
             binding.descLinLayout.visibility = View.GONE
 
-            // show formated short view count
+            // show formatted short view count
             viewInfo = getString(R.string.views, streams.views.formatShort()) + viewInfo
         } else {
             // show the description and chapters