diff --git a/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt b/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt index d2012cf50..e87a00604 100644 --- a/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt +++ b/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt @@ -79,9 +79,9 @@ object PreferenceKeys { const val PLAYER_RESIZE_MODE = "player_resize_mode" const val SB_SKIP_MANUALLY = "sb_skip_manually_key" const val SB_SHOW_MARKERS = "sb_show_markers" - const val PROGRESSIVE_LOADING_INTERVAL_SIZE = "progressive_loading_interval" const val ALTERNATIVE_PLAYER_LAYOUT = "alternative_player_layout" const val USE_HLS_OVER_DASH = "use_hls" + const val QUEUE_AUTO_INSERT_RELATED = "queue_insert_related_videos" /** * Background mode diff --git a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt index 1dbf786e6..719d523cd 100644 --- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt +++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt @@ -168,9 +168,11 @@ class BackgroundMode : Service() { PlayingQueue.insertPlaylist(playlistId!!, it) } } else { - streams?.toStreamItem(videoId)?.let { PlayingQueue.updateCurrent(it) } + streams?.toStreamItem(videoId)?.let { + PlayingQueue.updateCurrent(it) + } streams?.relatedStreams?.toTypedArray()?.let { - PlayingQueue.add(*it) + if (PlayerHelper.autoInsertRelatedVideos) PlayingQueue.add(*it) } } 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 e0f4be3c4..50fde12b9 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 @@ -597,9 +597,11 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions { PlayingQueue.insertPlaylist(playlistId!!, streams.toStreamItem(videoId!!)) } else { PlayingQueue.updateCurrent(streams.toStreamItem(videoId!!)) - PlayingQueue.add( - *streams.relatedStreams.orEmpty().toTypedArray() - ) + if (PlayerHelper.autoInsertRelatedVideos) { + PlayingQueue.add( + *streams.relatedStreams.orEmpty().toTypedArray() + ) + } } } } else { diff --git a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt b/app/src/main/java/com/github/libretube/util/PlayerHelper.kt index 0d3963e8f..346bb854d 100644 --- a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt +++ b/app/src/main/java/com/github/libretube/util/PlayerHelper.kt @@ -288,6 +288,12 @@ object PlayerHelper { false ) + val autoInsertRelatedVideos: Boolean + get() = PreferenceHelper.getBoolean( + PreferenceKeys.QUEUE_AUTO_INSERT_RELATED, + true + ) + fun getDefaultResolution(context: Context): String { return if (NetworkHelper.isNetworkMobile(context)) { PreferenceHelper.getString( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 660b59b0b..28a2ec578 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -385,6 +385,7 @@ Bookmark Clear bookmarks No bookmarks yet! + Insert related videos Download Service diff --git a/app/src/main/res/xml/player_settings.xml b/app/src/main/res/xml/player_settings.xml index 8be3ce3fa..afc008e98 100644 --- a/app/src/main/res/xml/player_settings.xml +++ b/app/src/main/res/xml/player_settings.xml @@ -110,4 +110,14 @@ + + + + + + \ No newline at end of file