Merge pull request #7475 from litetex/release/v0.21.14

Release/v0.21.14

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,10 +5,9 @@ labels: enhancement
 assignees: ''
 
 ---
-<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you feel tired/lazy right now, open your issue some other time. We'll wait. -->
+<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you are currently unable to do so for any reason, open your issue some other time. We'll wait. -->
 
-
-<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
+<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview tab). -->
 
 ### Checklist
 <!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
@@ -17,30 +16,9 @@ assignees: ''
 - [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.
 - [ ] This issue contains only one feature request. I will open one issue for every feature I want to request.
 
-
-#### Describe the feature you want
-<!-- A clear and concise description of what you wish should happen.
-Example: *I think it would be nice if you add feature Y which makes X possible.*
-
-Optionally, also describe alternatives you've considered.
-Example: *Z is also a good alternative. Not as good as Y, but at least...* or *I considered Z, but that didn't turn out to be a good idea because...* -->
+#### What feature do you want?
+<!-- Explain how you want the app's look or behavior to change to suit your needs. -->
 
 
-
-#### Is your feature request related to a problem? Please describe it
-<!-- A clear and concise description of what the problem is. Maybe the developers and the community could brainstorm and come up with a better solution to your problem. If they exist, link to related Issues and/or PRs for developers to keep track easier.
-Example: *I want to do X, but there is no way to do it.* -->
-
-
-
-#### Additional context
-<!-- Add any other context, like screenshots, about the feature request here.
-Example: *Here's a photo of my cat!* -->
-
-
-
-#### How will you/everyone benefit from this feature?
-<!-- Convince us! How does it change your NewPipe experience and/or your life?
-The better this paragraph is, the more likely a developer will think about working on it.
-Example: *This feature will help us colonize the galaxy! -->
-
+#### Why do you want this feature?
+<!-- Describe any problem or limitation you come across while using the app which would be solved by this feature. -->

.github/workflows/ci.yml

@@ -33,10 +33,10 @@ jobs:
         if: github.event_name == 'pull_request'
         run: git checkout -B ${{ github.head_ref }}
 
-      - name: set up JDK 8
+      - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 11
           distribution: "temurin"
           cache: 'gradle'
           
@@ -59,10 +59,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: set up JDK 8
+      - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 11
           distribution: "temurin"
           cache: 'gradle'
 

.gitignore

@@ -1,15 +1,15 @@
-.gitignore
-.gradle
-/local.properties
+.gradle/
+local.properties
 .DS_Store
-/build
-/captures
-/app/app.iml
-/.idea
-/*.iml
+build/
+captures/
+.idea/
+*.iml
 *~
 .weblate
 *.class
+**/debug/
+**/release/
 
 # vscode / eclipse files
 *.classpath

README.es.md

@@ -1,30 +1,30 @@
 <p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
-<h4 align="center">Una interfaz de streaming lijera y libre para Android.</h4>
+<h4 align="center">Una interfaz de streaming ligera y libre para Android.</h4>
 
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-es.svg"></a></p>
 
 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/badge/Lanzamiento-v0.20.11-blue.svg" ></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/Licencia-GPL%20v3-blue.svg"></a>
-<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
-<a href="https://hosted.weblate.org/engage/newpipe/es/" alt="Estado de la traducción"><img src="https://hosted.weblate.org/widgets/newpipe/es/svg-badge.svg"></a>
-<a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/Canal%20de%20IRC%20-%23newpipe-brightgreen.svg"></a>
-<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="Lanzamientos GitHub"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="Licencia: GPLv3"><img src="https://img.shields.io/badge/Licencia-GPL%20v3-blue.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Estado del Build"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
+<a href="https://hosted.weblate.org/engage/newpipe/es/" alt="Estado de la Traducción"><img src="https://hosted.weblate.org/widgets/newpipe/es/svg-badge.svg"></a>
+<a href="https://web.libera.chat/#newpipe" alt="Canal de IRC: #newpipe"><img src="https://img.shields.io/badge/Canal%20de%20IRC%20-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Recompensas en Bountysource"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
 
-<p align="center"><a href="#capturas-de-pantalla">Capturas de pantalla</a> &bull; <a href="#descripción">Descripción</a> &bull; <a href="#características">Características</a> &bull; <a href="#installación-y-actualizaciones">Installación y actualizaciones</a> &bull; <a href="#contribución">Contribución</a> &bull; <a href="#donar">Donar</a> &bull; <a href="#licencias">Licencias</a></p>
-<p align="center"><a href="https://newpipe.net">Sitio web</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">Preguntas Frecuentes</a> &bull; <a href="https://newpipe.net/press/">Prensa</a></p>
+<p align="center"><a href="#capturas-de-pantalla">Capturas de Pantalla</a> &bull; <a href="#descripción">Descripción</a> &bull; <a href="#características">Características</a> &bull; <a href="#instalación-y-actualizaciones">Instalación y Actualizaciones</a> &bull; <a href="#contribución">Contribución</a> &bull; <a href="#donar">Donar</a> &bull; <a href="#licencia">Licencia</a></p>
+<p align="center"><a href="https://newpipe.net">Sitio Web</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">Preguntas Frecuentes</a> &bull; <a href="https://newpipe.net/press/">Prensa</a></p>
 <hr>
 
 *Lea esto en otros idiomas: [English](README.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md).*
 
-<b>AVISO: ESTA ES UNA VERSIÓN BETA, POR LO TANTO, PUEDE ENCONTRAR BUGS (ERRORES). SI ENCUENTRA UNO, ABRA UN ISSUE A TRAVÉS DE NUESTRO REPOSITORIO GITHUB.</b>
+<b>AVISO: ESTA ES UNA VERSIÓN BETA, POR LO TANTO, PUEDE ENCONTRAR BUGS. SI ENCUENTRA UNO ABRA UN ISSUE A TRAVÉS DE NUESTRO REPOSITORIO DE GITHUB.</b>
 
-<b>COLOCAR NEWPIPE O CUALQUIER FORK (BIFURCACIÓN) REALIZADO DE ELLO EN GOOGLE PLAY STORE VIOLA SUS TÉRMINOS Y CONDICIONES.</b>
+<b>COLOCAR NEWPIPE O CUALQUIER FORK DE NEWPIPE EN LA GOOGLE PLAY STORE VIOLARÁ SUS TÉRMINOS Y CONDICIONES.</b>
 
-## Capturas de pantalla
+## Capturas de Pantalla
 
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
@@ -40,39 +40,43 @@
 [<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
 
 ## Descripción
-NewPipe no usa ninguna librería de framework de Google, ni la API de YouTube. Los sitios web solamente se analizan para extraer la información requerida, asi que esta app se puede usar sin los servicios de Google instalados. Además, no se necesita una cuenta de YouTube para usar NewPipe, lo cual es un software libre de copyleft.
+
+NewPipe no usa ninguna librería del framework de Google, ni la API de YouTube. Los sitios web solamente se analizan para extraer la información requerida, por lo que esta app se puede usar sin los servicios de Google instalados. Además, no se necesita una cuenta de YouTube para usar NewPipe, lo cual es un software libre de copyleft.
 
 ### Características
+
 * Buscar videos
+* No requiere inicio de sesión
 * Mostrar información general sobre videos
 * Mirar videos de YouTube
-* Escuchar audio de YouTube
-* Modo popup (reproductor flotante)
-* Elegir reproductor para mirar el video
+* Modo de solo audio en videos de YouTube
+* Modo pop-up (reproductor flotante)
+* Elegir un reproductor de video externo para mirar videos
 * Descargar videos
-* Descargar solamente audio
-* Abrir video en Kodi
+* Descargar solo audio
+* Abrir videos en Kodi
 * Mostrar videos próximos/relacionados
 * Buscar a través de YouTube en un idioma específico
-* Mirar/Bloquear materiales restringidas por edad.
+* Mirar/Bloquear videos restringidos por edad
 * Mostrar información general sobre canales
-* Buscar canales
+* Buscar de canales
 * Mirar videos de un canal
-* Apoyo Orbot/Tor (todavía no directamente)
-* Apoyo 1080p/2K/4K
-* Ver historias
-* Subscribirse a canales
-* Buscar historias
-* Buscar/mirar listas de reproducción
-* Mirar listas de reproducción en fila
-* Poner videos en fila
-* Listas locales de reproducción
+* Soporte Orbot/Tor (todavía no directamente)
+* Soporte para videos en 1080p/2K/4K
+* Historial de videos vistos
+* Suscripción a canales
+* Historial de búsquedas
+* Buscar/Mirar listas de reproducción
+* Mirar listas de reproducción en cola
+* Poner videos en cola
+* Listas de reproducción locales
 * Subtítulos
-* Apoyo de medios en directo
+* Soporte para transmisiones en vivo
 * Mostrar comentarios
 
-### Servicios apoyados
-NewPipe apoya varios servicios. Nuestras [documentaciones](https://teamnewpipe.github.io/documentation/) proveen más información en como se puede agregar un servicio nuevo a la app y el extractor. Por favor contáctenos si pretende agregar uno nuevo. Actualmente los servicios apoyados son:
+### Servicios Soportados
+
+NewPipe soporta varios servicios. Nuestras [documentaciones](https://teamnewpipe.github.io/documentation/) ofrecen más información sobre cómo se puede agregar un servicio nuevo a la app y al extractor. Por favor ponte en contacto con nosotros si tienes pensado agregar uno nuevo. Actualmente los servicios soportados son:
 
 * YouTube
 * SoundCloud \[beta\]
@@ -80,61 +84,60 @@ NewPipe apoya varios servicios. Nuestras [documentaciones](https://teamnewpipe.g
 * PeerTube instances \[beta\]
 * Bandcamp \[beta\]
 
-<!-- Brecha escondida para mantener compatibles los enlaces viejos. -->
-<span id="actualizaciones"></span>
+## Instalación y Actualizaciones
 
-## Installación y actualizaciones
 Se puede instalar NewPipe usando uno de los métodos siguientes:
- 1. Agregar nuestro repositorio personalizado a F-Droid e instalarlo desde allí. Las instrucciones están aquí: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 2. Descargar el archivo APK del enlace [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) e instalarlo.
- 3. Actualizar a través de F-Droid. Este es el método más lento para obtener la actualización, como F-Droid debe reconocer cambios, construir el APK aparte, firmarlo con una clave, y finalmente empujar la actualización a los usuarios.
- 4. Construir un APK de depuración por si mismo. Este es el modo más rápido para realizar nuevas características en su dispositivo, pero es mucho más complicado, asi que recomendamos uno de los otros métodos.
 
-Recomendamos el método 1 para la mayoría de usuarios. Los APKs instalados usando método 1 o 2 son compatibles el uno con el otro, pero no con las instalaciones usando método 3. Esta es debida a la misma clave digital (la nuestra), siendo utilizado en los métodos 1 y 2, pero una clave digital diferente (la de F-Droid) siendo utilizado en el método 3. Construir un APK de depuración usando método 4 excluye una clave enteramente. Firmando con claves  digitales ayuda a asegurar de que un
-usuario no esté engañado para instalar una actualización maliciosa a una app. 
+ 1. Agregando nuestro repositorio personalizado a F-Droid e instalarlo desde allí. Las instrucciones están [aquí](https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/).
+ 2. Descargando el archivo APK de [aquí](https://github.com/TeamNewPipe/NewPipe/releases) y posteriormente instalarlo.
+ 3. Usando el repositorio oficial de F-Droid. Este es el método más lento para obtener actualizaciones, ya que F-Droid debe reconocer los cambios, construir el APK aparte, firmarlo con una clave, y finalmente publicar la actualización.
+ 4. Construyendo la app usted mismo. Este es el modo más rápido para obtener nuevas características en su dispositivo, pero es mucho más complicado, así que recomendamos uno de los otros métodos.
 
-Mientras tanto, si quiere cambiar los fuentes por alguna razón (por ejemplo, la funcionalidad del nucleo de NewPipe se rompe y F-Droid aun no tiene la actualización), recomendamos el siguiente procedimiento:
-1. Repaldear sus datos a través de Ajustes > Contenido > Exporta base de datos para guardar su historia, subscripciones, y listas de reproducción
-2. Desinstalar NewPipe
-3. Descargar el APK del nuevo fuente e instalarlo.
-4. Importar los datos del paso 1 a través de Ajustes > Contenido > Importa base de datos.
+Recomendamos el método 1 para la mayoría de usuarios. Los APKs instalados usando método 1 y 2 son compatibles entre sí, pero no lo son con los instalados usando el método 3. Esto es debido a la clave de firmado, ya que los métodos 1 y 2 usan la misma clave (la nuestra), pero el método 3 usa una clave diferente (la de F-Droid). El método 4 excluye totalmente una clave de firmado. Las claves de firmado aseguran que el usuario no esté siendo engañado para instalar/actualizar una APK maliciosa. 
+
+Además, si quiere cambiar el método de instalación por alguna razón (por ejemplo: la funcionalidad del núcleo de NewPipe se rompe o F-Droid aún no publica la actualización), recomendamos el siguiente procedimiento:
+1. Respalde su información a través de Ajustes > Contenido > Exportar base de datos; esto guardará su historial (videos vistos y búsquedas), suscripciones, listas de reproducción y ajustes.
+2. Desinstale NewPipe.
+3. Descargue el APK con un método distinto e instálelo.
+4. Importe la información (la base de datos extraída del paso 1) a través de Ajustes > Contenido > Importar base de datos. Tenga en cuenta que esta opción superpondrá su historial actual (tanto de vídeos como de búsquedas), sus listas de reproducción y (opcionalmente) sus configuraciones.
 
 ## Contribución
-Si tiene ideas, traducciónes, cambios de diseño, limpieza de código, o cambios grandes de código, su ayuda es siempre bienvenida.
-Cuanto más realizamos, mejor se pone la aplicación!
+
+Si tiene ideas, traducciones, cambios de diseño, limpieza de código o cambios grandes de código, su ayuda es siempre bienvenida. ¡Cuanto más hagamos, NewPipe será mucho mejor!
 
 Si quiere involucrarse, fíjese en nuestras [notas de contribución](.github/CONTRIBUTING.md).
 
 <a href="https://hosted.weblate.org/engage/newpipe/es/">
-<img src="https://hosted.weblate.org/widgets/newpipe/es/287x66-grey.png" alt="Estado de la traducción" />
+<img src="https://hosted.weblate.org/widgets/newpipe/es/287x66-grey.png" alt="Estado de la Traducción" />
 </a>
 
 ## Donar
-Si le gusta el NewPipe estaremos felices con una donación. O puede enviar bitcoin o donar a través de Bountysource o Liberapay. Para obtener más información sobre como donar a NewPipe, por favor visita nuestro [sitio web](https://newpipe.net/donate).
+Si te gusta NewPipe, estaremos felices con una donación. Puede enviar bitcoin o donar a través de Bountysource o Liberapay. Visita nuestro [sitio web](https://newpipe.net/donate) para más información.
 
 <table>
   <tr>
     <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
-    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Código QR del Bitcoin" width="100px"></td>
     <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
   </tr>
   <tr>
     <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visita NewPipe en liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Dona vía Liberapay" height="35px"></a></td>
   </tr>
   <tr>
     <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visita NewPipe en bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Revisa cuántas recompensas puedes obtener."></a></td>
   </tr>
 </table>
 
-## Política de privacidad
-El proyecto NewPipe tiene como objetivo proveer una experience privada y anónima para usar servicios de medios web.
-Por lo tanto, la app no colecciona ningunos datos sin su consentimiento. La politica de privacidad de NewPipe explica en detalle los datos enviados y almacenados cuando envia un informe de error, o comentario en nuestro blog. Puede encontrar el documento [aqui](https://newpipe.net/legal/privacy/).
+## Política de Privacidad
+
+El proyecto NewPipe tiene como objetivo ofrecer una experience privada y anónima al usar servicios web multimedia. Por lo tanto, la app no recoleta ningún tipo de información sin su consentimiento. La politica de privacidad de NewPipe explica en detalle qué información es enviada y almacenada cuando envía un informe de error o comenta en [nuestro blog](https://newpipe.net/blog/). Puede encontrar el documento [aquí](https://newpipe.net/legal/privacy/).
 
 ## Licencia
-[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html)  
 
-NewPipe es Software Libre: Puede usar, estudiar, compartir, y mejorarlo a su voluntad. Especificamente puede redistribuir y/o modificarlo bajo los términos de la [GNU General Public License](https://www.gnu.org/licenses/gpl.html) como publicado por la Free Software Foundation, o versión 3 de la licencia, o (en su opción) cualquier versión posterior.
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.html)  
+
+NewPipe es Software Libre: Puede usarlo, estudiarlo, compartirlo y mejorarlo a su voluntad. Más específicamente, puede redistribuirlo y/o modificarlo bajo los términos de la [GNU General Public License](https://www.gnu.org/licenses/gpl.html) publicada por la Free Software Foundation tanto si usa la versión 3 o posterior de la licencia.

README.ko.md

@@ -89,7 +89,7 @@ NewPipe 코드의 변경이 있을 때(기능 추가 또는 버그 수정으로
  따라서 우리는 다른 방법들 중 하나를 사용하는 것을 추천합니다.
  2. 우리의 커스텀 저장소를 F-Droid에 추가하고 우리가 릴리즈를 게시하는 대로 저곳에서 릴리즈를 설치할 수 있습니다. 
  이에 대한 설명서는 이곳에서 확인할 수 있습니다: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 3. 우리가 릴리즈를 게시하는 대로 [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases)에서 APK를 다운받고 이것을 설치할 수 있습니다.
+ 3. 우리가 릴리즈를 게시하는 대로 [GitHub Releases](https://github.com/TeamNewPipe/NewPipe/releases)에서 APK를 다운받고 이것을 설치할 수 있습니다.
  4. F-Droid를 통해 업데이트 할 수 있습니다. F-Droid는 변화를 인식하고, 스스로 APK를 생성하고, 이것에 서명하고, 사용자들에서 업데이트를 전달해야만 하기 때문에,
  이것은 업데이트를 받는 가장 느린 방법입니다.
 

README.md

@@ -89,7 +89,7 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 ## Installation and updates
 You can install NewPipe using one of the following methods:
  1. Add our custom repo to F-Droid and install it from there. The instructions are here: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
+ 2. Download the APK from [GitHub Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
  3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
  4. Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
 

README.pt_BR.md

@@ -87,7 +87,7 @@ O NewPipe suporta vários serviços. Nosso [documentação](https://teamnewpipe.
 Quando uma alteração no código NewPipe (devido à adição de recursos ou fixação de bugs), eventualmente ocorrerá uma versão. Estes estão no formato x.xx.x . A fim de obter esta nova versão, você pode:
  1. Construa um APK de depuração você mesmo. Esta é a maneira mais rápida de obter novos recursos em seu dispositivo, mas é muito mais complicado, por isso recomendamos usar um dos outros métodos.
  2. Adicione nosso repo personalizado ao F-Droid e instale-o a partir daí assim que publicarmos um lançamento. As instruções estão aqui.: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 3. Baixe o APK do [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) e instalá-lo assim que publicarmos um lançamento.
+ 3. Baixe o APK do [GitHub Releases](https://github.com/TeamNewPipe/NewPipe/releases) e instalá-lo assim que publicarmos um lançamento.
  4. Atualização via F-droid. Este é o método mais lento para obter atualizações, pois o F-Droid deve reconhecer alterações, construir o próprio APK, assiná-lo e, em seguida, enviar a atualização para os usuários.
 
 Recomendamos o método 2 para a maioria dos usuários. Os APKs instalados usando o método 2 ou 3 são compatíveis entre si, mas não com aqueles instalados usando o método 4. Isso se deve à mesma chave de assinatura (nossa) sendo usada para 2 e 3, mas uma chave de assinatura diferente (F-Droid's) está sendo usada para 4. Construir um APK depuração usando o método 1 exclui totalmente uma chave. Assinar chaves ajudam a garantir que um usuário não seja enganado para instalar uma atualização maliciosa em um aplicativo.

README.ro.md

@@ -89,7 +89,7 @@ NewPipe suportă servicii multiple. [Documentele](https://teamnewpipe.github.io/
 ## Instalare şi actualizări
 Puteţi instala NewPipe folosind una dintre următoarele metode:
  1. Adăugaţi depozitul nostru F-droid personalizat. Instrucţiunile sunt aici: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 2. Descărcaţi APK-ul din [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) şi instalaţi-l.
+ 2. Descărcaţi APK-ul din [GitHub Releases](https://github.com/TeamNewPipe/NewPipe/releases) şi instalaţi-l.
  3. Actualizaţi via F-Droid. Aceasta este cea mai lentă metodă de a obţine actualizări, deoarece F-Droid trebuie să recunoască schimbările, să constriască APK-ul, să îl semneze, iar apoi să îl trimită utilizatorilor.
  4. Construiţi un APK de depanare. Aceasta este cea mai rapidă metodă de a primi funcţii noi, dar este mult mai complicată, aşa că vă recomandăm să folosiţi una dintre celelalte metode.
 

README.so.md

@@ -86,7 +86,7 @@ NewPipe wuxuu taageeraa adeegyo badan. [warqadan](https://teamnewpipe.github.io/
 Marka koodhka NewPipe isbadal ku dhaco (wax cusub oo lagusoo kordhiyay ama cilad bixin), ugu dambayn waxaa lasii daayaa mid cusub (Siidayn). Siidaynta qaabkeedu waa x.xx.x . Si aad midka cusub u hesho, waxaad samayn kartaa:
  1. Inaad mid cusub (APK) adigu dhisato. Tani waa mida ugu dagdag badan eed waxyaabaha cusub ku heli karto, laakiin way adagtahay, sidaa darteed waxaan soojeedinaynaa inaad isticmaasho qababka kale.
  2. Ku dar qayb gaar ah xaganaga F-Droid oo xagaas kaga shub isla markay siidayn soobaxdo. Hagitaanka xagan ka eeg: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 3. Kasoo dajiso APK-ga xaga [Siidaynta Github](https://github.com/TeamNewPipe/NewPipe/releases) oo ku shubo isla markay siidayn soobaxdo.
+ 3. Kasoo dajiso APK-ga xaga [Siidaynta GitHub](https://github.com/TeamNewPipe/NewPipe/releases) oo ku shubo isla markay siidayn soobaxdo.
  4. Ka cusboonaysii xaga F-Droid. Tani waa mida ugu daahitaanka badan, sababtoo ah F-Droid waxay fiirin isbadalka waxayna iyadu dhisi mid (app), sixiixi, kadibna ay cusboonaysiinta usiidayn isticmaalayaasha.
 
 Waxaan usoojeedinaynaa isticmaaalka qaabka 2 dadka badankood. APK-yada loogu shubo qaabka 2 ama 3 way isqaadan karaan, laakiin isma qaadan karaan kuwa loogu shubay qaabka 4. Sababtuna waxaa weeye furaha sixiixa oo iskumid ah (kaanaga weeye) oo loo isticmaalay 2 iyo 3, laakiin furo sixiixeed ka duwan (midka F-Droid) oo loo isticmaalay 4. Dhisida APK ayadoo la isticmaalayo qaabka 1 waxay gabi ahaanba ka reebtaa wax fure ah. Furayaasha sixiixa waxay xaqiijiyaan in isticmaalaha aan lagu khaldin inuu ku shubto cusboonaysiin khalad ah (wax lasoo dhexraaciyay) app-ka.

README.tr.md

@@ -23,7 +23,7 @@
 
 <b>GOOGLE PLAY STORE'A NEWPIPE VEYA BAŞKA BİR KOPYASINI KOYMAK, PLAY STORE ŞARTLARINI VE KOŞULLARINI İHLAL EDER.</b>
 
-## Ekran fotoğrafları
+## Ekran görüntüleri
 
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
@@ -88,7 +88,7 @@ NewPipe birden fazla hizmeti destekler. Uygulamaya ve ayıklayıcıya yeni bir h
 ## Kurulum ve güncellemeler
 Aşağıdaki yöntemlerden birini kullanarak NewPipe'ı kurabilirsiniz:
  1. Özel depomuzu F-Droid'e ekleyin ve oradan yükleyin. Kılavuzu şurada bulabilirsiniz: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
- 2. APK'yı [Github sürümlerinden](https://github.com/TeamNewPipe/NewPipe/releases) indirin ve kurun.
+ 2. APK'yı [GitHub sürümlerinden](https://github.com/TeamNewPipe/NewPipe/releases) indirin ve kurun.
  3. F-Droid ile güncelleyin. Bu, güncellemeleri almanın en yavaş yöntemidir, çünkü F-Droid değişiklikleri tanımalı, APK'yı kendisi oluşturmalı, imzalamalı ve ardından güncellemeyi kullanıcılara dağıtmalıdır.
  4. Kendiniz bir APK derleyin. Bu yöntem, cihazınızda yeni özellikler edinmenin en hızlı yoludur, ancak çok daha karmaşıktır, bu nedenle diğer yöntemlerden birini kullanmanızı öneririz.
 

app/.gitignore

@@ -1,3 +0,0 @@
-.gitignore
-/build
-*.iml

app/build.gradle

@@ -17,8 +17,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 976
-        versionName "0.21.10"
+        versionCode 980
+        versionName "0.21.14"
 
         multiDexEnabled true
 
@@ -54,6 +54,11 @@ android {
         // debug build. This seems to be a Gradle bug, therefore
         // TODO: update Gradle version
         release {
+            if (System.properties.containsKey('packageSuffix')) {
+                applicationIdSuffix System.getProperty('packageSuffix')
+                resValue "string", "app_name", "NewPipe " + System.getProperty('packageSuffix')
+                archivesBaseName = 'NewPipe_' + System.getProperty('packageSuffix')
+            }
             minifyEnabled true
             shrinkResources false // disabled to fix F-Droid's reproducible build
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -100,9 +105,9 @@ ext {
     androidxRoomVersion = '2.3.0'
 
     icepickVersion = '3.2.0'
-    exoPlayerVersion = '2.12.3'
+    exoPlayerVersion = '2.14.2'
     googleAutoServiceVersion = '1.0'
-    groupieVersion = '2.8.1'
+    groupieVersion = '2.10.0'
     markwonVersion = '4.6.2'
 
     leakCanaryVersion = '2.5'
@@ -184,7 +189,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.10'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.12'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
@@ -203,14 +208,17 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'androidx.media:media:1.3.1'
+    implementation 'androidx.media:media:1.4.3'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
     implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
     kapt "androidx.room:room-compiler:${androidxRoomVersion}"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    // Newer version specified to prevent accessibility regressions with RecyclerView, see:
+    // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
     implementation 'androidx.webkit:webkit:1.4.0'
     implementation 'com.google.android.material:material:1.2.1'
 

app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt

@@ -43,10 +43,11 @@ class LocalPlaylistManagerTest {
 
     @Test
     fun createPlaylist() {
+        val NEWPIPE_URL = "https://newpipe.net/"
         val stream = StreamEntity(
-            serviceId = 1, url = "https://newpipe.net/", title = "title",
+            serviceId = 1, url = NEWPIPE_URL, title = "title",
             streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
-            uploaderUrl = "https://newpipe.net/"
+            uploaderUrl = NEWPIPE_URL
         )
 
         val result = manager.createPlaylist("name", listOf(stream))

app/src/main/AndroidManifest.xml

@@ -146,6 +146,7 @@
                 <data android:pathPrefix="/embed/" />
                 <data android:pathPrefix="/watch" />
                 <data android:pathPrefix="/attribution_link" />
+                <data android:pathPrefix="/shorts/" />
                 <!-- channel prefix -->
                 <data android:pathPrefix="/channel/" />
                 <data android:pathPrefix="/user/" />
@@ -224,6 +225,7 @@
 
                 <data android:scheme="http" />
                 <data android:scheme="https" />
+                <data android:host="tubus.eduvid.org" />
                 <data android:host="invidio.us" />
                 <data android:host="dev.invidio.us" />
                 <data android:host="www.invidio.us" />
@@ -254,6 +256,21 @@
                 <data android:pathPrefix="/" />
             </intent-filter>
 
+            <!-- y2u.be filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="y2u.be" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
+
             <!-- Soundcloud filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -309,6 +326,7 @@
                 <data android:scheme="http" />
                 <data android:scheme="https" />
 
+                <data android:host="eduvid.org" />
                 <data android:host="framatube.org" />
                 <data android:host="media.assassinate-you.net" />
                 <data android:host="peertube.co.uk" />
@@ -322,8 +340,12 @@
                 <data android:host="skeptikon.fr" />
 
                 <data android:pathPrefix="/videos/" /> <!-- it contains playlists -->
+                <data android:pathPrefix="/w/" /> <!-- short video URLs -->
+                <data android:pathPrefix="/w/p/" /> <!-- short playlist URLs -->
                 <data android:pathPrefix="/accounts/" />
+                <data android:pathPrefix="/a/" /> <!-- short account URLs -->
                 <data android:pathPrefix="/video-channels/" />
+                <data android:pathPrefix="/c/" /> <!-- short video-channels URLs -->
             </intent-filter>
 
             <!-- Bandcamp filter for tracks, albums and playlists -->
@@ -358,6 +380,9 @@
         <service
             android:name=".RouterActivity$FetcherService"
             android:exported="false" />
+        <service
+            android:name=".CheckForNewAppVersion"
+            android:exported="false" />
 
         <!-- opting out of sending metrics to Google in Android System WebView -->
         <meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true" />

app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapterMenuWorkaround.java

@@ -51,8 +51,12 @@ import java.util.ArrayList;
  *     <li>{@link #saveState()}</li>
  *     <li>{@link #restoreState(Parcelable, ClassLoader)}</li>
  * </ul>
+ *
+ * @deprecated Switch to {@link androidx.viewpager2.widget.ViewPager2} and use
+ * {@link androidx.viewpager2.adapter.FragmentStateAdapter} instead.
  */
 @SuppressWarnings("deprecation")
+@Deprecated
 public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapter {
     private static final String TAG = "FragmentStatePagerAdapt";
     private static final boolean DEBUG = false;
@@ -86,9 +90,10 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     private final int mBehavior;
     private FragmentTransaction mCurTransaction = null;
 
-    private final ArrayList<Fragment.SavedState> mSavedState = new ArrayList<Fragment.SavedState>();
-    private final ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
+    private final ArrayList<Fragment.SavedState> mSavedState = new ArrayList<>();
+    private final ArrayList<Fragment> mFragments = new ArrayList<>();
     private Fragment mCurrentPrimaryItem = null;
+    private boolean mExecutingFinishUpdate;
 
     /**
      * Constructor for {@link FragmentStatePagerAdapterMenuWorkaround}
@@ -208,7 +213,7 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
         mFragments.set(position, null);
 
         mCurTransaction.remove(fragment);
-        if (fragment == mCurrentPrimaryItem) {
+        if (fragment.equals(mCurrentPrimaryItem)) {
             mCurrentPrimaryItem = null;
         }
     }
@@ -247,7 +252,19 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     @Override
     public void finishUpdate(@NonNull final ViewGroup container) {
         if (mCurTransaction != null) {
-            mCurTransaction.commitNowAllowingStateLoss();
+            // We drop any transactions that attempt to be committed
+            // from a re-entrant call to finishUpdate(). We need to
+            // do this as a workaround for Robolectric running measure/layout
+            // calls inline rather than allowing them to be posted
+            // as they would on a real device.
+            if (!mExecutingFinishUpdate) {
+                try {
+                    mExecutingFinishUpdate = true;
+                    mCurTransaction.commitNowAllowingStateLoss();
+                } finally {
+                    mExecutingFinishUpdate = false;
+                }
+            }
             mCurTransaction = null;
         }
     }

app/src/main/java/org/schabi/newpipe/App.java

@@ -5,7 +5,6 @@ import android.content.SharedPreferences;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.app.NotificationChannelCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.multidex.MultiDexApplication;
@@ -37,7 +36,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.CompositeException;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
@@ -68,9 +66,6 @@ public class App extends MultiDexApplication {
     private static final String TAG = App.class.toString();
     private static App app;
 
-    @Nullable
-    private Disposable disposable = null;
-
     @NonNull
     public static App getApp() {
         return app;
@@ -116,16 +111,10 @@ public class App extends MultiDexApplication {
                 && prefs.getBoolean(getString(R.string.show_image_indicators_key), false));
 
         configureRxJavaErrorHandler();
-
-        // Check for new version
-        disposable = CheckForNewAppVersion.checkNewVersion(this);
     }
 
     @Override
     public void onTerminate() {
-        if (disposable != null) {
-            disposable.dispose();
-        }
         super.onTerminate();
         PicassoHelper.terminate();
     }
@@ -265,4 +254,5 @@ public class App extends MultiDexApplication {
     protected boolean isDisposedRxExceptionsReported() {
         return false;
     }
+
 }

app/src/main/java/org/schabi/newpipe/BaseFragment.java

@@ -21,7 +21,6 @@ public abstract class BaseFragment extends Fragment {
     //These values are used for controlling fragments when they are part of the frontpage
     @State
     protected boolean useAsFrontPage = false;
-    private boolean mIsVisibleToUser = false;
 
     public void useAsFrontPage(final boolean value) {
         useAsFrontPage = value;
@@ -85,12 +84,6 @@ public abstract class BaseFragment extends Fragment {
         AppWatcher.INSTANCE.getObjectWatcher().watch(this);
     }
 
-    @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        mIsVisibleToUser = isVisibleToUser;
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
@@ -109,8 +102,7 @@ public abstract class BaseFragment extends Fragment {
         if (DEBUG) {
             Log.d(TAG, "setTitle() called with: title = [" + title + "]");
         }
-        if ((!useAsFrontPage || mIsVisibleToUser)
-                && (activity != null && activity.getSupportActionBar() != null)) {
+        if (!useAsFrontPage && activity != null && activity.getSupportActionBar() != null) {
             activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
             activity.getSupportActionBar().setTitle(title);
         }

app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java

@@ -1,12 +1,12 @@
 package org.schabi.newpipe;
 
 import android.app.Application;
+import android.app.IntentService;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
-import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.util.Log;
 
@@ -14,7 +14,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.PackageInfoCompat;
 import androidx.preference.PreferenceManager;
 
@@ -25,8 +24,11 @@ import com.grack.nanojson.JsonParserException;
 import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.downloader.Response;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -36,18 +38,16 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.List;
 
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Maybe;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
-public final class CheckForNewAppVersion {
-    private CheckForNewAppVersion() { }
+public final class CheckForNewAppVersion extends IntentService {
+    public CheckForNewAppVersion() {
+        super("CheckForNewAppVersion");
+    }
 
     private static final boolean DEBUG = MainActivity.DEBUG;
     private static final String TAG = CheckForNewAppVersion.class.getSimpleName();
 
-    private static final String GITHUB_APK_SHA1
+    // Public key of the certificate that is used in NewPipe release versions
+    private static final String RELEASE_CERT_PUBLIC_KEY_SHA1
             = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
     private static final String NEWPIPE_API_URL = "https://newpipe.net/api/data.json";
 
@@ -128,118 +128,137 @@ public final class CheckForNewAppVersion {
                                                              final String versionName,
                                                              final String apkLocationUrl,
                                                              final int versionCode) {
-        final int notificationId = 2000;
-
-        if (BuildConfig.VERSION_CODE < versionCode) {
-            // A pending intent to open the apk location url in the browser.
-            final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            final PendingIntent pendingIntent
-                    = PendingIntent.getActivity(application, 0, intent, 0);
-
-            final String channelId = application
-                    .getString(R.string.app_update_notification_channel_id);
-            final NotificationCompat.Builder notificationBuilder
-                    = new NotificationCompat.Builder(application, channelId)
-                    .setSmallIcon(R.drawable.ic_newpipe_update)
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setContentIntent(pendingIntent)
-                    .setAutoCancel(true)
-                    .setContentTitle(application
-                            .getString(R.string.app_update_notification_content_title))
-                    .setContentText(application
-                            .getString(R.string.app_update_notification_content_text)
-                            + " " + versionName);
-
-            final NotificationManagerCompat notificationManager
-                    = NotificationManagerCompat.from(application);
-            notificationManager.notify(notificationId, notificationBuilder.build());
+        if (BuildConfig.VERSION_CODE >= versionCode) {
+            return;
         }
+
+        // A pending intent to open the apk location url in the browser.
+        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final PendingIntent pendingIntent
+                = PendingIntent.getActivity(application, 0, intent, 0);
+
+        final String channelId = application
+                .getString(R.string.app_update_notification_channel_id);
+        final NotificationCompat.Builder notificationBuilder
+                = new NotificationCompat.Builder(application, channelId)
+                .setSmallIcon(R.drawable.ic_newpipe_update)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true)
+                .setContentTitle(application
+                        .getString(R.string.app_update_notification_content_title))
+                .setContentText(application
+                        .getString(R.string.app_update_notification_content_text)
+                        + " " + versionName);
+
+        final NotificationManagerCompat notificationManager
+                = NotificationManagerCompat.from(application);
+        notificationManager.notify(2000, notificationBuilder.build());
     }
 
-    private static boolean isConnected(@NonNull final App app) {
-        final ConnectivityManager connectivityManager =
-                ContextCompat.getSystemService(app, ConnectivityManager.class);
-        return connectivityManager != null && connectivityManager.getActiveNetworkInfo() != null
-                && connectivityManager.getActiveNetworkInfo().isConnected();
+    public static boolean isReleaseApk(@NonNull final App app) {
+        return getCertificateSHA1Fingerprint(app).equals(RELEASE_CERT_PUBLIC_KEY_SHA1);
     }
 
-    public static boolean isGithubApk(@NonNull final App app) {
-        return getCertificateSHA1Fingerprint(app).equals(GITHUB_APK_SHA1);
-    }
+    private void checkNewVersion() throws IOException, ReCaptchaException {
+        final App app = App.getApp();
 
-    @Nullable
-    public static Disposable checkNewVersion(@NonNull final App app) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
         final NewVersionManager manager = new NewVersionManager();
 
-        // Check if user has enabled/disabled update checking
-        // and if the current apk is a github one or not.
-        if (!prefs.getBoolean(app.getString(R.string.update_app_key), true) || !isGithubApk(app)) {
-            return null;
+        // Check if the current apk is a github one or not.
+        if (!isReleaseApk(app)) {
+            return;
         }
 
         // Check if the last request has happened a certain time ago
         // to reduce the number of API requests.
         final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0);
         if (!manager.isExpired(expiry)) {
-            return null;
+            return;
         }
 
-        return Maybe
-            .fromCallable(() -> {
-                if (!isConnected(app)) {
-                    return null;
-                }
+        // Make a network request to get latest NewPipe data.
+        final Response response = DownloaderImpl.getInstance().get(NEWPIPE_API_URL);
+        handleResponse(response, manager, prefs, app);
+    }
 
-                // Make a network request to get latest NewPipe data.
-                return DownloaderImpl.getInstance().get(NEWPIPE_API_URL);
-            })
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        response -> {
-                            try {
-                                // Store a timestamp which needs to be exceeded,
-                                // before a new request to the API is made.
-                                final long newExpiry = manager
-                                    .coerceExpiry(response.getHeader("expires"));
-                                prefs.edit()
-                                    .putLong(app.getString(R.string.update_expiry_key), newExpiry)
-                                    .apply();
-                            } catch (final Exception e) {
-                                if (DEBUG) {
-                                    Log.w(TAG, "Could not extract and save new expiry date", e);
-                                }
-                            }
+    private void handleResponse(@NonNull final Response response,
+                                @NonNull final NewVersionManager manager,
+                                @NonNull final SharedPreferences prefs,
+                                @NonNull final App app) {
+        try {
+            // Store a timestamp which needs to be exceeded,
+            // before a new request to the API is made.
+            final long newExpiry = manager
+                    .coerceExpiry(response.getHeader("expires"));
+            prefs.edit()
+                    .putLong(app.getString(R.string.update_expiry_key), newExpiry)
+                    .apply();
+        } catch (final Exception e) {
+            if (DEBUG) {
+                Log.w(TAG, "Could not extract and save new expiry date", e);
+            }
+        }
 
-                            // Parse the json from the response.
-                            try {
-                                final JsonObject githubStableObject = JsonParser.object()
-                                    .from(response.responseBody()).getObject("flavors")
-                                    .getObject("github").getObject("stable");
+        // Parse the json from the response.
+        try {
 
-                                final String versionName = githubStableObject
-                                    .getString("version");
-                                final int versionCode = githubStableObject
-                                    .getInt("version_code");
-                                final String apkLocationUrl = githubStableObject
-                                    .getString("apk");
+            final JsonObject githubStableObject = JsonParser.object()
+                    .from(response.responseBody()).getObject("flavors")
+                    .getObject("github").getObject("stable");
+
+            final String versionName = githubStableObject
+                    .getString("version");
+            final int versionCode = githubStableObject
+                    .getInt("version_code");
+            final String apkLocationUrl = githubStableObject
+                    .getString("apk");
+
+            compareAppVersionAndShowNotification(app, versionName,
+                    apkLocationUrl, versionCode);
+        } catch (final JsonParserException e) {
+            // Most likely something is wrong in data received from NEWPIPE_API_URL.
+            // Do not alarm user and fail silently.
+            if (DEBUG) {
+                Log.w(TAG, "Could not get NewPipe API: invalid json", e);
+            }
+        }
+    }
+
+    /**
+     * Start a new service which
+     * checks if all conditions for performing a version check are met,
+     * fetches the API endpoint {@link #NEWPIPE_API_URL} containing info
+     * about the latest NewPipe version
+     * and displays a notification about ana available update.
+     * <br>
+     * Following conditions need to be met, before data is request from the server:
+     * <ul>
+     * <li> The app is signed with the correct signing key (by TeamNewPipe / schabi).
+     * If the signing key differs from the one used upstream, the update cannot be installed.</li>
+     * <li>The user enabled searching for and notifying about updates in the settings.</li>
+     * <li>The app did not recently check for updates.
+     * We do not want to make unnecessary connections and DOS our servers.</li>
+     * </ul>
+     * <b>Must not be executed</b> when the app is in background.
+     */
+    public static void startNewVersionCheckService() {
+        final Intent intent = new Intent(App.getApp().getApplicationContext(),
+                CheckForNewAppVersion.class);
+        App.getApp().startService(intent);
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable final Intent intent) {
+        try {
+            checkNewVersion();
+        } catch (final IOException e) {
+            Log.w(TAG, "Could not fetch NewPipe API: probably network problem", e);
+        } catch (final ReCaptchaException e) {
+            Log.e(TAG, "ReCaptchaException should never happen here.", e);
+        }
 
-                                compareAppVersionAndShowNotification(app, versionName,
-                                        apkLocationUrl, versionCode);
-                            } catch (final JsonParserException e) {
-                                // connectivity problems, do not alarm user and fail silently
-                                if (DEBUG) {
-                                    Log.w(TAG, "Could not get NewPipe API: invalid json", e);
-                                }
-                            }
-                        },
-                        e -> {
-                            // connectivity problems, do not alarm user and fail silently
-                            if (DEBUG) {
-                                Log.w(TAG, "Could not get NewPipe API: network problem", e);
-                            }
-                        });
     }
 }

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -20,6 +20,9 @@
 
 package org.schabi.newpipe;
 
+import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -91,8 +94,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     @SuppressWarnings("ConstantConditions")
@@ -165,7 +166,57 @@ public class MainActivity extends AppCompatActivity {
         openMiniPlayerUponPlayerStarted();
     }
 
-    private void setupDrawer() throws Exception {
+    @Override
+    protected void onPostCreate(final Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+
+        final App app = App.getApp();
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
+
+        if (prefs.getBoolean(app.getString(R.string.update_app_key), true)) {
+            // Start the service which is checking all conditions
+            // and eventually searching for a new version.
+            // The service searching for a new NewPipe version must not be started in background.
+            startNewVersionCheckService();
+        }
+    }
+
+    private void setupDrawer() throws ExtractionException {
+        addDrawerMenuForCurrentService();
+
+        toggle = new ActionBarDrawerToggle(this, mainBinding.getRoot(),
+                toolbarLayoutBinding.toolbar, R.string.drawer_open, R.string.drawer_close);
+        toggle.syncState();
+        mainBinding.getRoot().addDrawerListener(toggle);
+        mainBinding.getRoot().addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
+            private int lastService;
+
+            @Override
+            public void onDrawerOpened(final View drawerView) {
+                lastService = ServiceHelper.getSelectedServiceId(MainActivity.this);
+            }
+
+            @Override
+            public void onDrawerClosed(final View drawerView) {
+                if (servicesShown) {
+                    toggleServices();
+                }
+                if (lastService != ServiceHelper.getSelectedServiceId(MainActivity.this)) {
+                    ActivityCompat.recreate(MainActivity.this);
+                }
+            }
+        });
+
+        drawerLayoutBinding.navigation.setNavigationItemSelectedListener(this::drawerItemSelected);
+        setupDrawerHeader();
+    }
+
+    /**
+     * Builds the drawer menu for the current service.
+     *
+     * @throws ExtractionException
+     */
+    private void addDrawerMenuForCurrentService() throws ExtractionException {
         //Tabs
         final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
         final StreamingService service = NewPipe.getService(currentServiceId);
@@ -204,32 +255,6 @@ public class MainActivity extends AppCompatActivity {
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
                 .setIcon(R.drawable.ic_info_outline);
-
-        toggle = new ActionBarDrawerToggle(this, mainBinding.getRoot(),
-                toolbarLayoutBinding.toolbar, R.string.drawer_open, R.string.drawer_close);
-        toggle.syncState();
-        mainBinding.getRoot().addDrawerListener(toggle);
-        mainBinding.getRoot().addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
-            private int lastService;
-
-            @Override
-            public void onDrawerOpened(final View drawerView) {
-                lastService = ServiceHelper.getSelectedServiceId(MainActivity.this);
-            }
-
-            @Override
-            public void onDrawerClosed(final View drawerView) {
-                if (servicesShown) {
-                    toggleServices();
-                }
-                if (lastService != ServiceHelper.getSelectedServiceId(MainActivity.this)) {
-                    ActivityCompat.recreate(MainActivity.this);
-                }
-            }
-        });
-
-        drawerLayoutBinding.navigation.setNavigationItemSelectedListener(this::drawerItemSelected);
-        setupDrawerHeader();
     }
 
     private boolean drawerItemSelected(final MenuItem item) {
@@ -337,11 +362,15 @@ public class MainActivity extends AppCompatActivity {
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_tabs_group);
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_options_about_group);
 
+        // Show up or down arrow
+        drawerHeaderBinding.drawerArrow.setImageResource(
+                servicesShown ? R.drawable.ic_arrow_drop_up : R.drawable.ic_arrow_drop_down);
+
         if (servicesShown) {
             showServices();
         } else {
             try {
-                showTabs();
+                addDrawerMenuForCurrentService();
             } catch (final Exception e) {
                 ErrorActivity.reportUiErrorInSnackbar(this, "Showing main page tabs", e);
             }
@@ -349,8 +378,6 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void showServices() {
-        drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_up);
-
         for (final StreamingService s : NewPipe.getServices()) {
             final String title = s.getServiceInfo().getName()
                     + (ServiceHelper.isBeta(s) ? " (beta)" : "");
@@ -414,48 +441,6 @@ public class MainActivity extends AppCompatActivity {
         menuItem.setActionView(spinner);
     }
 
-    private void showTabs() throws ExtractionException {
-        drawerHeaderBinding.drawerArrow.setImageResource(R.drawable.ic_arrow_drop_down);
-
-        //Tabs
-        final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
-        final StreamingService service = NewPipe.getService(currentServiceId);
-
-        int kioskId = 0;
-
-        for (final String ks : service.getKioskList().getAvailableKiosks()) {
-            drawerLayoutBinding.navigation.getMenu()
-                    .add(R.id.menu_tabs_group, kioskId, ORDER,
-                            KioskTranslator.getTranslatedKioskName(ks, this))
-                    .setIcon(KioskTranslator.getKioskIcon(ks, this));
-            kioskId++;
-        }
-
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
-                .setIcon(R.drawable.ic_tv);
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_feed_title)
-                .setIcon(R.drawable.ic_rss_feed);
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
-                .setIcon(R.drawable.ic_bookmark);
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
-                .setIcon(R.drawable.ic_file_download);
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
-                .setIcon(R.drawable.ic_history);
-
-        //Settings and About
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
-                .setIcon(R.drawable.ic_settings);
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
-                .setIcon(R.drawable.ic_info_outline);
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();

app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java

@@ -9,8 +9,8 @@ import android.widget.PopupMenu;
 
 import androidx.fragment.app.FragmentManager;
 
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -18,6 +18,9 @@ import org.schabi.newpipe.util.NavigationHelper;
 import java.util.Collections;
 
 public final class QueueItemMenuUtil {
+    private QueueItemMenuUtil() {
+    }
+
     public static void openPopupMenu(final PlayQueue playQueue,
                                      final PlayQueueItem item,
                                      final View view,
@@ -47,13 +50,22 @@ public final class QueueItemMenuUtil {
                             false);
                     return true;
                 case R.id.menu_item_append_playlist:
-                    final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(
-                            Collections.singletonList(item)
+                    PlaylistDialog.createCorrespondingDialog(
+                            context,
+                            Collections.singletonList(new StreamEntity(item)),
+                            dialog -> dialog.show(
+                                    fragmentManager,
+                                    "QueueItemMenuUtil@append_playlist"
+                            )
                     );
-                    PlaylistAppendDialog.onPlaylistFound(context,
-                            () -> d.show(fragmentManager, "QueueItemMenuUtil@append_playlist"),
-                            () -> PlaylistCreationDialog.newInstance(d)
-                                    .show(fragmentManager, "QueueItemMenuUtil@append_playlist"));
+
+                    return true;
+                case R.id.menu_item_channel_details:
+                    // An intent must be used here.
+                    // Opening with FragmentManager transactions is not working,
+                    // as PlayQueueActivity doesn't use fragments.
+                    NavigationHelper.openChannelFragmentUsingIntent(context, item.getServiceId(),
+                            item.getUploaderUrl(), item.getUploader());
                     return true;
                 case R.id.menu_item_share:
                     shareText(context, item.getTitle(), item.getUrl(),
@@ -65,6 +77,4 @@ public final class QueueItemMenuUtil {
 
         popupMenu.show();
     }
-
-    private QueueItemMenuUtil() { }
 }

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -1,5 +1,8 @@
 package org.schabi.newpipe;
 
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
+
 import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Context;
@@ -30,6 +33,7 @@ import androidx.core.widget.TextViewCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
 import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
 import org.schabi.newpipe.download.DownloadDialog;
@@ -56,6 +60,7 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.ktx.ExceptionUtils;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
@@ -69,14 +74,15 @@ import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.urlfinder.UrlFinder;
 import org.schabi.newpipe.views.FocusOverlayView;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import icepick.Icepick;
@@ -89,9 +95,6 @@ import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
-import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-
 /**
  * Get the url from the intent and open it in the chosen preferred player.
  */
@@ -107,6 +110,7 @@ public class RouterActivity extends AppCompatActivity {
     protected String currentUrl;
     private StreamingService currentService;
     private boolean selectionIsDownload = false;
+    private boolean selectionIsAddToPlaylist = false;
     private AlertDialog alertDialogChoice = null;
 
     @Override
@@ -350,7 +354,7 @@ public class RouterActivity extends AppCompatActivity {
                 .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
                 .setPositiveButton(R.string.always, dialogButtonsClickListener)
                 .setOnDismissListener((dialog) -> {
-                    if (!selectionIsDownload) {
+                    if (!selectionIsDownload && !selectionIsAddToPlaylist) {
                         finish();
                     }
                 })
@@ -446,6 +450,10 @@ public class RouterActivity extends AppCompatActivity {
         final AdapterChoiceItem backgroundPlayer = new AdapterChoiceItem(
                 getString(R.string.background_player_key), getString(R.string.background_player),
                 R.drawable.ic_headset);
+        final AdapterChoiceItem addToPlaylist = new AdapterChoiceItem(
+                getString(R.string.add_to_playlist_key), getString(R.string.add_to_playlist),
+                R.drawable.ic_add);
+
 
         if (linkType == LinkType.STREAM) {
             if (isExtVideoEnabled) {
@@ -482,6 +490,10 @@ public class RouterActivity extends AppCompatActivity {
                     getString(R.string.download),
                     R.drawable.ic_file_download));
 
+            // Add to playlist is not necessary for CHANNEL and PLAYLIST linkType since those can
+            // not be added to a playlist
+            returnList.add(addToPlaylist);
+
         } else {
             returnList.add(showInfo);
             if (capabilities.contains(VIDEO) && !isExtVideoEnabled) {
@@ -547,6 +559,12 @@ public class RouterActivity extends AppCompatActivity {
             return;
         }
 
+        if (selectedChoiceKey.equals(getString(R.string.add_to_playlist_key))) {
+            selectionIsAddToPlaylist = true;
+            openAddToPlaylistDialog();
+            return;
+        }
+
         // stop and bypass FetcherService if InfoScreen was selected since
         // StreamDetailFragment can fetch data itself
         if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
@@ -572,6 +590,41 @@ public class RouterActivity extends AppCompatActivity {
         finish();
     }
 
+    private void openAddToPlaylistDialog() {
+        // Getting the stream info usually takes a moment
+        // Notifying the user here to ensure that no confusion arises
+        Toast.makeText(
+                getApplicationContext(),
+                getString(R.string.processing_may_take_a_moment),
+                Toast.LENGTH_SHORT)
+                .show();
+
+        disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, false)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        info -> PlaylistDialog.createCorrespondingDialog(
+                                getThemeWrapperContext(),
+                                Collections.singletonList(new StreamEntity(info)),
+                                playlistDialog -> {
+                                    playlistDialog.setOnDismissListener(dialog -> finish());
+
+                                    playlistDialog.show(
+                                            this.getSupportFragmentManager(),
+                                            "addToPlaylistDialog"
+                                    );
+                                }
+                        ),
+                        throwable -> handleError(this, new ErrorInfo(
+                                throwable,
+                                UserAction.REQUESTED_STREAM,
+                                "Tried to add " + currentUrl + " to a playlist",
+                                currentService.getServiceId())
+                        )
+                )
+        );
+    }
+
     @SuppressLint("CheckResult")
     private void openDownloadDialog() {
         disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)

app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt

@@ -7,6 +7,7 @@ import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
 import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import org.schabi.newpipe.database.feed.model.FeedEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.StreamWithState
@@ -37,7 +38,7 @@ abstract class FeedDAO {
         LIMIT 500
         """
     )
-    abstract fun getAllStreams(): Flowable<List<StreamWithState>>
+    abstract fun getAllStreams(): Maybe<List<StreamWithState>>
 
     @Query(
         """
@@ -62,7 +63,7 @@ abstract class FeedDAO {
         LIMIT 500
         """
     )
-    abstract fun getAllStreamsForGroup(groupId: Long): Flowable<List<StreamWithState>>
+    abstract fun getAllStreamsForGroup(groupId: Long): Maybe<List<StreamWithState>>
 
     /**
      * @see StreamStateEntity.isFinished()
@@ -97,7 +98,7 @@ abstract class FeedDAO {
         LIMIT 500
         """
     )
-    abstract fun getLiveOrNotPlayedStreams(): Flowable<List<StreamWithState>>
+    abstract fun getLiveOrNotPlayedStreams(): Maybe<List<StreamWithState>>
 
     /**
      * @see StreamStateEntity.isFinished()
@@ -137,7 +138,7 @@ abstract class FeedDAO {
         LIMIT 500
         """
     )
-    abstract fun getLiveOrNotPlayedStreamsForGroup(groupId: Long): Flowable<List<StreamWithState>>
+    abstract fun getLiveOrNotPlayedStreamsForGroup(groupId: Long): Maybe<List<StreamWithState>>
 
     @Query(
         """

app/src/main/java/org/schabi/newpipe/error/EnsureExceptionSerializable.java

@@ -0,0 +1,103 @@
+package org.schabi.newpipe.error;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Ensures that a Exception is serializable.
+ * This is
+ */
+public final class EnsureExceptionSerializable {
+    private static final String TAG = "EnsureExSerializable";
+
+    private EnsureExceptionSerializable() {
+        // No instance
+    }
+
+    /**
+     * Ensures that an exception is serializable.
+     * <br/>
+     * If that is not the case a {@link WorkaroundNotSerializableException} is created.
+     *
+     * @param exception
+     * @return if an exception is not serializable a new {@link WorkaroundNotSerializableException}
+     * otherwise the exception from the parameter
+     */
+    public static Exception ensureSerializable(@NonNull final Exception exception) {
+        return checkIfSerializable(exception)
+                ? exception
+                : WorkaroundNotSerializableException.create(exception);
+    }
+
+    public static boolean checkIfSerializable(@NonNull final Exception exception) {
+        try {
+            // Check by creating a new ObjectOutputStream which does the serialization
+            try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                 ObjectOutputStream oos = new ObjectOutputStream(bos)
+            ) {
+                oos.writeObject(exception);
+                oos.flush();
+
+                bos.toByteArray();
+            }
+
+            return true;
+        } catch (final IOException ex) {
+            Log.d(TAG, "Exception is not serializable", ex);
+            return false;
+        }
+    }
+
+    public static class WorkaroundNotSerializableException extends Exception {
+        protected WorkaroundNotSerializableException(
+                final Throwable notSerializableException,
+                final Throwable cause) {
+            super(notSerializableException.toString(), cause);
+            setStackTrace(notSerializableException.getStackTrace());
+        }
+
+        protected WorkaroundNotSerializableException(final Throwable notSerializableException) {
+            super(notSerializableException.toString());
+            setStackTrace(notSerializableException.getStackTrace());
+        }
+
+        public static WorkaroundNotSerializableException create(
+                @NonNull final Exception notSerializableException
+        ) {
+            // Build a list of the exception + all causes
+            final List<Throwable> throwableList = new ArrayList<>();
+
+            int pos = 0;
+            Throwable throwableToProcess = notSerializableException;
+
+            while (throwableToProcess != null) {
+                throwableList.add(throwableToProcess);
+
+                pos++;
+                throwableToProcess = throwableToProcess.getCause();
+            }
+
+            // Reverse list so that it starts with the last one
+            Collections.reverse(throwableList);
+
+            // Build exception stack
+            WorkaroundNotSerializableException cause = null;
+            for (final Throwable t : throwableList) {
+                cause = cause == null
+                        ? new WorkaroundNotSerializableException(t)
+                        : new WorkaroundNotSerializableException(t, cause);
+            }
+
+            return cause;
+        }
+
+    }
+}

app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java

@@ -77,6 +77,16 @@ public class ErrorActivity extends AppCompatActivity {
 
     private ActivityErrorBinding activityErrorBinding;
 
+    /**
+     * Reports a new error by starting a new activity.
+     * <br/>
+     * Ensure that the data within errorInfo is serializable otherwise
+     * an exception will be thrown!<br/>
+     * {@link EnsureExceptionSerializable} might help.
+     *
+     * @param context
+     * @param errorInfo
+     */
     public static void reportError(final Context context, final ErrorInfo errorInfo) {
         final Intent intent = new Intent(context, ErrorActivity.class);
         intent.putExtra(ERROR_INFO, errorInfo);

app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java

@@ -20,8 +20,8 @@ public class BlankFragment extends BaseFragment {
     }
 
     @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
+    public void onResume() {
+        super.onResume();
         setTitle("NewPipe");
         // leave this inline. Will make it harder for copy cats.
         // If you are a Copy cat FUCK YOU.

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

@@ -52,6 +52,7 @@ import com.squareup.picasso.Callback;
 
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.FragmentVideoDetailBinding;
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.error.ErrorActivity;
@@ -73,10 +74,10 @@ import org.schabi.newpipe.fragments.EmptyFragment;
 import org.schabi.newpipe.fragments.list.comments.CommentsFragment;
 import org.schabi.newpipe.fragments.list.videos.RelatedItemsFragment;
 import org.schabi.newpipe.ktx.AnimationType;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainPlayer;
+import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
@@ -98,6 +99,7 @@ import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -443,12 +445,11 @@ public final class VideoDetailFragment
                 break;
             case R.id.detail_controls_playlist_append:
                 if (getFM() != null && currentInfo != null) {
-
-                    final PlaylistAppendDialog d = PlaylistAppendDialog.fromStreamInfo(currentInfo);
                     disposables.add(
-                            PlaylistAppendDialog.onPlaylistFound(getContext(),
-                                    () -> d.show(getFM(), TAG),
-                                    () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
+                            PlaylistDialog.createCorrespondingDialog(
+                                    getContext(),
+                                    Collections.singletonList(new StreamEntity(currentInfo)),
+                                    dialog -> dialog.show(getFM(), TAG)
                             )
                     );
                 }
@@ -593,6 +594,11 @@ public final class VideoDetailFragment
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+    }
+
     @Override // called from onViewCreated in {@link BaseFragment#onViewCreated}
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
@@ -603,6 +609,18 @@ public final class VideoDetailFragment
 
         binding.detailThumbnailRootLayout.requestFocus();
 
+        binding.detailControlsPlayWithKodi.setVisibility(
+                KoreUtils.shouldShowPlayWithKodi(requireContext(), serviceId)
+                        ? View.VISIBLE
+                        : View.GONE
+        );
+        binding.detailControlsCrashThePlayer.setVisibility(
+                DEBUG && PreferenceManager.getDefaultSharedPreferences(getContext())
+                        .getBoolean(getString(R.string.show_crash_the_player_key), false)
+                        ? View.VISIBLE
+                        : View.GONE
+        );
+
         if (DeviceUtils.isTv(getContext())) {
             // remove ripple effects from detail controls
             final int transparent = ContextCompat.getColor(requireContext(),
@@ -637,8 +655,14 @@ public final class VideoDetailFragment
         binding.detailControlsShare.setOnClickListener(this);
         binding.detailControlsOpenInBrowser.setOnClickListener(this);
         binding.detailControlsPlayWithKodi.setOnClickListener(this);
-        binding.detailControlsPlayWithKodi.setVisibility(KoreUtils.shouldShowPlayWithKodi(
-                requireContext(), serviceId) ? View.VISIBLE : View.GONE);
+        if (DEBUG) {
+            binding.detailControlsCrashThePlayer.setOnClickListener(
+                    v -> VideoDetailPlayerCrasher.onCrashThePlayer(
+                            this.getContext(),
+                            this.player,
+                            getLayoutInflater())
+            );
+        }
 
         binding.overlayThumbnail.setOnClickListener(this);
         binding.overlayThumbnail.setOnLongClickListener(this);
@@ -1095,8 +1119,8 @@ public final class VideoDetailFragment
         toggleFullscreenIfInFullscreenMode();
 
         final PlayQueue queue = setupPlayQueueForIntent(append);
-        if (append) {
-            NavigationHelper.enqueueOnPopupPlayer(activity, queue, false);
+        if (append) { //resumePlayback: false
+            NavigationHelper.enqueueOnPlayer(activity, queue, PlayerType.POPUP);
         } else {
             replaceQueueIfUserConfirms(() -> NavigationHelper
                     .playOnPopupPlayer(activity, queue, true));
@@ -1154,7 +1178,7 @@ public final class VideoDetailFragment
 
         final PlayQueue queue = setupPlayQueueForIntent(append);
         if (append) {
-            NavigationHelper.enqueueOnBackgroundPlayer(activity, queue, false);
+            NavigationHelper.enqueueOnPlayer(activity, queue, PlayerType.AUDIO);
         } else {
             replaceQueueIfUserConfirms(() -> NavigationHelper
                     .playOnBackgroundPlayer(activity, queue, true));

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

@@ -0,0 +1,159 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlaybackException;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
+import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
+import org.schabi.newpipe.player.Player;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * Outsourced logic for crashing the player in the {@link VideoDetailFragment}.
+ */
+public final class VideoDetailPlayerCrasher {
+
+    // This has to be <= 23 chars on devices running Android 7 or lower (API <= 25)
+    // or it fails with an IllegalArgumentException
+    // https://stackoverflow.com/a/54744028
+    private static final String TAG = "VideoDetPlayerCrasher";
+
+    private static final Map<String, Supplier<ExoPlaybackException>> AVAILABLE_EXCEPTION_TYPES =
+            getExceptionTypes();
+
+    private VideoDetailPlayerCrasher() {
+        // No impls
+    }
+
+    private static Map<String, Supplier<ExoPlaybackException>> getExceptionTypes() {
+        final String defaultMsg = "Dummy";
+        final Map<String, Supplier<ExoPlaybackException>> exceptionTypes = new LinkedHashMap<>();
+        exceptionTypes.put(
+                "Source",
+                () -> ExoPlaybackException.createForSource(
+                        new IOException(defaultMsg)
+                )
+        );
+        exceptionTypes.put(
+                "Renderer",
+                () -> ExoPlaybackException.createForRenderer(
+                        new Exception(defaultMsg),
+                        "Dummy renderer",
+                        0,
+                        null,
+                        C.FORMAT_HANDLED
+                )
+        );
+        exceptionTypes.put(
+                "Unexpected",
+                () -> ExoPlaybackException.createForUnexpected(
+                        new RuntimeException(defaultMsg)
+                )
+        );
+        exceptionTypes.put(
+                "Remote",
+                () -> ExoPlaybackException.createForRemote(defaultMsg)
+        );
+
+        return Collections.unmodifiableMap(exceptionTypes);
+    }
+
+    private static Context getThemeWrapperContext(final Context context) {
+        return new ContextThemeWrapper(
+                context,
+                ThemeHelper.isLightThemeSelected(context)
+                        ? R.style.LightTheme
+                        : R.style.DarkTheme);
+    }
+
+    public static void onCrashThePlayer(
+            @NonNull final Context context,
+            @Nullable final Player player,
+            @NonNull final LayoutInflater layoutInflater
+    ) {
+        if (player == null) {
+            Log.d(TAG, "Player is not available");
+            Toast.makeText(context, "Player is not available", Toast.LENGTH_SHORT)
+                    .show();
+
+            return;
+        }
+
+        // -- Build the dialog/UI --
+
+        final Context themeWrapperContext = getThemeWrapperContext(context);
+
+        final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
+        final RadioGroup radioGroup = SingleChoiceDialogViewBinding.inflate(layoutInflater)
+                .list;
+
+        final AlertDialog alertDialog = new AlertDialog.Builder(getThemeWrapperContext(context))
+                .setTitle("Choose an exception")
+                .setView(radioGroup)
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, null)
+                .create();
+
+        for (final Map.Entry<String, Supplier<ExoPlaybackException>> entry
+                : AVAILABLE_EXCEPTION_TYPES.entrySet()) {
+            final RadioButton radioButton = ListRadioIconItemBinding.inflate(inflater).getRoot();
+            radioButton.setText(entry.getKey());
+            radioButton.setChecked(false);
+            radioButton.setLayoutParams(
+                    new RadioGroup.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+            );
+            radioButton.setOnClickListener(v -> {
+                tryCrashPlayerWith(player, entry.getValue().get());
+                if (alertDialog != null) {
+                    alertDialog.cancel();
+                }
+            });
+            radioGroup.addView(radioButton);
+        }
+
+        alertDialog.show();
+    }
+
+    /**
+     * Note that this method does not crash the underlying exoplayer directly (it's not possible).
+     * It simply supplies a Exception to {@link Player#onPlayerError(ExoPlaybackException)}.
+     * @param player
+     * @param exception
+     */
+    private static void tryCrashPlayerWith(
+            @NonNull final Player player,
+            @NonNull final ExoPlaybackException exception
+    ) {
+        Log.d(TAG, "Crashing the player using player.onPlayerError(ex)");
+        try {
+            player.onPlayerError(exception);
+        } catch (final Exception exPlayer) {
+            Log.e(TAG,
+                    "Run into an exception while crashing the player:",
+                    exPlayer);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -143,7 +143,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
             final View focusedItem = itemsList.getFocusedChild();
             final RecyclerView.ViewHolder itemHolder =
                     itemsList.findContainingViewHolder(focusedItem);
-            return itemHolder.getAdapterPosition();
+            return itemHolder.getBindingAdapterPosition();
         } catch (final NullPointerException e) {
             return -1;
         }
@@ -350,12 +350,16 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         if (context == null || context.getResources() == null || activity == null) {
             return;
         }
-
         final List<StreamDialogEntry> entries = new ArrayList<>();
 
-        if (PlayerHolder.getInstance().getType() != null) {
+        if (PlayerHolder.getInstance().isPlayerOpen()) {
             entries.add(StreamDialogEntry.enqueue);
+
+            if (PlayerHolder.getInstance().getQueueSize() > 1) {
+                entries.add(StreamDialogEntry.enqueue_next);
+            }
         }
+
         if (item.getStreamType() == StreamType.AUDIO_STREAM) {
             entries.addAll(Arrays.asList(
                     StreamDialogEntry.start_here_on_background,
@@ -374,6 +378,13 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         if (KoreUtils.shouldShowPlayWithKodi(context, item.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
+
+        // show "mark as watched" only when watch history is enabled
+        if (StreamDialogEntry.shouldAddMarkAsWatched(item.getStreamType(), context)) {
+            entries.add(
+                    StreamDialogEntry.mark_as_watched
+            );
+        }
         if (!isNullOrEmpty(item.getUploaderUrl())) {
             entries.add(StreamDialogEntry.show_channel_details);
         }

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -37,6 +37,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
+import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -97,11 +98,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     }
 
     @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (activity != null
-                && useAsFrontPage
-                && isVisibleToUser) {
+    public void onResume() {
+        super.onResume();
+        if (activity != null && useAsFrontPage) {
             setTitle(currentInfo != null ? currentInfo.getName() : name);
         }
     }
@@ -495,12 +494,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                         .playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
         playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.POPUP);
             return true;
         });
 
         playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.AUDIO);
             return true;
         });
     }

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -99,9 +99,12 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     }
 
     @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (useAsFrontPage && isVisibleToUser && activity != null) {
+    public void onResume() {
+        super.onResume();
+        if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
+            reloadContent();
+        }
+        if (useAsFrontPage && activity != null) {
             try {
                 setTitle(kioskTranslatedName);
             } catch (final Exception e) {
@@ -117,15 +120,6 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         return inflater.inflate(R.layout.fragment_kiosk, container, false);
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
-            reloadContent();
-        }
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -37,6 +37,7 @@ import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
@@ -148,9 +149,14 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
 
         final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
 
-        if (PlayerHolder.getInstance().getType() != null) {
+        if (PlayerHolder.getInstance().isPlayerOpen()) {
             entries.add(StreamDialogEntry.enqueue);
+
+            if (PlayerHolder.getInstance().getQueueSize() > 1) {
+                entries.add(StreamDialogEntry.enqueue_next);
+            }
         }
+
         if (item.getStreamType() == StreamType.AUDIO_STREAM) {
             entries.addAll(Arrays.asList(
                     StreamDialogEntry.start_here_on_background,
@@ -170,6 +176,12 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
 
+        // show "mark as watched" only when watch history is enabled
+        if (StreamDialogEntry.shouldAddMarkAsWatched(item.getStreamType(), context)) {
+            entries.add(
+                    StreamDialogEntry.mark_as_watched
+            );
+        }
         if (!isNullOrEmpty(item.getUploaderUrl())) {
             entries.add(StreamDialogEntry.show_channel_details);
         }
@@ -347,12 +359,12 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                 NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
         playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.POPUP);
             return true;
         });
 
         playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.AUDIO);
             return true;
         });
     }

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -1088,7 +1088,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     //////////////////////////////////////////////////////////////////////////*/
 
     public int getSuggestionMovementFlags(@NonNull final RecyclerView.ViewHolder viewHolder) {
-        final int position = viewHolder.getAdapterPosition();
+        final int position = viewHolder.getBindingAdapterPosition();
         if (position == RecyclerView.NO_POSITION) {
             return 0;
         }
@@ -1099,7 +1099,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     }
 
     public void onSuggestionItemSwiped(@NonNull final RecyclerView.ViewHolder viewHolder) {
-        final int position = viewHolder.getAdapterPosition();
+        final int position = viewHolder.getBindingAdapterPosition();
         final String query = suggestionListAdapter.getItem(position).query;
         final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt

@@ -1,8 +1,7 @@
 package org.schabi.newpipe.info_list
 
 import android.util.Log
-import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.GroupieViewHolder
+import com.xwray.groupie.GroupieAdapter
 import org.schabi.newpipe.extractor.stream.StreamInfo
 import kotlin.math.max
 
@@ -11,7 +10,7 @@ import kotlin.math.max
  */
 class StreamSegmentAdapter(
     private val listener: StreamSegmentListener
-) : GroupAdapter<GroupieViewHolder>() {
+) : GroupieAdapter() {
 
     var currentIndex: Int = 0
         private set

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

@@ -299,18 +299,36 @@ private fun View.animateLightSlideAndAlpha(enterOrExit: Boolean, duration: Long,
     }
 }
 
-fun View.slideUp(duration: Long, delay: Long, @FloatRange(from = 0.0, to = 1.0) translationPercent: Float) {
+fun View.slideUp(
+    duration: Long,
+    delay: Long,
+    @FloatRange(from = 0.0, to = 1.0) translationPercent: Float
+) {
+    slideUp(duration, delay, translationPercent, null)
+}
+
+fun View.slideUp(
+    duration: Long,
+    delay: Long = 0L,
+    @FloatRange(from = 0.0, to = 1.0) translationPercent: Float = 1.0F,
+    execOnEnd: Runnable? = null
+) {
     val newTranslationY = (resources.displayMetrics.heightPixels * translationPercent).toInt()
     animate().setListener(null).cancel()
     alpha = 0f
     translationY = newTranslationY.toFloat()
-    visibility = View.VISIBLE
+    isVisible = true
     animate()
         .alpha(1f)
         .translationY(0f)
         .setStartDelay(delay)
         .setDuration(duration)
         .setInterpolator(FastOutSlowInInterpolator())
+        .setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                execOnEnd?.run()
+            }
+        })
         .start()
 }
 

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -78,9 +78,9 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     }
 
     @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (activity != null && isVisibleToUser) {
+    public void onResume() {
+        super.onResume();
+        if (activity != null) {
             setTitle(activity.getString(R.string.tab_bookmarks));
         }
     }

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

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.local.dialog;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,20 +16,14 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.local.LocalItemListAdapter;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.OnClickGesture;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import io.reactivex.rxjava3.disposables.Disposable;
 
 public final class PlaylistAppendDialog extends PlaylistDialog {
     private static final String TAG = PlaylistAppendDialog.class.getCanonicalName();
@@ -40,47 +33,8 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
 
     private final CompositeDisposable playlistDisposables = new CompositeDisposable();
 
-    public static Disposable onPlaylistFound(
-            final Context context, final Runnable onSuccess, final Runnable onFailed
-    ) {
-        final LocalPlaylistManager playlistManager =
-                new LocalPlaylistManager(NewPipeDatabase.getInstance(context));
-
-        return playlistManager.hasPlaylists()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(hasPlaylists -> {
-                    if (hasPlaylists) {
-                        onSuccess.run();
-                    } else {
-                        onFailed.run();
-                    }
-                });
-    }
-
-    public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) {
-        final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
-        dialog.setInfo(Collections.singletonList(new StreamEntity(info)));
-        return dialog;
-    }
-
-    public static PlaylistAppendDialog fromStreamInfoItems(final List<StreamInfoItem> items) {
-        final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
-        final List<StreamEntity> entities = new ArrayList<>(items.size());
-        for (final StreamInfoItem item : items) {
-            entities.add(new StreamEntity(item));
-        }
-        dialog.setInfo(entities);
-        return dialog;
-    }
-
-    public static PlaylistAppendDialog fromPlayQueueItems(final List<PlayQueueItem> items) {
-        final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
-        final List<StreamEntity> entities = new ArrayList<>(items.size());
-        for (final PlayQueueItem item : items) {
-            entities.add(new StreamEntity(item));
-        }
-        dialog.setInfo(entities);
-        return dialog;
+    public PlaylistAppendDialog(final List<StreamEntity> streamEntities) {
+        super(streamEntities);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -104,11 +58,15 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         playlistAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
             @Override
             public void selected(final LocalItem selectedItem) {
-                if (!(selectedItem instanceof PlaylistMetadataEntry) || getStreams() == null) {
+                if (!(selectedItem instanceof PlaylistMetadataEntry)
+                        || getStreamEntities() == null) {
                     return;
                 }
-                onPlaylistSelected(playlistManager, (PlaylistMetadataEntry) selectedItem,
-                        getStreams());
+                onPlaylistSelected(
+                        playlistManager,
+                        (PlaylistMetadataEntry) selectedItem,
+                        getStreamEntities()
+                );
             }
         });
 
@@ -146,11 +104,17 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
     //////////////////////////////////////////////////////////////////////////*/
 
     public void openCreatePlaylistDialog() {
-        if (getStreams() == null || !isAdded()) {
+        if (getStreamEntities() == null || !isAdded()) {
             return;
         }
 
-        PlaylistCreationDialog.newInstance(getStreams()).show(getParentFragmentManager(), TAG);
+        final PlaylistCreationDialog playlistCreationDialog =
+                new PlaylistCreationDialog(getStreamEntities());
+        // Move the dismissListener to the new dialog.
+        playlistCreationDialog.setOnDismissListener(this.getOnDismissListener());
+        this.setOnDismissListener(null);
+
+        playlistCreationDialog.show(getParentFragmentManager(), TAG);
         requireDialog().dismiss();
     }
 
@@ -165,7 +129,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
     private void onPlaylistSelected(@NonNull final LocalPlaylistManager manager,
                                     @NonNull final PlaylistMetadataEntry playlist,
                                     @NonNull final List<StreamEntity> streams) {
-        if (getStreams() == null) {
+        if (getStreamEntities() == null) {
             return;
         }
 

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

@@ -7,29 +7,22 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog.Builder;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.DialogEditTextBinding;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 
 public final class PlaylistCreationDialog extends PlaylistDialog {
-    public static PlaylistCreationDialog newInstance(final List<StreamEntity> streams) {
-        final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
-        dialog.setInfo(streams);
-        return dialog;
-    }
-
-    public static PlaylistCreationDialog newInstance(final PlaylistAppendDialog appendDialog) {
-        final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
-        dialog.setInfo(appendDialog.getStreams());
-        return dialog;
+    public PlaylistCreationDialog(final List<StreamEntity> streamEntities) {
+        super(streamEntities);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -39,16 +32,18 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
-        if (getStreams() == null) {
+        if (getStreamEntities() == null) {
             return super.onCreateDialog(savedInstanceState);
         }
 
         final DialogEditTextBinding dialogBinding
                 = DialogEditTextBinding.inflate(getLayoutInflater());
+        dialogBinding.getRoot().getContext().setTheme(ThemeHelper.getDialogTheme(requireContext()));
         dialogBinding.dialogEditText.setHint(R.string.name);
         dialogBinding.dialogEditText.setInputType(InputType.TYPE_CLASS_TEXT);
 
-        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext())
+        final Builder dialogBuilder = new Builder(requireContext(),
+                ThemeHelper.getDialogTheme(requireContext()))
                 .setTitle(R.string.create_playlist)
                 .setView(dialogBinding.getRoot())
                 .setCancelable(true)
@@ -61,11 +56,10 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
                             R.string.playlist_creation_success,
                             Toast.LENGTH_SHORT);
 
-                    playlistManager.createPlaylist(name, getStreams())
+                    playlistManager.createPlaylist(name, getStreamEntities())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(longs -> successToast.show());
                 });
-
         return dialogBuilder.create();
     }
 }

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

@@ -1,6 +1,8 @@
 package org.schabi.newpipe.local.dialog;
 
 import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.Window;
 
@@ -8,23 +10,29 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
+import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.util.StateSaver;
 
 import java.util.List;
 import java.util.Queue;
+import java.util.function.Consumer;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public abstract class PlaylistDialog extends DialogFragment implements StateSaver.WriteRead {
+
+    @Nullable
+    private DialogInterface.OnDismissListener onDismissListener = null;
+
     private List<StreamEntity> streamEntities;
 
     private org.schabi.newpipe.util.SavedState savedState;
 
-    protected void setInfo(final List<StreamEntity> entities) {
-        this.streamEntities = entities;
-    }
-
-    protected List<StreamEntity> getStreams() {
-        return streamEntities;
+    public PlaylistDialog(final List<StreamEntity> streamEntities) {
+        this.streamEntities = streamEntities;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -43,6 +51,10 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
         StateSaver.onDestroy(savedState);
     }
 
+    public List<StreamEntity> getStreamEntities() {
+        return streamEntities;
+    }
+
     @NonNull
     @Override
     public Dialog onCreateDialog(final Bundle savedInstanceState) {
@@ -55,6 +67,14 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
         return dialog;
     }
 
+    @Override
+    public void onDismiss(@NonNull final DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // State Saving
     //////////////////////////////////////////////////////////////////////////*/
@@ -84,4 +104,47 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
                     savedState, outState, this);
         }
     }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Getter + Setter
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Nullable
+    public DialogInterface.OnDismissListener getOnDismissListener() {
+        return onDismissListener;
+    }
+
+    public void setOnDismissListener(
+            @Nullable final DialogInterface.OnDismissListener onDismissListener
+    ) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Dialog creation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * Creates a {@link PlaylistAppendDialog} when playlists exists,
+     * otherwise a {@link PlaylistCreationDialog}.
+     *
+     * @param context        context used for accessing the database
+     * @param streamEntities used for crating the dialog
+     * @param onExec         execution that should occur after a dialog got created, e.g. showing it
+     * @return Disposable
+     */
+    public static Disposable createCorrespondingDialog(
+            final Context context,
+            final List<StreamEntity> streamEntities,
+            final Consumer<PlaylistDialog> onExec
+    ) {
+        return new LocalPlaylistManager(NewPipeDatabase.getInstance(context))
+                .hasPlaylists()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(hasPlaylists ->
+                        onExec.accept(hasPlaylists
+                                ? new PlaylistAppendDialog(streamEntities)
+                                : new PlaylistCreationDialog(streamEntities))
+                );
+    }
 }

app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt

@@ -42,7 +42,7 @@ class FeedDatabaseManager(context: Context) {
     fun getStreams(
         groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
         getPlayedStreams: Boolean = true
-    ): Flowable<List<StreamWithState>> {
+    ): Maybe<List<StreamWithState>> {
         return when (groupId) {
             FeedGroupEntity.GROUP_ALL_ID -> {
                 if (getPlayedStreams) feedTable.getAllStreams()

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

@@ -21,16 +21,23 @@ package org.schabi.newpipe.local.feed
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.LayerDrawable
 import android.os.Bundle
 import android.os.Parcelable
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import androidx.annotation.AttrRes
 import androidx.annotation.Nullable
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.content.res.AppCompatResources
@@ -40,9 +47,10 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
-import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.GroupieViewHolder
+import androidx.recyclerview.widget.RecyclerView
+import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.Item
+import com.xwray.groupie.OnAsyncUpdateListener
 import com.xwray.groupie.OnItemClickListener
 import com.xwray.groupie.OnItemLongClickListener
 import icepick.State
@@ -66,10 +74,12 @@ import org.schabi.newpipe.fragments.BaseStateFragment
 import org.schabi.newpipe.info_list.InfoItemDialog
 import org.schabi.newpipe.ktx.animate
 import org.schabi.newpipe.ktx.animateHideRecyclerViewAllowingScrolling
+import org.schabi.newpipe.ktx.slideUp
 import org.schabi.newpipe.local.feed.item.StreamItem
 import org.schabi.newpipe.local.feed.service.FeedLoadService
 import org.schabi.newpipe.local.subscription.SubscriptionManager
 import org.schabi.newpipe.player.helper.PlayerHolder
+import org.schabi.newpipe.util.DeviceUtils
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.StreamDialogEntry
@@ -77,6 +87,7 @@ import org.schabi.newpipe.util.ThemeHelper.getGridSpanCountStreams
 import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
 import java.time.OffsetDateTime
 import java.util.ArrayList
+import java.util.function.Consumer
 
 class FeedFragment : BaseStateFragment<FeedState>() {
     private var _feedBinding: FragmentFeedBinding? = null
@@ -91,13 +102,15 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     private var groupName = ""
     private var oldestSubscriptionUpdate: OffsetDateTime? = null
 
-    private lateinit var groupAdapter: GroupAdapter<GroupieViewHolder>
+    private lateinit var groupAdapter: GroupieAdapter
     @State @JvmField var showPlayedItems: Boolean = true
 
     private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null
     private var updateListViewModeOnResume = false
     private var isRefreshing = false
 
+    private var lastNewItemsCount = 0
+
     init {
         setHasOptionsMenu(true)
     }
@@ -127,15 +140,30 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         _feedBinding = FragmentFeedBinding.bind(rootView)
         super.onViewCreated(rootView, savedInstanceState)
 
-        val factory = FeedViewModel.Factory(requireContext(), groupId, showPlayedItems)
+        val factory = FeedViewModel.Factory(requireContext(), groupId)
         viewModel = ViewModelProvider(this, factory).get(FeedViewModel::class.java)
+        showPlayedItems = viewModel.getShowPlayedItemsFromPreferences()
         viewModel.stateLiveData.observe(viewLifecycleOwner, { it?.let(::handleResult) })
 
-        groupAdapter = GroupAdapter<GroupieViewHolder>().apply {
+        groupAdapter = GroupieAdapter().apply {
             setOnItemClickListener(listenerStreamItem)
             setOnItemLongClickListener(listenerStreamItem)
         }
 
+        feedBinding.itemsList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                // Check if we scrolled to the top
+                if (newState == RecyclerView.SCROLL_STATE_IDLE &&
+                    !recyclerView.canScrollVertically(-1)
+                ) {
+
+                    if (tryGetNewItemsLoadedButton()?.isVisible == true) {
+                        hideNewItemsLoaded(true)
+                    }
+                }
+            }
+        })
+
         feedBinding.itemsList.adapter = groupAdapter
         setupListViewMode()
     }
@@ -159,7 +187,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         }
     }
 
-    fun setupListViewMode() {
+    private fun setupListViewMode() {
         // does everything needed to setup the layouts for grid or list modes
         groupAdapter.spanCount = if (shouldUseGridLayout(context)) getGridSpanCountStreams(context) else 1
         feedBinding.itemsList.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
@@ -171,6 +199,10 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         super.initListeners()
         feedBinding.refreshRootView.setOnClickListener { reloadContent() }
         feedBinding.swipeRefreshLayout.setOnRefreshListener { reloadContent() }
+        feedBinding.newItemsLoadedButton.setOnClickListener {
+            hideNewItemsLoaded(true)
+            feedBinding.itemsList.scrollToPosition(0)
+        }
     }
 
     // /////////////////////////////////////////////////////////////////////////
@@ -214,6 +246,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
             showPlayedItems = !item.isChecked
             updateTogglePlayedItemsButton(item)
             viewModel.togglePlayedItems(showPlayedItems)
+            viewModel.saveShowPlayedItemsToPreferences(showPlayedItems)
         }
 
         return super.onOptionsItemSelected(item)
@@ -237,6 +270,9 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     }
 
     override fun onDestroyView() {
+        // Ensure that all animations are canceled
+        feedBinding.newItemsLoadedButton?.clearAnimation()
+
         feedBinding.itemsList.adapter = null
         _feedBinding = null
         super.onDestroyView()
@@ -326,9 +362,14 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         if (context == null || context.resources == null || activity == null) return
 
         val entries = ArrayList<StreamDialogEntry>()
-        if (PlayerHolder.getInstance().getType() != null) {
+        if (PlayerHolder.getInstance().isPlayerOpen) {
             entries.add(StreamDialogEntry.enqueue)
+
+            if (PlayerHolder.getInstance().queueSize > 1) {
+                entries.add(StreamDialogEntry.enqueue_next)
+            }
         }
+
         if (item.streamType == StreamType.AUDIO_STREAM) {
             entries.addAll(
                 listOf(
@@ -351,13 +392,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         }
 
         // show "mark as watched" only when watch history is enabled
-        val isWatchHistoryEnabled = PreferenceManager
-            .getDefaultSharedPreferences(context)
-            .getBoolean(getString(R.string.enable_watch_history_key), false)
-        if (item.streamType != StreamType.AUDIO_LIVE_STREAM &&
-            item.streamType != StreamType.LIVE_STREAM &&
-            isWatchHistoryEnabled
-        ) {
+        if (StreamDialogEntry.shouldAddMarkAsWatched(item.streamType, context)) {
             entries.add(
                 StreamDialogEntry.mark_as_watched
             )
@@ -400,7 +435,17 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         }
         loadedState.items.forEach { it.itemVersion = itemVersion }
 
-        groupAdapter.updateAsync(loadedState.items, false, null)
+        // This need to be saved in a variable as the update occurs async
+        val oldOldestSubscriptionUpdate = oldestSubscriptionUpdate
+
+        groupAdapter.updateAsync(
+            loadedState.items, false,
+            OnAsyncUpdateListener {
+                oldOldestSubscriptionUpdate?.run {
+                    highlightNewItemsAfter(oldOldestSubscriptionUpdate)
+                }
+            }
+        )
 
         listState?.run {
             feedBinding.itemsList.layoutManager?.onRestoreInstanceState(listState)
@@ -460,7 +505,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
                                 errors.subList(i + 1, errors.size)
                             )
                         },
-                        { throwable -> throwable.printStackTrace() }
+                        { throwable -> Log.e(TAG, "Unable to process", throwable) }
                     )
                 return // this will be called on the remaining errors by handleFeedNotAvailable()
             }
@@ -522,6 +567,125 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         )
     }
 
+    /**
+     * Highlights all items that are after the specified time
+     */
+    private fun highlightNewItemsAfter(updateTime: OffsetDateTime) {
+        var highlightCount = 0
+
+        var doCheck = true
+
+        for (i in 0 until groupAdapter.itemCount) {
+            val item = groupAdapter.getItem(i) as StreamItem
+
+            var typeface = Typeface.DEFAULT
+            var backgroundSupplier = { ctx: Context ->
+                resolveDrawable(ctx, R.attr.selectableItemBackground)
+            }
+            if (doCheck) {
+                // If the uploadDate is null or true we should highlight the item
+                if (item.streamWithState.stream.uploadDate?.isAfter(updateTime) != false) {
+                    highlightCount++
+
+                    typeface = Typeface.DEFAULT_BOLD
+                    backgroundSupplier = { ctx: Context ->
+                        // Merge the drawables together. Otherwise we would lose the "select" effect
+                        LayerDrawable(
+                            arrayOf(
+                                resolveDrawable(ctx, R.attr.dashed_border),
+                                resolveDrawable(ctx, R.attr.selectableItemBackground)
+                            )
+                        )
+                    }
+                } else {
+                    // Decreases execution time due to the order of the items (newest always on top)
+                    // Once a item is is before the updateTime we can skip all following items
+                    doCheck = false
+                }
+            }
+
+            // The highlighter has to be always set
+            // When it's only set on items that are highlighted it will highlight all items
+            // due to the fact that itemRoot is getting recycled
+            item.execBindEnd = Consumer { viewBinding ->
+                val context = viewBinding.itemRoot.context
+                viewBinding.itemRoot.background = backgroundSupplier.invoke(context)
+                viewBinding.itemVideoTitleView.typeface = typeface
+            }
+        }
+
+        // Force updates all items so that the highlighting is correct
+        // If this isn't done visible items that are already highlighted will stay in a highlighted
+        // state until the user scrolls them out of the visible area which causes a update/bind-call
+        groupAdapter.notifyItemRangeChanged(
+            0,
+            minOf(groupAdapter.itemCount, maxOf(highlightCount, lastNewItemsCount))
+        )
+
+        if (highlightCount > 0) {
+            showNewItemsLoaded()
+        }
+
+        lastNewItemsCount = highlightCount
+    }
+
+    private fun resolveDrawable(context: Context, @AttrRes attrResId: Int): Drawable? {
+        return androidx.core.content.ContextCompat.getDrawable(
+            context,
+            android.util.TypedValue().apply {
+                context.theme.resolveAttribute(
+                    attrResId,
+                    this,
+                    true
+                )
+            }.resourceId
+        )
+    }
+
+    private fun showNewItemsLoaded() {
+        tryGetNewItemsLoadedButton()?.clearAnimation()
+        tryGetNewItemsLoadedButton()
+            ?.slideUp(
+                250L,
+                delay = 100,
+                execOnEnd = {
+                    // Disabled animations would result in immediately hiding the button
+                    // after it showed up
+                    if (DeviceUtils.hasAnimationsAnimatorDurationEnabled(context)) {
+                        // Hide the new items-"popup" after 10s
+                        hideNewItemsLoaded(true, 10000)
+                    }
+                }
+            )
+    }
+
+    private fun hideNewItemsLoaded(animate: Boolean, delay: Long = 0) {
+        tryGetNewItemsLoadedButton()?.clearAnimation()
+        if (animate) {
+            tryGetNewItemsLoadedButton()?.animate(
+                false,
+                200,
+                delay = delay,
+                execOnEnd = {
+                    // Make the layout invisible so that the onScroll toTop method
+                    // only does necessary work
+                    tryGetNewItemsLoadedButton()?.isVisible = false
+                }
+            )
+        } else {
+            tryGetNewItemsLoadedButton()?.isVisible = false
+        }
+    }
+
+    /**
+     * The view/button can be disposed/set to null under certain circumstances.
+     * E.g. when the animation is still in progress but the view got destroyed.
+     * This method is a helper for such states and can be used in affected code blocks.
+     */
+    private fun tryGetNewItemsLoadedButton(): Button? {
+        return _feedBinding?.newItemsLoadedButton
+    }
+
     // /////////////////////////////////////////////////////////////////////////
     // Load Service Handling
     // /////////////////////////////////////////////////////////////////////////
@@ -529,6 +693,8 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     override fun doInitialLoadLogic() {}
 
     override fun reloadContent() {
+        hideNewItemsLoaded(false)
+
         getActivity()?.startService(
             Intent(requireContext(), FeedLoadService::class.java).apply {
                 putExtra(FeedLoadService.EXTRA_GROUP_ID, groupId)

app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt

@@ -1,15 +1,18 @@
 package org.schabi.newpipe.local.feed
 
 import android.content.Context
+import androidx.core.content.edit
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.preference.PreferenceManager
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.functions.Function4
 import io.reactivex.rxjava3.processors.BehaviorProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.stream.StreamWithState
 import org.schabi.newpipe.local.feed.item.StreamItem
@@ -23,19 +26,16 @@ import java.time.OffsetDateTime
 import java.util.concurrent.TimeUnit
 
 class FeedViewModel(
-    applicationContext: Context,
+    private val applicationContext: Context,
     groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
     initialShowPlayedItems: Boolean = true
 ) : ViewModel() {
     private var feedDatabaseManager: FeedDatabaseManager = FeedDatabaseManager(applicationContext)
 
     private val toggleShowPlayedItems = BehaviorProcessor.create<Boolean>()
-    private val streamItems = toggleShowPlayedItems
+    private val toggleShowPlayedItemsFlowable = toggleShowPlayedItems
         .startWithItem(initialShowPlayedItems)
         .distinctUntilChanged()
-        .switchMap { showPlayedItems ->
-            feedDatabaseManager.getStreams(groupId, showPlayedItems)
-        }
 
     private val mutableStateLiveData = MutableLiveData<FeedState>()
     val stateLiveData: LiveData<FeedState> = mutableStateLiveData
@@ -43,17 +43,28 @@ class FeedViewModel(
     private var combineDisposable = Flowable
         .combineLatest(
             FeedEventManager.events(),
-            streamItems,
+            toggleShowPlayedItemsFlowable,
             feedDatabaseManager.notLoadedCount(groupId),
             feedDatabaseManager.oldestSubscriptionUpdate(groupId),
 
-            Function4 { t1: FeedEventManager.Event, t2: List<StreamWithState>,
+            Function4 { t1: FeedEventManager.Event, t2: Boolean,
                 t3: Long, t4: List<OffsetDateTime> ->
-                return@Function4 CombineResultHolder(t1, t2, t3, t4.firstOrNull())
+                return@Function4 CombineResultEventHolder(t1, t2, t3, t4.firstOrNull())
             }
         )
         .throttleLatest(DEFAULT_THROTTLE_TIMEOUT, TimeUnit.MILLISECONDS)
         .subscribeOn(Schedulers.io())
+        .observeOn(Schedulers.io())
+        .map { (event, showPlayedItems, notLoadedCount, oldestUpdate) ->
+            var streamItems = if (event is SuccessResultEvent || event is IdleEvent)
+                feedDatabaseManager
+                    .getStreams(groupId, showPlayedItems)
+                    .blockingGet(arrayListOf())
+            else
+                arrayListOf()
+
+            CombineResultDataHolder(event, streamItems, notLoadedCount, oldestUpdate)
+        }
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe { (event, listFromDB, notLoadedCount, oldestUpdate) ->
             mutableStateLiveData.postValue(
@@ -75,20 +86,50 @@ class FeedViewModel(
         combineDisposable.dispose()
     }
 
-    private data class CombineResultHolder(val t1: FeedEventManager.Event, val t2: List<StreamWithState>, val t3: Long, val t4: OffsetDateTime?)
+    private data class CombineResultEventHolder(
+        val t1: FeedEventManager.Event,
+        val t2: Boolean,
+        val t3: Long,
+        val t4: OffsetDateTime?
+    )
+
+    private data class CombineResultDataHolder(
+        val t1: FeedEventManager.Event,
+        val t2: List<StreamWithState>,
+        val t3: Long,
+        val t4: OffsetDateTime?
+    )
 
     fun togglePlayedItems(showPlayedItems: Boolean) {
         toggleShowPlayedItems.onNext(showPlayedItems)
     }
 
+    fun saveShowPlayedItemsToPreferences(showPlayedItems: Boolean) =
+        PreferenceManager.getDefaultSharedPreferences(applicationContext).edit {
+            this.putBoolean(applicationContext.getString(R.string.feed_show_played_items_key), showPlayedItems)
+            this.apply()
+        }
+
+    fun getShowPlayedItemsFromPreferences() = getShowPlayedItemsFromPreferences(applicationContext)
+
+    companion object {
+        private fun getShowPlayedItemsFromPreferences(context: Context) =
+            PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.feed_show_played_items_key), true)
+    }
+
     class Factory(
         private val context: Context,
-        private val groupId: Long = FeedGroupEntity.GROUP_ALL_ID,
-        private val showPlayedItems: Boolean
+        private val groupId: Long = FeedGroupEntity.GROUP_ALL_ID
     ) : ViewModelProvider.Factory {
         @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-            return FeedViewModel(context.applicationContext, groupId, showPlayedItems) as T
+            return FeedViewModel(
+                context.applicationContext,
+                groupId,
+                // Read initial value from preferences
+                getShowPlayedItemsFromPreferences(context.applicationContext)
+            ) as T
         }
     }
 }

app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt

@@ -17,7 +17,9 @@ import org.schabi.newpipe.extractor.stream.StreamType.LIVE_STREAM
 import org.schabi.newpipe.extractor.stream.StreamType.VIDEO_STREAM
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.PicassoHelper
+import org.schabi.newpipe.util.StreamTypeUtil
 import java.util.concurrent.TimeUnit
+import java.util.function.Consumer
 
 data class StreamItem(
     val streamWithState: StreamWithState,
@@ -30,6 +32,12 @@ data class StreamItem(
     private val stream: StreamEntity = streamWithState.stream
     private val stateProgressTime: Long? = streamWithState.stateProgressMillis
 
+    /**
+     * Will be executed at the end of the [StreamItem.bind] (with (ListStreamItemBinding,Int)).
+     * Can be used e.g. for highlighting a item.
+     */
+    var execBindEnd: Consumer<ListStreamItemBinding>? = null
+
     override fun getId(): Long = stream.uid
 
     enum class ItemVersion { NORMAL, MINI, GRID }
@@ -58,8 +66,6 @@ data class StreamItem(
         viewBinding.itemVideoTitleView.text = stream.title
         viewBinding.itemUploaderView.text = stream.uploader
 
-        val isLiveStream = stream.streamType == LIVE_STREAM || stream.streamType == AUDIO_LIVE_STREAM
-
         if (stream.duration > 0) {
             viewBinding.itemDurationView.text = Localization.getDurationString(stream.duration)
             viewBinding.itemDurationView.setBackgroundColor(
@@ -77,7 +83,7 @@ data class StreamItem(
             } else {
                 viewBinding.itemProgressView.visibility = View.GONE
             }
-        } else if (isLiveStream) {
+        } else if (StreamTypeUtil.isLiveStream(stream.streamType)) {
             viewBinding.itemDurationView.setText(R.string.duration_live)
             viewBinding.itemDurationView.setBackgroundColor(
                 ContextCompat.getColor(
@@ -98,6 +104,8 @@ data class StreamItem(
             viewBinding.itemAdditionalDetails.text =
                 getStreamInfoDetailLine(viewBinding.itemAdditionalDetails.context)
         }
+
+        execBindEnd?.accept(viewBinding)
     }
 
     override fun isLongClickable() = when (stream.streamType) {

app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java

@@ -120,19 +120,11 @@ public class HistoryRecordManager {
             }
 
             // Update the stream progress to the full duration of the video
-            final List<StreamStateEntity> states = streamStateTable.getState(streamId)
-                    .blockingFirst();
-            if (!states.isEmpty()) {
-                final StreamStateEntity entity = states.get(0);
-                entity.setProgressMillis(duration * 1000);
-                streamStateTable.update(entity);
-            } else {
-                final StreamStateEntity entity = new StreamStateEntity(
-                        streamId,
-                        duration * 1000
-                );
-                streamStateTable.insert(entity);
-            }
+            final StreamStateEntity entity = new StreamStateEntity(
+                    streamId,
+                    duration * 1000
+            );
+            streamStateTable.upsert(entity);
 
             // Add a history entry
             final StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry(streamId);
@@ -334,9 +326,9 @@ public class HistoryRecordManager {
                         .getState(entities.get(0).getUid()).blockingFirst();
                 if (states.isEmpty()) {
                     result.add(null);
-                    continue;
+                } else {
+                    result.add(states.get(0));
                 }
-                result.add(states.get(0));
             }
             return result;
         }).subscribeOn(Schedulers.io());
@@ -362,9 +354,9 @@ public class HistoryRecordManager {
                         .blockingFirst();
                 if (states.isEmpty()) {
                     result.add(null);
-                    continue;
+                } else {
+                    result.add(states.get(0));
                 }
-                result.add(states.get(0));
             }
             return result;
         }).subscribeOn(Schedulers.io());

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -101,9 +101,9 @@ public class StatisticsPlaylistFragment
     }
 
     @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (activity != null && isVisibleToUser) {
+    public void onResume() {
+        super.onResume();
+        if (activity != null) {
             setTitle(activity.getString(R.string.title_activity_history));
         }
     }
@@ -338,9 +338,14 @@ public class StatisticsPlaylistFragment
 
         final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
 
-        if (PlayerHolder.getInstance().getType() != null) {
+        if (PlayerHolder.getInstance().isPlayerOpen()) {
             entries.add(StreamDialogEntry.enqueue);
+
+            if (PlayerHolder.getInstance().getQueueSize() > 1) {
+                entries.add(StreamDialogEntry.enqueue_next);
+            }
         }
+
         if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
             entries.addAll(Arrays.asList(
                     StreamDialogEntry.start_here_on_background,
@@ -361,6 +366,16 @@ public class StatisticsPlaylistFragment
         if (KoreUtils.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
+
+        // show "mark as watched" only when watch history is enabled
+        if (StreamDialogEntry.shouldAddMarkAsWatched(
+                item.getStreamEntity().getStreamType(),
+                context
+        )) {
+            entries.add(
+                    StreamDialogEntry.mark_as_watched
+            );
+        }
         entries.add(StreamDialogEntry.show_channel_details);
 
         StreamDialogEntry.setEnabledEntries(entries);

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

@@ -42,6 +42,7 @@ import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.local.BaseLocalListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
@@ -493,12 +494,12 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                 NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
         playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.POPUP);
             return true;
         });
 
         playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
-            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.AUDIO);
             return true;
         });
 
@@ -708,8 +709,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                     return false;
                 }
 
-                final int sourceIndex = source.getAdapterPosition();
-                final int targetIndex = target.getAdapterPosition();
+                final int sourceIndex = source.getBindingAdapterPosition();
+                final int targetIndex = target.getBindingAdapterPosition();
                 final boolean isSwapped = itemListAdapter.swapItems(sourceIndex, targetIndex);
                 if (isSwapped) {
                     saveChanges();
@@ -752,8 +753,12 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
         final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
 
-        if (PlayerHolder.getInstance().getType() != null) {
+        if (PlayerHolder.getInstance().isPlayerOpen()) {
             entries.add(StreamDialogEntry.enqueue);
+
+            if (PlayerHolder.getInstance().getQueueSize() > 1) {
+                entries.add(StreamDialogEntry.enqueue_next);
+            }
         }
         if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) {
             entries.addAll(Arrays.asList(
@@ -777,6 +782,16 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         if (KoreUtils.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
             entries.add(StreamDialogEntry.play_with_kodi);
         }
+
+        // show "mark as watched" only when watch history is enabled
+        if (StreamDialogEntry.shouldAddMarkAsWatched(
+                item.getStreamEntity().getStreamType(),
+                context
+        )) {
+            entries.add(
+                    StreamDialogEntry.mark_as_watched
+            );
+        }
         entries.add(StreamDialogEntry.show_channel_details);
 
         StreamDialogEntry.setEnabledEntries(entries);

app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt

@@ -22,7 +22,7 @@ enum class FeedGroupIcon(
     COMPUTER(5, R.drawable.ic_computer),
     GAMING(6, R.drawable.ic_videogame_asset),
     SPORTS(7, R.drawable.ic_directions_bike),
-    NEWS(8, R.drawable.ic_megaphone),
+    NEWS(8, R.drawable.ic_campaign),
     FAVORITES(9, R.drawable.ic_favorite),
     CAR(10, R.drawable.ic_directions_car),
     MOTORCYCLE(11, R.drawable.ic_motorcycle),

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

@@ -97,11 +97,9 @@ public class SubscriptionsImportFragment extends BaseFragment {
     }
 
     @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser) {
-            setTitle(getString(R.string.import_title));
-        }
+    public void onResume() {
+        super.onResume();
+        setTitle(getString(R.string.import_title));
     }
 
     @Nullable

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt

@@ -21,8 +21,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.GroupieViewHolder
+import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.OnItemClickListener
 import com.xwray.groupie.Section
 import icepick.Icepick
@@ -78,7 +77,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
     private val subscriptionMainSection = Section()
     private val subscriptionEmptyFooter = Section()
-    private lateinit var subscriptionGroupAdapter: GroupAdapter<GroupieViewHolder>
+    private lateinit var subscriptionGroupAdapter: GroupieAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -153,7 +152,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
             }
         }
 
-        subscriptionGroupAdapter = GroupAdapter<GroupieViewHolder>().apply {
+        subscriptionGroupAdapter = GroupieAdapter().apply {
             add(subscriptionMainSection)
             add(subscriptionEmptyFooter)
             spanCount = 4
@@ -379,7 +378,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
     }
 
     private fun setupIconPicker() {
-        val groupAdapter = GroupAdapter<GroupieViewHolder>()
+        val groupAdapter = GroupieAdapter()
         groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(it) })
 
         feedGroupCreateBinding.iconSelector.apply {

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt

@@ -11,8 +11,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.xwray.groupie.GroupAdapter
-import com.xwray.groupie.GroupieViewHolder
+import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.TouchCallback
 import icepick.Icepick
 import icepick.State
@@ -38,7 +37,7 @@ class FeedGroupReorderDialog : DialogFragment() {
     @State
     @JvmField
     var groupOrderedIdList = ArrayList<Long>()
-    private val groupAdapter = GroupAdapter<GroupieViewHolder>()
+    private val groupAdapter = GroupieAdapter()
     private val itemTouchHelper = ItemTouchHelper(getItemTouchCallback())
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -113,8 +112,8 @@ class FeedGroupReorderDialog : DialogFragment() {
                 source: RecyclerView.ViewHolder,
                 target: RecyclerView.ViewHolder
             ): Boolean {
-                val sourceIndex = source.adapterPosition
-                val targetIndex = target.adapterPosition
+                val sourceIndex = source.bindingAdapterPosition
+                val targetIndex = target.bindingAdapterPosition
 
                 groupAdapter.notifyItemMoved(sourceIndex, targetIndex)
                 Collections.swap(groupOrderedIdList, sourceIndex, targetIndex)

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

@@ -23,11 +23,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.exoplayer2.PlaybackParameters;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ActivityPlayerQueueControlBinding;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.event.PlayerEventListener;
 import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -43,6 +43,7 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
@@ -452,12 +453,12 @@ public final class PlayQueueActivity extends AppCompatActivity
         }
     }
 
-    private void openPlaylistAppendDialog(final List<PlayQueueItem> playlist) {
-        final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(playlist);
-
-        PlaylistAppendDialog.onPlaylistFound(getApplicationContext(),
-            () -> d.show(getSupportFragmentManager(), TAG),
-            () -> PlaylistCreationDialog.newInstance(d).show(getSupportFragmentManager(), TAG));
+    private void openPlaylistAppendDialog(final List<PlayQueueItem> playQueueItems) {
+        PlaylistDialog.createCorrespondingDialog(
+                getApplicationContext(),
+                playQueueItems.stream().map(StreamEntity::new).collect(Collectors.toList()),
+                dialog -> dialog.show(getSupportFragmentManager(), TAG)
+        );
     }
 
     ////////////////////////////////////////////////////////////////////////////

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

@@ -1,5 +1,54 @@
 package org.schabi.newpipe.player;
 
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_AUTO_TRANSITION;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_REMOVE;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SKIP;
+import static com.google.android.exoplayer2.Player.DiscontinuityReason;
+import static com.google.android.exoplayer2.Player.Listener;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
+import static com.google.android.exoplayer2.Player.RepeatMode;
+import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
+import static org.schabi.newpipe.extractor.ServiceList.YouTube;
+import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_CLOSE;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PAUSE;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_REPEAT;
+import static org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
+import static org.schabi.newpipe.player.helper.PlayerHelper.buildCloseOverlayLayoutParams;
+import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getMinimizeOnExitAction;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getMinimumVideoHeight;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
+import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
+import static org.schabi.newpipe.player.helper.PlayerHelper.isPlaybackResumeEnabled;
+import static org.schabi.newpipe.player.helper.PlayerHelper.nextRepeatMode;
+import static org.schabi.newpipe.player.helper.PlayerHelper.nextResizeModeAndSaveToPrefs;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePlaybackParametersFromPrefs;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePlayerTypeFromIntent;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePopupLayoutParamsFromPrefs;
+import static org.schabi.newpipe.player.helper.PlayerHelper.retrieveSeekDurationFromPreferences;
+import static org.schabi.newpipe.player.helper.PlayerHelper.savePlaybackParametersToPrefs;
+import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
+import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import static org.schabi.newpipe.util.Localization.containsCaseInsensitive;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
@@ -48,7 +97,6 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -68,6 +116,7 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player.PositionInfo;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
@@ -75,13 +124,14 @@ import com.google.android.exoplayer2.source.BehindLiveWindowException;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.text.CaptionStyleCompat;
+import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.ui.CaptionStyleCompat;
 import com.google.android.exoplayer2.ui.SubtitleView;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.util.Util;
-import com.google.android.exoplayer2.video.VideoListener;
+import com.google.android.exoplayer2.video.VideoSize;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;
@@ -94,7 +144,6 @@ import org.schabi.newpipe.databinding.PlayerPopupCloseOverlayBinding;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamSegment;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
@@ -116,6 +165,7 @@ import org.schabi.newpipe.player.playback.MediaSourceManager;
 import org.schabi.newpipe.player.playback.PlaybackListener;
 import org.schabi.newpipe.player.playback.PlayerMediaSession;
 import org.schabi.newpipe.player.playback.SurfaceHolderCallback;
+import org.schabi.newpipe.player.playererror.PlayerErrorHandler;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -128,11 +178,12 @@ import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper;
 import org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHolder;
 import org.schabi.newpipe.util.DeviceUtils;
-import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.SerializedCache;
+import org.schabi.newpipe.util.StreamTypeUtil;
+import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.views.ExpandableSurfaceView;
 
@@ -140,6 +191,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
@@ -147,58 +199,9 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.disposables.SerialDisposable;
 
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_AD_INSERTION;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
-import static com.google.android.exoplayer2.Player.DiscontinuityReason;
-import static com.google.android.exoplayer2.Player.EventListener;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
-import static com.google.android.exoplayer2.Player.RepeatMode;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
-import static org.schabi.newpipe.extractor.ServiceList.YouTube;
-import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_CLOSE;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PAUSE;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_REPEAT;
-import static org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
-import static org.schabi.newpipe.player.helper.PlayerHelper.buildCloseOverlayLayoutParams;
-import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.player.helper.PlayerHelper.getMinimizeOnExitAction;
-import static org.schabi.newpipe.player.helper.PlayerHelper.getMinimumVideoHeight;
-import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
-import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
-import static org.schabi.newpipe.player.helper.PlayerHelper.isPlaybackResumeEnabled;
-import static org.schabi.newpipe.player.helper.PlayerHelper.nextRepeatMode;
-import static org.schabi.newpipe.player.helper.PlayerHelper.nextResizeModeAndSaveToPrefs;
-import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePlaybackParametersFromPrefs;
-import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePlayerTypeFromIntent;
-import static org.schabi.newpipe.player.helper.PlayerHelper.retrievePopupLayoutParamsFromPrefs;
-import static org.schabi.newpipe.player.helper.PlayerHelper.retrieveSeekDurationFromPreferences;
-import static org.schabi.newpipe.player.helper.PlayerHelper.savePlaybackParametersToPrefs;
-import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
-import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-import static org.schabi.newpipe.util.Localization.containsCaseInsensitive;
-
 public final class Player implements
-        EventListener,
         PlaybackListener,
-        VideoListener,
+        Listener,
         SeekBar.OnSeekBarChangeListener,
         View.OnClickListener,
         PopupMenu.OnMenuItemClickListener,
@@ -226,10 +229,10 @@ public final class Player implements
     public static final String REPEAT_MODE = "repeat_mode";
     public static final String PLAYBACK_QUALITY = "playback_quality";
     public static final String PLAY_QUEUE_KEY = "play_queue_key";
-    public static final String APPEND_ONLY = "append_only";
+    public static final String ENQUEUE = "enqueue";
+    public static final String ENQUEUE_NEXT = "enqueue_next";
     public static final String RESUME_PLAYBACK = "resume_playback";
     public static final String PLAY_WHEN_READY = "play_when_ready";
-    public static final String SELECT_ON_APPEND = "select_on_append";
     public static final String PLAYER_TYPE = "player_type";
     public static final String IS_MUTED = "is_muted";
 
@@ -265,7 +268,7 @@ public final class Player implements
     @Nullable private MediaSourceTag currentMetadata;
     @Nullable private Bitmap currentThumbnail;
 
-    @Nullable private Toast errorToast;
+    @NonNull private PlayerErrorHandler playerErrorHandler;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Player
@@ -410,6 +413,8 @@ public final class Player implements
         videoResolver = new VideoPlaybackResolver(context, dataSource, getQualityResolver());
         audioResolver = new AudioPlaybackResolver(context, dataSource);
 
+        playerErrorHandler = new PlayerErrorHandler(context);
+
         windowManager = ContextCompat.getSystemService(context, WindowManager.class);
     }
 
@@ -500,10 +505,6 @@ public final class Player implements
 
         // Setup video view
         setupVideoSurface();
-        simpleExoPlayer.addVideoListener(this);
-
-        // Setup subtitle view
-        simpleExoPlayer.addTextOutput(binding.subtitleView);
 
         // enable media tunneling
         if (DEBUG && PreferenceManager.getDefaultSharedPreferences(context)
@@ -512,7 +513,7 @@ public final class Player implements
                     + "media tunneling disabled in debug preferences");
         } else if (DeviceUtils.shouldSupportMediaTunneling()) {
             trackSelector.setParameters(trackSelector.buildUponParameters()
-                    .setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context)));
+                    .setTunnelingEnabled(true));
         } else if (DEBUG) {
             Log.d(TAG, "[" + Util.DEVICE_DEBUG_INFO + "] does not support media tunneling");
         }
@@ -608,16 +609,16 @@ public final class Player implements
             setPlaybackQuality(intent.getStringExtra(PLAYBACK_QUALITY));
         }
 
-        // Resolve append intents
-        if (intent.getBooleanExtra(APPEND_ONLY, false) && playQueue != null) {
-            final int sizeBeforeAppend = playQueue.size();
+        // Resolve enqueue intents
+        if (intent.getBooleanExtra(ENQUEUE, false) && playQueue != null) {
             playQueue.append(newQueue.getStreams());
+            return;
 
-            if ((intent.getBooleanExtra(SELECT_ON_APPEND, false)
-                    || currentState == STATE_COMPLETED) && !newQueue.getStreams().isEmpty()) {
-                playQueue.setIndex(sizeBeforeAppend);
-            }
-
+        // Resolve enqueue next intents
+        } else if (intent.getBooleanExtra(ENQUEUE_NEXT, false) && playQueue != null) {
+            final int currentIndex = playQueue.getIndex();
+            playQueue.append(newQueue.getStreams());
+            playQueue.move(playQueue.size() - 1, currentIndex + 1);
             return;
         }
 
@@ -694,7 +695,7 @@ public final class Player implements
                             },
                             error -> {
                                 if (DEBUG) {
-                                    error.printStackTrace();
+                                    Log.w(TAG, "Failed to start playback", error);
                                 }
                                 // In case any error we can start playback without history
                                 initPlayback(newQueue, repeatMode, playbackSpeed, playbackPitch,
@@ -773,6 +774,8 @@ public final class Player implements
         destroyPlayer();
         initPlayer(playOnReady);
         setRepeatMode(repeatMode);
+        // #6825 - Ensure that the shuffle-button is in the correct state on the UI
+        setShuffleButton(binding.shuffleButton, simpleExoPlayer.getShuffleModeEnabled());
         setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);
 
         playQueue = queue;
@@ -806,7 +809,6 @@ public final class Player implements
 
         if (!exoPlayerIsNull()) {
             simpleExoPlayer.removeListener(this);
-            simpleExoPlayer.removeVideoListener(this);
             simpleExoPlayer.stop();
             simpleExoPlayer.release();
         }
@@ -857,10 +859,10 @@ public final class Player implements
 
         final int queuePos = playQueue.getIndex();
         final long windowPos = simpleExoPlayer.getCurrentPosition();
+        final long duration = simpleExoPlayer.getDuration();
 
-        if (windowPos > 0 && windowPos <= simpleExoPlayer.getDuration()) {
-            setRecovery(queuePos, windowPos);
-        }
+        // No checks due to https://github.com/TeamNewPipe/NewPipe/pull/7195#issuecomment-962624380
+        setRecovery(queuePos, Math.max(0, Math.min(windowPos, duration)));
     }
 
     private void setRecovery(final int queuePos, final long windowPos) {
@@ -895,7 +897,7 @@ public final class Player implements
 
     public void smoothStopPlayer() {
         // Pausing would make transition from one stream to a new stream not smooth, so only stop
-        simpleExoPlayer.stop(false);
+        simpleExoPlayer.stop();
     }
     //endregion
 
@@ -1596,10 +1598,7 @@ public final class Player implements
             setVideoDurationToControls(duration);
         }
         if (currentState != STATE_PAUSED) {
-            if (currentState != STATE_PAUSED_SEEK) {
-                binding.playbackSeekBar.setProgress(currentProgress);
-            }
-            binding.playbackCurrentTime.setText(getTimeString(currentProgress));
+            updatePlayBackElementsCurrentDuration(currentProgress);
         }
         if (simpleExoPlayer.isLoading() || bufferPercent > 90) {
             binding.playbackSeekBar.setSecondaryProgress(
@@ -1622,12 +1621,6 @@ public final class Player implements
         if (isQueueVisible) {
             updateQueueTime(currentProgress);
         }
-
-        final boolean showThumbnail = prefs.getBoolean(
-                context.getString(R.string.show_thumbnail_key), true);
-        // setMetadata only updates the metadata when any of the metadata keys are null
-        mediaSessionManager.setMetadata(getVideoTitle(), getUploaderName(),
-                showThumbnail ? getThumbnail() : null, duration);
     }
 
     private void startProgressLoop() {
@@ -1652,10 +1645,10 @@ public final class Player implements
         // TODO: revert #6307 when introducing proper HLS support
         final int duration;
         if (currentItem != null
-                && currentItem.getStreamType() != StreamType.AUDIO_LIVE_STREAM
-                && currentItem.getStreamType() != StreamType.LIVE_STREAM) {
+                && !StreamTypeUtil.isLiveStream(currentItem.getStreamType())
+        ) {
             // convert seconds to milliseconds
-            duration =  (int) (currentItem.getDuration() * 1000);
+            duration = (int) (currentItem.getDuration() * 1000);
         } else {
             duration = (int) simpleExoPlayer.getDuration();
         }
@@ -2253,6 +2246,9 @@ public final class Player implements
             stopProgressLoop();
         }
 
+        // When a (short) video ends the elements have to display the correct values - see #6180
+        updatePlayBackElementsCurrentDuration(binding.playbackSeekBar.getMax());
+
         showControls(500);
         animate(binding.currentDisplaySeek, false, 200, AnimationType.SCALE_AND_ALPHA);
         binding.loadingPanel.setVisibility(View.GONE);
@@ -2440,7 +2436,9 @@ public final class Player implements
     }
 
     @Override
-    public void onPositionDiscontinuity(@DiscontinuityReason final int discontinuityReason) {
+    public void onPositionDiscontinuity(
+            final PositionInfo oldPosition, final PositionInfo newPosition,
+            @DiscontinuityReason final int discontinuityReason) {
         if (DEBUG) {
             Log.d(TAG, "ExoPlayer - onPositionDiscontinuity() called with "
                     + "discontinuityReason = [" + discontinuityReason + "]");
@@ -2452,7 +2450,8 @@ public final class Player implements
         // Refresh the playback if there is a transition to the next video
         final int newWindowIndex = simpleExoPlayer.getCurrentWindowIndex();
         switch (discontinuityReason) {
-            case DISCONTINUITY_REASON_PERIOD_TRANSITION:
+            case DISCONTINUITY_REASON_AUTO_TRANSITION:
+            case DISCONTINUITY_REASON_REMOVE:
                 // When player is in single repeat mode and a period transition occurs,
                 // we need to register a view count here since no metadata has changed
                 if (getRepeatMode() == REPEAT_MODE_ONE && newWindowIndex == playQueue.getIndex()) {
@@ -2473,7 +2472,7 @@ public final class Player implements
                     playQueue.setIndex(newWindowIndex);
                 }
                 break;
-            case DISCONTINUITY_REASON_AD_INSERTION:
+            case DISCONTINUITY_REASON_SKIP:
                 break; // only makes Android Studio linter happy, as there are no ads
         }
 
@@ -2485,6 +2484,11 @@ public final class Player implements
         //TODO check if this causes black screen when switching to fullscreen
         animate(binding.surfaceForeground, false, DEFAULT_CONTROLS_DURATION);
     }
+
+    @Override
+    public void onCues(final List<Cue> cues) {
+        binding.subtitleView.onCues(cues);
+    }
     //endregion
 
 
@@ -2506,34 +2510,37 @@ public final class Player implements
      * </ul>
      *
      * @see #processSourceError(IOException)
-     * @see com.google.android.exoplayer2.Player.EventListener#onPlayerError(ExoPlaybackException)
+     * @see com.google.android.exoplayer2.Player.Listener#onPlayerError(ExoPlaybackException)
      */
     @Override
     public void onPlayerError(@NonNull final ExoPlaybackException error) {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onPlayerError() called with: " + "error = [" + error + "]");
-        }
-        if (errorToast != null) {
-            errorToast.cancel();
-            errorToast = null;
-        }
+        Log.e(TAG, "ExoPlayer - onPlayerError() called with:", error);
 
         saveStreamProgressState();
 
         switch (error.type) {
             case ExoPlaybackException.TYPE_SOURCE:
                 processSourceError(error.getSourceException());
-                showStreamError(error);
+                playerErrorHandler.showPlayerError(
+                        error,
+                        currentMetadata.getMetadata(),
+                        R.string.player_stream_failure);
                 break;
             case ExoPlaybackException.TYPE_UNEXPECTED:
-                showRecoverableError(error);
+                playerErrorHandler.showPlayerError(
+                        error,
+                        currentMetadata.getMetadata(),
+                        R.string.player_recoverable_failure);
                 setRecovery();
                 reloadPlayQueueManager();
                 break;
             case ExoPlaybackException.TYPE_REMOTE:
             case ExoPlaybackException.TYPE_RENDERER:
             default:
-                showUnrecoverableError(error);
+                playerErrorHandler.showPlayerError(
+                        error,
+                        currentMetadata.getMetadata(),
+                        R.string.player_unrecoverable_failure);
                 onPlaybackShutdown();
                 break;
         }
@@ -2555,37 +2562,6 @@ public final class Player implements
             playQueue.error();
         }
     }
-
-    private void showStreamError(final Exception exception) {
-        exception.printStackTrace();
-
-        if (errorToast == null) {
-            errorToast = Toast
-                    .makeText(context, R.string.player_stream_failure, Toast.LENGTH_SHORT);
-            errorToast.show();
-        }
-    }
-
-    private void showRecoverableError(final Exception exception) {
-        exception.printStackTrace();
-
-        if (errorToast == null) {
-            errorToast = Toast
-                    .makeText(context, R.string.player_recoverable_failure, Toast.LENGTH_SHORT);
-            errorToast.show();
-        }
-    }
-
-    private void showUnrecoverableError(final Exception exception) {
-        exception.printStackTrace();
-
-        if (errorToast != null) {
-            errorToast.cancel();
-        }
-        errorToast = Toast
-                .makeText(context, R.string.player_unrecoverable_failure, Toast.LENGTH_SHORT);
-        errorToast.show();
-    }
     //endregion
 
 
@@ -2595,6 +2571,18 @@ public final class Player implements
     //////////////////////////////////////////////////////////////////////////*/
     //region Playback position and seek
 
+    /**
+     * Sets the current duration into the corresponding elements.
+     * @param currentProgress
+     */
+    private void updatePlayBackElementsCurrentDuration(final int currentProgress) {
+        // Don't set seekbar progress while user is seeking
+        if (currentState != STATE_PAUSED_SEEK) {
+            binding.playbackSeekBar.setProgress(currentProgress);
+        }
+        binding.playbackCurrentTime.setText(getTimeString(currentProgress));
+    }
+
     @Override // own playback listener (this is a getter)
     public boolean isApproachingPlaybackEdge(final long timeToEndMillis) {
         // If live, then not near playback edge
@@ -2946,6 +2934,18 @@ public final class Player implements
                 tag.getMetadata().getPreviewFrames());
 
         NotificationUtil.getInstance().createNotificationIfNeededAndUpdate(this, false);
+
+        final boolean showThumbnail = prefs.getBoolean(
+                context.getString(R.string.show_thumbnail_key), true);
+        mediaSessionManager.setMetadata(
+                getVideoTitle(),
+                getUploaderName(),
+                showThumbnail ? Optional.ofNullable(getThumbnail()) : Optional.empty(),
+                StreamTypeUtil.isLiveStream(tag.getMetadata().getStreamType())
+                        ? -1
+                        : tag.getMetadata().getDuration()
+        );
+
         notifyMetadataUpdateToListeners();
 
         if (areSegmentsVisible) {
@@ -3023,9 +3023,11 @@ public final class Player implements
 
     @Nullable
     public Bitmap getThumbnail() {
-        return currentThumbnail == null
-                ? BitmapFactory.decodeResource(context.getResources(), R.drawable.dummy_thumbnail)
-                : currentThumbnail;
+        if (currentThumbnail == null) {
+            currentThumbnail = BitmapFactory.decodeResource(
+                    context.getResources(), R.drawable.dummy_thumbnail);
+        }
+        return currentThumbnail;
     }
     //endregion
 
@@ -3844,19 +3846,17 @@ public final class Player implements
     }
 
     @Override // exoplayer listener
-    public void onVideoSizeChanged(final int width, final int height,
-                                   final int unappliedRotationDegrees,
-                                   final float pixelWidthHeightRatio) {
+    public void onVideoSizeChanged(final VideoSize videoSize) {
         if (DEBUG) {
             Log.d(TAG, "onVideoSizeChanged() called with: "
-                    + "width / height = [" + width + " / " + height
-                    + " = " + (((float) width) / height) + "], "
-                    + "unappliedRotationDegrees = [" + unappliedRotationDegrees + "], "
-                    + "pixelWidthHeightRatio = [" + pixelWidthHeightRatio + "]");
+                    + "width / height = [" + videoSize.width + " / " + videoSize.height
+                    + " = " + (((float) videoSize.width) / videoSize.height) + "], "
+                    + "unappliedRotationDegrees = [" + videoSize.unappliedRotationDegrees + "], "
+                    + "pixelWidthHeightRatio = [" + videoSize.pixelWidthHeightRatio + "]");
         }
 
-        binding.surfaceView.setAspectRatio(((float) width) / height);
-        isVerticalVideo = width < height;
+        binding.surfaceView.setAspectRatio(((float) videoSize.width) / videoSize.height);
+        isVerticalVideo = videoSize.width < videoSize.height;
 
         if (globalScreenOrientationLocked(context)
                 && isFullscreen
@@ -4161,8 +4161,7 @@ public final class Player implements
         } catch (@NonNull final IndexOutOfBoundsException e) {
             // Why would this even happen =(... but lets log it anyway, better safe than sorry
             if (DEBUG) {
-                Log.d(TAG, "player.isCurrentWindowDynamic() failed: " + e.getMessage());
-                e.printStackTrace();
+                Log.d(TAG, "player.isCurrentWindowDynamic() failed: ", e);
             }
             return false;
         }

app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java

@@ -69,26 +69,18 @@ public class PlayerGestureListener
         if (DEBUG) {
             Log.d(TAG, "onSingleTap called with playerType = [" + player.getPlayerType() + "]");
         }
-        if (playerType == MainPlayer.PlayerType.POPUP) {
 
-            if (player.isControlsVisible()) {
-                player.hideControls(100, 100);
-            } else {
-                player.getPlayPauseButton().requestFocus();
-                player.showControlsThenHide();
-            }
+        if (player.isControlsVisible()) {
+            player.hideControls(150, 0);
+            return;
+        }
+        // -- Controls are not visible --
 
-        } else /* playerType == MainPlayer.PlayerType.VIDEO */ {
-
-            if (player.isControlsVisible()) {
-                player.hideControls(150, 0);
-            } else {
-                if (player.getCurrentState() == Player.STATE_COMPLETED) {
-                    player.showControls(0);
-                } else {
-                    player.showControlsThenHide();
-                }
-            }
+        // When player is completed show controls and don't hide them later
+        if (player.getCurrentState() == Player.STATE_COMPLETED) {
+            player.showControls(0);
+        } else {
+            player.showControlsThenHide();
         }
     }
 
@@ -103,6 +95,8 @@ public class PlayerGestureListener
                 + player.getPlayerType() + "], portion = [" + portion + "]");
         }
         if (playerType == MainPlayer.PlayerType.VIDEO) {
+
+            // -- Brightness and Volume control --
             final boolean isBrightnessGestureEnabled =
                 PlayerHelper.isBrightnessGestureEnabled(service);
             final boolean isVolumeGestureEnabled = PlayerHelper.isVolumeGestureEnabled(service);
@@ -121,15 +115,14 @@ public class PlayerGestureListener
             }
 
         } else /* MainPlayer.PlayerType.POPUP */ {
+
+            // -- Determine if the ClosingOverlayView (red X) has to be shown or hidden --
             final View closingOverlayView = player.getClosingOverlayView();
-            if (player.isInsideClosingRadius(movingEvent)) {
-                if (closingOverlayView.getVisibility() == View.GONE) {
-                    animate(closingOverlayView, true, 200);
-                }
-            } else {
-                if (closingOverlayView.getVisibility() == View.VISIBLE) {
-                    animate(closingOverlayView, false, 200);
-                }
+            final boolean showClosingOverlayView = player.isInsideClosingRadius(movingEvent);
+            // Check if an view is in expected state and if not animate it into the correct state
+            final int expectedVisibility = showClosingOverlayView ? View.VISIBLE : View.GONE;
+            if (closingOverlayView.getVisibility() != expectedVisibility) {
+                animate(closingOverlayView, showClosingOverlayView, 200);
             }
         }
     }
@@ -210,11 +203,12 @@ public class PlayerGestureListener
             Log.d(TAG, "onScrollEnd called with playerType = ["
                 + player.getPlayerType() + "]");
         }
-        if (playerType == MainPlayer.PlayerType.VIDEO) {
-            if (DEBUG) {
-                Log.d(TAG, "onScrollEnd() called");
-            }
 
+        if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
+            player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+        }
+
+        if (playerType == MainPlayer.PlayerType.VIDEO) {
             if (player.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
                 animate(player.getVolumeRelativeLayout(), false, 200, SCALE_AND_ALPHA,
                         200);
@@ -223,15 +217,7 @@ public class PlayerGestureListener
                 animate(player.getBrightnessRelativeLayout(), false, 200, SCALE_AND_ALPHA,
                         200);
             }
-
-            if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
-                player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
-            }
-        } else {
-            if (player.isControlsVisible() && player.getCurrentState() == STATE_PLAYING) {
-                player.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
-            }
-
+        } else /* Popup-Player */ {
             if (player.isInsideClosingRadius(event)) {
                 player.closePopup();
             } else if (!player.isPopupClosing()) {

app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java

@@ -16,7 +16,6 @@ import androidx.media.AudioManagerCompat;
 
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
-import com.google.android.exoplayer2.decoder.DecoderCounters;
 
 public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, AnalyticsListener {
 
@@ -150,15 +149,9 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAudioSessionId(final EventTime eventTime, final int audioSessionId) {
+    public void onAudioSessionIdChanged(final EventTime eventTime, final int audioSessionId) {
         notifyAudioSessionUpdate(true, audioSessionId);
     }
-
-    @Override
-    public void onAudioDisabled(final EventTime eventTime, final DecoderCounters counters) {
-        notifyAudioSessionUpdate(false, player.getAudioSessionId());
-    }
-
     private void notifyAudioSessionUpdate(final boolean active, final int audioSessionId) {
         if (!PlayerHelper.isUsingDSP()) {
             return;

app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java

@@ -1,81 +1,28 @@
 package org.schabi.newpipe.player.helper;
 
 import com.google.android.exoplayer2.DefaultLoadControl;
-import com.google.android.exoplayer2.LoadControl;
-import com.google.android.exoplayer2.Renderer;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
-import com.google.android.exoplayer2.upstream.Allocator;
 
-public class LoadController implements LoadControl {
+public class LoadController extends DefaultLoadControl {
 
     public static final String TAG = "LoadController";
-
-    private final long initialPlaybackBufferUs;
-    private final LoadControl internalLoadControl;
     private boolean preloadingEnabled = true;
 
-    /*//////////////////////////////////////////////////////////////////////////
-    // Default Load Control
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public LoadController() {
-        this(PlayerHelper.getPlaybackStartBufferMs());
-    }
-
-    private LoadController(final int initialPlaybackBufferMs) {
-        this.initialPlaybackBufferUs = initialPlaybackBufferMs * 1000;
-
-        final DefaultLoadControl.Builder builder = new DefaultLoadControl.Builder();
-        builder.setBufferDurationsMs(
-                DefaultLoadControl.DEFAULT_MIN_BUFFER_MS,
-                DefaultLoadControl.DEFAULT_MAX_BUFFER_MS,
-                initialPlaybackBufferMs,
-                DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS);
-        internalLoadControl = builder.build();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Custom behaviours
-    //////////////////////////////////////////////////////////////////////////*/
-
     @Override
     public void onPrepared() {
         preloadingEnabled = true;
-        internalLoadControl.onPrepared();
-    }
-
-    @Override
-    public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroups,
-                                 final TrackSelectionArray trackSelections) {
-        internalLoadControl.onTracksSelected(renderers, trackGroups, trackSelections);
+        super.onPrepared();
     }
 
     @Override
     public void onStopped() {
         preloadingEnabled = true;
-        internalLoadControl.onStopped();
+        super.onStopped();
     }
 
     @Override
     public void onReleased() {
         preloadingEnabled = true;
-        internalLoadControl.onReleased();
-    }
-
-    @Override
-    public Allocator getAllocator() {
-        return internalLoadControl.getAllocator();
-    }
-
-    @Override
-    public long getBackBufferDurationUs() {
-        return internalLoadControl.getBackBufferDurationUs();
-    }
-
-    @Override
-    public boolean retainBackBufferFromKeyframe() {
-        return internalLoadControl.retainBackBufferFromKeyframe();
+        super.onReleased();
     }
 
     @Override
@@ -85,20 +32,10 @@ public class LoadController implements LoadControl {
         if (!preloadingEnabled) {
             return false;
         }
-        return internalLoadControl.shouldContinueLoading(
+        return super.shouldContinueLoading(
                 playbackPositionUs, bufferedDurationUs, playbackSpeed);
     }
 
-    @Override
-    public boolean shouldStartPlayback(final long bufferedDurationUs, final float playbackSpeed,
-                                       final boolean rebuffering) {
-        final boolean isInitialPlaybackBufferFilled
-                = bufferedDurationUs >= this.initialPlaybackBufferUs * playbackSpeed;
-        final boolean isInternalStartingPlayback = internalLoadControl
-                .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering);
-        return isInitialPlaybackBufferFilled || isInternalStartingPlayback;
-    }
-
     public void disablePreloadingOfCurrentTrack() {
         preloadingEnabled = false;
     }

app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java

@@ -21,6 +21,8 @@ import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
 import org.schabi.newpipe.player.mediasession.PlayQueueNavigator;
 import org.schabi.newpipe.player.mediasession.PlayQueuePlaybackController;
 
+import java.util.Optional;
+
 public class MediaSessionManager {
     private static final String TAG = MediaSessionManager.class.getSimpleName();
     public static final boolean DEBUG = MainActivity.DEBUG;
@@ -30,6 +32,9 @@ public class MediaSessionManager {
     @NonNull
     private final MediaSessionConnector sessionConnector;
 
+    private int lastTitleHashCode;
+    private int lastArtistHashCode;
+    private long lastDuration;
     private int lastAlbumArtHashCode;
 
     public MediaSessionManager(@NonNull final Context context,
@@ -65,67 +70,143 @@ public class MediaSessionManager {
         return mediaSession.getSessionToken();
     }
 
-    public void setMetadata(final String title,
-                            final String artist,
-                            final Bitmap albumArt,
-                            final long duration) {
-        if (albumArt == null || !mediaSession.isActive()) {
+    /**
+     * sets the Metadata - if required.
+     *
+     * @param title       {@link MediaMetadataCompat#METADATA_KEY_TITLE}
+     * @param artist      {@link MediaMetadataCompat#METADATA_KEY_ARTIST}
+     * @param optAlbumArt {@link MediaMetadataCompat#METADATA_KEY_ALBUM_ART}
+     * @param duration    {@link MediaMetadataCompat#METADATA_KEY_DURATION}
+     *                    - should be a negative value for unknown durations, e.g. for livestreams
+     */
+    public void setMetadata(@NonNull final String title,
+                            @NonNull final String artist,
+                            @NonNull final Optional<Bitmap> optAlbumArt,
+                            final long duration
+    ) {
+        if (DEBUG) {
+            Log.d(TAG, "setMetadata called:"
+                    + " t: " + title
+                    + " a: " + artist
+                    + " thumb: " + (
+                    optAlbumArt.isPresent()
+                            ? optAlbumArt.get().hashCode()
+                            : "<none>")
+                    + " d: " + duration);
+        }
+
+        if (!mediaSession.isActive()) {
+            if (DEBUG) {
+                Log.d(TAG, "setMetadata: mediaSession not active - exiting");
+            }
+            return;
+        }
+
+        if (!checkIfMetadataShouldBeSet(title, artist, optAlbumArt, duration)) {
+            if (DEBUG) {
+                Log.d(TAG, "setMetadata: No update required - exiting");
+            }
             return;
         }
 
         if (DEBUG) {
-            if (getMetadataAlbumArt() == null) {
-                Log.d(TAG, "N_getMetadataAlbumArt: thumb == null");
-            }
-            if (getMetadataTitle() == null) {
-                Log.d(TAG, "N_getMetadataTitle: title == null");
-            }
-            if (getMetadataArtist() == null) {
-                Log.d(TAG, "N_getMetadataArtist: artist == null");
-            }
-            if (getMetadataDuration() <= 1) {
-                Log.d(TAG, "N_getMetadataDuration: duration <= 1; " + getMetadataDuration());
-            }
+            Log.d(TAG, "setMetadata: N_Metadata update:"
+                    + " t: " + title
+                    + " a: " + artist
+                    + " thumb: " + (
+                    optAlbumArt.isPresent()
+                            ? optAlbumArt.get().hashCode()
+                            : "<none>")
+                    + " d: " + duration);
         }
 
-        if (getMetadataAlbumArt() == null || getMetadataTitle() == null
-                || getMetadataArtist() == null || getMetadataDuration() <= 1
-                || albumArt.hashCode() != lastAlbumArtHashCode) {
-            if (DEBUG) {
-                Log.d(TAG, "setMetadata: N_Metadata update: t: " + title + " a: " + artist
-                        + " thumb: " + albumArt.hashCode() + " d: " + duration);
-            }
+        final MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder()
+                .putString(MediaMetadataCompat.METADATA_KEY_TITLE, title)
+                .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist)
+                .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, duration);
 
-            mediaSession.setMetadata(new MediaMetadataCompat.Builder()
-                    .putString(MediaMetadataCompat.METADATA_KEY_TITLE, title)
-                    .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist)
-                    .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, albumArt)
-                    .putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, albumArt)
-                    .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, duration).build());
-            lastAlbumArtHashCode = albumArt.hashCode();
+        if (optAlbumArt.isPresent()) {
+            builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, optAlbumArt.get());
+            builder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, optAlbumArt.get());
+        }
+
+        mediaSession.setMetadata(builder.build());
+
+        lastTitleHashCode = title.hashCode();
+        lastArtistHashCode = artist.hashCode();
+        lastDuration = duration;
+        if (optAlbumArt.isPresent()) {
+            lastAlbumArtHashCode = optAlbumArt.get().hashCode();
         }
     }
 
+    private boolean checkIfMetadataShouldBeSet(
+            @NonNull final String title,
+            @NonNull final String artist,
+            @NonNull final Optional<Bitmap> optAlbumArt,
+            final long duration
+    ) {
+        // Check if the values have changed since the last time
+        if (title.hashCode() != lastTitleHashCode
+                || artist.hashCode() != lastArtistHashCode
+                || duration != lastDuration
+                || (optAlbumArt.isPresent() && optAlbumArt.get().hashCode() != lastAlbumArtHashCode)
+        ) {
+            if (DEBUG) {
+                Log.d(TAG,
+                        "checkIfMetadataShouldBeSet: true - reason: changed values since last");
+            }
+            return true;
+        }
+
+        // Check if the currently set metadata is valid
+        if (getMetadataTitle() == null
+                || getMetadataArtist() == null
+                // Note that the duration can be <= 0 for live streams
+        ) {
+            if (DEBUG) {
+                if (getMetadataTitle() == null) {
+                    Log.d(TAG,
+                            "N_getMetadataTitle: title == null");
+                } else if (getMetadataArtist() == null) {
+                    Log.d(TAG,
+                            "N_getMetadataArtist: artist == null");
+                }
+            }
+            return true;
+        }
+
+        // If we got an album art check if the current set AlbumArt is null
+        if (optAlbumArt.isPresent() && getMetadataAlbumArt() == null) {
+            if (DEBUG) {
+                Log.d(TAG, "N_getMetadataAlbumArt: thumb == null");
+            }
+            return true;
+        }
+
+        // Default - no update required
+        return false;
+    }
+
+
+    @Nullable
     private Bitmap getMetadataAlbumArt() {
         return mediaSession.getController().getMetadata()
                 .getBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART);
     }
 
+    @Nullable
     private String getMetadataTitle() {
         return mediaSession.getController().getMetadata()
                 .getString(MediaMetadataCompat.METADATA_KEY_TITLE);
     }
 
+    @Nullable
     private String getMetadataArtist() {
         return mediaSession.getController().getMetadata()
                 .getString(MediaMetadataCompat.METADATA_KEY_ARTIST);
     }
 
-    private long getMetadataDuration() {
-        return mediaSession.getController().getMetadata()
-                .getLong(MediaMetadataCompat.METADATA_KEY_DURATION);
-    }
-
     /**
      * Should be called on player destruction to prevent leakage.
      */

app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java

@@ -1,5 +1,8 @@
 package org.schabi.newpipe.player.helper;
 
+import static org.schabi.newpipe.player.Player.DEBUG;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -18,9 +21,6 @@ import androidx.preference.PreferenceManager;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.SliderStrategy;
 
-import static org.schabi.newpipe.player.Player.DEBUG;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 public class PlaybackParameterDialog extends DialogFragment {
     // Minimum allowable range in ExoPlayer
     private static final double MINIMUM_PLAYBACK_VALUE = 0.10f;
@@ -157,7 +157,6 @@ public class PlaybackParameterDialog extends DialogFragment {
         setupControlViews(view);
 
         final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireActivity())
-                .setTitle(R.string.playback_speed_control)
                 .setView(view)
                 .setCancelable(true)
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) ->

app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java

@@ -1,14 +1,18 @@
 package org.schabi.newpipe.player.helper;
 
 import android.content.Context;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 
+import com.google.android.exoplayer2.source.MediaParserExtractorAdapter;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.SingleSampleMediaSource;
+import com.google.android.exoplayer2.source.chunk.MediaParserChunkExtractor;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
 import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.hls.MediaParserHlsMediaChunkExtractor;
 import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
 import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -19,7 +23,7 @@ import com.google.android.exoplayer2.upstream.TransferListener;
 public class PlayerDataSource {
     private static final int MANIFEST_MINIMUM_RETRY = 5;
     private static final int EXTRACTOR_MINIMUM_RETRY = Integer.MAX_VALUE;
-    private static final int LIVE_STREAM_EDGE_GAP_MILLIS = 10000;
+    public static final int LIVE_STREAM_EDGE_GAP_MILLIS = 10000;
 
     private final DataSource.Factory cacheDataSourceFactory;
     private final DataSource.Factory cachelessDataSourceFactory;
@@ -32,51 +36,83 @@ public class PlayerDataSource {
     }
 
     public SsMediaSource.Factory getLiveSsMediaSourceFactory() {
-        return new SsMediaSource.Factory(new DefaultSsChunkSource.Factory(
-                cachelessDataSourceFactory), cachelessDataSourceFactory)
+        return new SsMediaSource.Factory(
+                new DefaultSsChunkSource.Factory(cachelessDataSourceFactory),
+                cachelessDataSourceFactory
+        )
                 .setLoadErrorHandlingPolicy(
                         new DefaultLoadErrorHandlingPolicy(MANIFEST_MINIMUM_RETRY))
                 .setLivePresentationDelayMs(LIVE_STREAM_EDGE_GAP_MILLIS);
     }
 
     public HlsMediaSource.Factory getLiveHlsMediaSourceFactory() {
-        return new HlsMediaSource.Factory(cachelessDataSourceFactory)
-                .setAllowChunklessPreparation(true)
+        final HlsMediaSource.Factory factory =
+                new HlsMediaSource.Factory(cachelessDataSourceFactory)
+                        .setAllowChunklessPreparation(true)
+                        .setLoadErrorHandlingPolicy(
+                                new DefaultLoadErrorHandlingPolicy(MANIFEST_MINIMUM_RETRY));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            factory.setExtractorFactory(MediaParserHlsMediaChunkExtractor.FACTORY);
+        }
+
+        return factory;
+    }
+
+    public DashMediaSource.Factory getLiveDashMediaSourceFactory() {
+        return new DashMediaSource.Factory(
+                getDefaultDashChunkSourceFactory(cachelessDataSourceFactory),
+                cachelessDataSourceFactory
+        )
                 .setLoadErrorHandlingPolicy(
                         new DefaultLoadErrorHandlingPolicy(MANIFEST_MINIMUM_RETRY));
     }
 
-    public DashMediaSource.Factory getLiveDashMediaSourceFactory() {
-        return new DashMediaSource.Factory(new DefaultDashChunkSource.Factory(
-                cachelessDataSourceFactory), cachelessDataSourceFactory)
-                .setLoadErrorHandlingPolicy(
-                        new DefaultLoadErrorHandlingPolicy(MANIFEST_MINIMUM_RETRY))
-                .setLivePresentationDelayMs(LIVE_STREAM_EDGE_GAP_MILLIS, true);
-    }
+    private DefaultDashChunkSource.Factory getDefaultDashChunkSourceFactory(
+            final DataSource.Factory dataSourceFactory
+    ) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return new DefaultDashChunkSource.Factory(
+                    MediaParserChunkExtractor.FACTORY,
+                    dataSourceFactory,
+                    1
+            );
+        }
 
-    public SsMediaSource.Factory getSsMediaSourceFactory() {
-        return new SsMediaSource.Factory(new DefaultSsChunkSource.Factory(
-                cacheDataSourceFactory), cacheDataSourceFactory);
+        return new DefaultDashChunkSource.Factory(dataSourceFactory);
     }
 
     public HlsMediaSource.Factory getHlsMediaSourceFactory() {
-        return new HlsMediaSource.Factory(cacheDataSourceFactory);
+        final HlsMediaSource.Factory factory = new HlsMediaSource.Factory(cacheDataSourceFactory);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            return factory;
+        }
+
+        // *** >= Android 11 / R / API 30 ***
+        return factory.setExtractorFactory(MediaParserHlsMediaChunkExtractor.FACTORY);
     }
 
     public DashMediaSource.Factory getDashMediaSourceFactory() {
-        return new DashMediaSource.Factory(new DefaultDashChunkSource.Factory(
-                cacheDataSourceFactory), cacheDataSourceFactory);
+        return new DashMediaSource.Factory(
+                getDefaultDashChunkSourceFactory(cacheDataSourceFactory),
+                cacheDataSourceFactory
+        );
     }
 
     public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory() {
-        return new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
-                .setLoadErrorHandlingPolicy(
-                        new DefaultLoadErrorHandlingPolicy(EXTRACTOR_MINIMUM_RETRY));
-    }
+        final ProgressiveMediaSource.Factory factory;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            factory = new ProgressiveMediaSource.Factory(
+                    cacheDataSourceFactory,
+                    MediaParserExtractorAdapter.FACTORY
+            );
+        } else {
+            factory = new ProgressiveMediaSource.Factory(cacheDataSourceFactory);
+        }
 
-    public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory(
-            @NonNull final String key) {
-        return getExtractorMediaSourceFactory().setCustomCacheKey(key);
+        return factory.setLoadErrorHandlingPolicy(
+                new DefaultLoadErrorHandlingPolicy(EXTRACTOR_MINIMUM_RETRY));
     }
 
     public SingleSampleMediaSource.Factory getSampleMediaSourceFactory() {

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -1,5 +1,18 @@
 package org.schabi.newpipe.player.helper;
 
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
+import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
+import static org.schabi.newpipe.player.Player.IDLE_WINDOW_FLAGS;
+import static org.schabi.newpipe.player.Player.PLAYER_TYPE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_ALWAYS;
+import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_NEVER;
+import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_WIFI;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -21,11 +34,11 @@ import androidx.preference.PreferenceManager;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player.RepeatMode;
 import com.google.android.exoplayer2.SeekParameters;
-import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
+import com.google.android.exoplayer2.ui.CaptionStyleCompat;
 import com.google.android.exoplayer2.util.MimeTypes;
 
 import org.schabi.newpipe.R;
@@ -57,19 +70,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
-import static java.lang.annotation.RetentionPolicy.SOURCE;
-import static org.schabi.newpipe.player.Player.IDLE_WINDOW_FLAGS;
-import static org.schabi.newpipe.player.Player.PLAYER_TYPE;
-import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_ALWAYS;
-import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_NEVER;
-import static org.schabi.newpipe.player.helper.PlayerHelper.AutoplayType.AUTOPLAY_TYPE_WIFI;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
-
 public final class PlayerHelper {
     private static final StringBuilder STRING_BUILDER = new StringBuilder();
     private static final Formatter STRING_FORMATTER
@@ -305,14 +305,7 @@ public final class PlayerHelper {
         return 2 * 1024 * 1024L; // ExoPlayer CacheDataSink.MIN_RECOMMENDED_FRAGMENT_SIZE
     }
 
-    /**
-     * @return the number of milliseconds the player buffers for before starting playback
-     */
-    public static int getPlaybackStartBufferMs() {
-        return 500;
-    }
-
-    public static TrackSelection.Factory getQualitySelector() {
+    public static ExoTrackSelection.Factory getQualitySelector() {
         return new AdaptiveTrackSelection.Factory(
                 1000,
                 AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java

@@ -70,6 +70,10 @@ public final class PlayerHolder {
         return player != null;
     }
 
+    public int getQueueSize() {
+        return isPlayerOpen() ? player.getPlayQueue().size() : 0;
+    }
+
     public void setListener(@Nullable final PlayerServiceExtendedEventListener newListener) {
         listener = newListener;
 

app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java

@@ -13,7 +13,7 @@ import com.google.android.exoplayer2.RendererCapabilities.Capabilities;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
@@ -28,7 +28,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
     private String preferredTextLanguage;
 
     public CustomTrackSelector(final Context context,
-                               final TrackSelection.Factory adaptiveTrackSelectionFactory) {
+                               final ExoTrackSelection.Factory adaptiveTrackSelectionFactory) {
         super(context, adaptiveTrackSelectionFactory);
     }
 
@@ -50,7 +50,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
 
     @Override
     @Nullable
-    protected Pair<TrackSelection.Definition, TextTrackScore> selectTextTrack(
+    protected Pair<ExoTrackSelection.Definition, TextTrackScore> selectTextTrack(
             final TrackGroupArray groups,
             @NonNull final int[][] formatSupport,
             @NonNull final Parameters params,
@@ -86,7 +86,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
             }
         }
         return selectedGroup == null ? null
-                : Pair.create(new TrackSelection.Definition(selectedGroup, selectedTrackIndex),
+                : Pair.create(new ExoTrackSelection.Definition(selectedGroup, selectedTrackIndex),
                         Assertions.checkNotNull(selectedTrackScore));
     }
 }

app/src/main/java/org/schabi/newpipe/player/playererror/PlayerErrorHandler.java

@@ -0,0 +1,89 @@
+package org.schabi.newpipe.player.playererror;
+
+import android.content.Context;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.exoplayer2.ExoPlaybackException;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.error.EnsureExceptionSerializable;
+import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.Info;
+
+/**
+ * Handles (exoplayer)errors that occur in the player.
+ */
+public class PlayerErrorHandler {
+    // This has to be <= 23 chars on devices running Android 7 or lower (API <= 25)
+    // or it fails with an IllegalArgumentException
+    // https://stackoverflow.com/a/54744028
+    private static final String TAG = "PlayerErrorHandler";
+
+    @Nullable
+    private Toast errorToast;
+
+    @NonNull
+    private final Context context;
+
+    public PlayerErrorHandler(@NonNull final Context context) {
+        this.context = context;
+    }
+
+    public void showPlayerError(
+            @NonNull final ExoPlaybackException exception,
+            @NonNull final Info info,
+            @StringRes final int textResId
+    ) {
+        // Hide existing toast message
+        if (errorToast != null) {
+            Log.d(TAG, "Trying to cancel previous player error error toast");
+            errorToast.cancel();
+            errorToast = null;
+        }
+
+        if (shouldReportError()) {
+            try {
+                reportError(exception, info);
+                // When a report pops up we need no toast
+                return;
+            } catch (final Exception ex) {
+                Log.w(TAG, "Unable to report error:", ex);
+                // This will show the toast as fallback
+            }
+        }
+
+        Log.d(TAG, "Showing player error toast");
+        errorToast = Toast.makeText(context, textResId, Toast.LENGTH_SHORT);
+        errorToast.show();
+    }
+
+    private void reportError(@NonNull final ExoPlaybackException exception,
+                             @NonNull final Info info) {
+        ErrorActivity.reportError(
+                context,
+                new ErrorInfo(
+                        EnsureExceptionSerializable.ensureSerializable(exception),
+                        UserAction.PLAY_STREAM,
+                        "Player error[type=" + exception.type + "] occurred while playing: "
+                                + info.getUrl(),
+                        info
+                )
+        );
+    }
+
+    private boolean shouldReportError() {
+        return PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getBoolean(
+                        context.getString(R.string.report_player_errors_key),
+                        false);
+    }
+}

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java

@@ -436,14 +436,16 @@ public abstract class PlayQueue implements Serializable {
      * top, so shuffling a size-2 list does nothing)
      */
     public synchronized void shuffle() {
-        // Can't shuffle an list that's empty or only has one element
-        if (size() <= 2) {
-            return;
-        }
         // Create a backup if it doesn't already exist
+        // Note: The backup-list has to be created at all cost (even when size <= 2).
+        // Otherwise it's not possible to enter shuffle-mode!
         if (backup == null) {
             backup = new ArrayList<>(streams);
         }
+        // Can't shuffle a list that's empty or only has one element
+        if (size() <= 2) {
+            return;
+        }
 
         final int originalIndex = getIndex();
         final PlayQueueItem currentItem = getItem();

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java

@@ -51,6 +51,6 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
 
     @Override
     public void onSwiped(final RecyclerView.ViewHolder viewHolder, final int swipeDir) {
-        onSwiped(viewHolder.getAdapterPosition());
+        onSwiped(viewHolder.getBindingAdapterPosition());
     }
 }

app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java

@@ -9,11 +9,13 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceFactory;
 import com.google.android.exoplayer2.util.Util;
 
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.player.helper.PlayerDataSource;
+import org.schabi.newpipe.util.StreamTypeUtil;
 
 public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
 
@@ -21,7 +23,7 @@ public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
     default MediaSource maybeBuildLiveMediaSource(@NonNull final PlayerDataSource dataSource,
                                                   @NonNull final StreamInfo info) {
         final StreamType streamType = info.getStreamType();
-        if (!(streamType == StreamType.AUDIO_LIVE_STREAM || streamType == StreamType.LIVE_STREAM)) {
+        if (!StreamTypeUtil.isLiveStream(streamType)) {
             return null;
         }
 
@@ -40,20 +42,28 @@ public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
                                              @NonNull final String sourceUrl,
                                              @C.ContentType final int type,
                                              @NonNull final MediaSourceTag metadata) {
-        final Uri uri = Uri.parse(sourceUrl);
+        final MediaSourceFactory factory;
         switch (type) {
             case C.TYPE_SS:
-                return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getLiveSsMediaSourceFactory();
+                break;
             case C.TYPE_DASH:
-                return dataSource.getLiveDashMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getLiveDashMediaSourceFactory();
+                break;
             case C.TYPE_HLS:
-                return dataSource.getLiveHlsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getLiveHlsMediaSourceFactory();
+                break;
             default:
                 throw new IllegalStateException("Unsupported type: " + type);
         }
+
+        return factory.createMediaSource(
+                new MediaItem.Builder()
+                        .setTag(metadata)
+                        .setUri(Uri.parse(sourceUrl))
+                        .setLiveTargetOffsetMs(PlayerDataSource.LIVE_STREAM_EDGE_GAP_MILLIS)
+                        .build()
+        );
     }
 
     @NonNull
@@ -66,21 +76,30 @@ public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
         @C.ContentType final int type = TextUtils.isEmpty(overrideExtension)
                 ? Util.inferContentType(uri) : Util.inferContentType("." + overrideExtension);
 
+        final MediaSourceFactory factory;
         switch (type) {
             case C.TYPE_SS:
-                return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getLiveSsMediaSourceFactory();
+                break;
             case C.TYPE_DASH:
-                return dataSource.getDashMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getDashMediaSourceFactory();
+                break;
             case C.TYPE_HLS:
-                return dataSource.getHlsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getHlsMediaSourceFactory();
+                break;
             case C.TYPE_OTHER:
-                return dataSource.getExtractorMediaSourceFactory(cacheKey).setTag(metadata)
-                        .createMediaSource(MediaItem.fromUri(uri));
+                factory = dataSource.getExtractorMediaSourceFactory();
+                break;
             default:
                 throw new IllegalStateException("Unsupported type: " + type);
         }
+
+        return factory.createMediaSource(
+                new MediaItem.Builder()
+                    .setTag(metadata)
+                    .setUri(uri)
+                    .setCustomCacheKey(cacheKey)
+                    .build()
+        );
     }
 }

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.settings
 
 import android.content.SharedPreferences
+import android.util.Log
 import org.schabi.newpipe.streams.io.SharpOutputStream
 import org.schabi.newpipe.streams.io.StoredFileHelper
 import org.schabi.newpipe.util.ZipHelper
@@ -13,6 +14,9 @@ import java.io.ObjectOutputStream
 import java.util.zip.ZipOutputStream
 
 class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
+    companion object {
+        const val TAG = "ContentSetManager"
+    }
 
     /**
      * Exports given [SharedPreferences] to the file in given outputPath.
@@ -31,7 +35,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
                         output.flush()
                     }
                 } catch (e: IOException) {
-                    e.printStackTrace()
+                    Log.e(TAG, "Unable to exportDatabase", e)
                 }
 
                 ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings")
@@ -91,14 +95,19 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
                         is String -> {
                             preferenceEditor.putString(key, value)
                         }
+                        is Set<*> -> {
+                            // There are currently only Sets with type String possible
+                            @Suppress("UNCHECKED_CAST")
+                            preferenceEditor.putStringSet(key, value as Set<String>?)
+                        }
                     }
                 }
                 preferenceEditor.commit()
             }
         } catch (e: IOException) {
-            e.printStackTrace()
+            Log.e(TAG, "Unable to loadSharedPreferences", e)
         } catch (e: ClassNotFoundException) {
-            e.printStackTrace()
+            Log.e(TAG, "Unable to loadSharedPreferences", e)
         }
     }
 }

app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java

@@ -16,8 +16,9 @@ public class MainSettingsFragment extends BasePreferenceFragment {
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
         addPreferencesFromResource(R.xml.main_settings);
 
-        if (!CheckForNewAppVersion.isGithubApk(App.getApp())) {
-            final Preference update = findPreference(getString(R.string.update_pref_screen_key));
+        if (!CheckForNewAppVersion.isReleaseApk(App.getApp())) {
+            final Preference update
+                    = findPreference(getString(R.string.update_pref_screen_key));
             getPreferenceScreen().removePreference(update);
 
             defaultPreferences.edit().putBoolean(getString(R.string.update_app_key), false).apply();

app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java

@@ -303,8 +303,8 @@ public class PeertubeInstanceListFragment extends Fragment {
                     return false;
                 }
 
-                final int sourceIndex = source.getAdapterPosition();
-                final int targetIndex = target.getAdapterPosition();
+                final int sourceIndex = source.getBindingAdapterPosition();
+                final int targetIndex = target.getBindingAdapterPosition();
                 instanceListAdapter.swapItems(sourceIndex, targetIndex);
                 return true;
             }
@@ -322,7 +322,7 @@ public class PeertubeInstanceListFragment extends Fragment {
             @Override
             public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder,
                                  final int swipeDir) {
-                final int position = viewHolder.getAdapterPosition();
+                final int position = viewHolder.getBindingAdapterPosition();
                 // do not allow swiping the selected instance
                 if (instanceList.get(position).getUrl().equals(selectedInstance.getUrl())) {
                     instanceListAdapter.notifyItemChanged(position);

app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java

@@ -1,6 +1,9 @@
 package org.schabi.newpipe.settings;
 
+import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
+
 import android.os.Bundle;
+import android.widget.Toast;
 
 import androidx.preference.Preference;
 
@@ -8,17 +11,38 @@ import org.schabi.newpipe.R;
 
 public class UpdateSettingsFragment extends BasePreferenceFragment {
     private final Preference.OnPreferenceChangeListener updatePreferenceChange
-            = (preference, newValue) -> {
+            = (preference, checkForUpdates) -> {
         defaultPreferences.edit()
-                .putBoolean(getString(R.string.update_app_key), (boolean) newValue).apply();
+                .putBoolean(getString(R.string.update_app_key), (boolean) checkForUpdates).apply();
+
+        if ((boolean) checkForUpdates) {
+            checkNewVersionNow();
+        }
         return true;
     };
 
+    private final Preference.OnPreferenceClickListener manualUpdateClick
+            = preference -> {
+        Toast.makeText(getContext(), R.string.checking_updates_toast, Toast.LENGTH_SHORT).show();
+        checkNewVersionNow();
+        return true;
+    };
+
+    private void checkNewVersionNow() {
+        // Search for updates immediately when update checks are enabled.
+        // Reset the expire time. This is necessary to check for an update immediately.
+        defaultPreferences.edit()
+                .putLong(getString(R.string.update_expiry_key), 0).apply();
+        startNewVersionCheckService();
+    }
+
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
         addPreferencesFromResource(R.xml.update_settings);
 
-        final String updateToggleKey = getString(R.string.update_app_key);
-        findPreference(updateToggleKey).setOnPreferenceChangeListener(updatePreferenceChange);
+        findPreference(getString(R.string.update_app_key))
+                .setOnPreferenceChangeListener(updatePreferenceChange);
+        findPreference(getString(R.string.manual_update_key))
+                .setOnPreferenceClickListener(manualUpdateClick);
     }
 }

app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java

@@ -299,8 +299,8 @@ public class ChooseTabsFragment extends Fragment {
                     return false;
                 }
 
-                final int sourceIndex = source.getAdapterPosition();
-                final int targetIndex = target.getAdapterPosition();
+                final int sourceIndex = source.getBindingAdapterPosition();
+                final int targetIndex = target.getBindingAdapterPosition();
                 selectedTabsAdapter.swapItems(sourceIndex, targetIndex);
                 return true;
             }
@@ -318,7 +318,7 @@ public class ChooseTabsFragment extends Fragment {
             @Override
             public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder,
                                  final int swipeDir) {
-                final int position = viewHolder.getAdapterPosition();
+                final int position = viewHolder.getBindingAdapterPosition();
                 tabList.remove(position);
                 selectedTabsAdapter.notifyItemRemoved(position);
 

app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.BatteryManager;
 import android.os.Build;
+import android.provider.Settings;
 import android.util.TypedValue;
 import android.view.KeyEvent;
 
@@ -33,6 +34,9 @@ public final class DeviceUtils {
     // Zephir TS43UHD-2
     private static final boolean CVT_MT5886_EU_1G = Build.VERSION.SDK_INT == 24
             && Build.DEVICE.equals("cvt_mt5886_eu_1g");
+    // Hilife TV
+    private static final boolean REALTEKATV = Build.VERSION.SDK_INT == 25
+            && Build.DEVICE.equals("RealtekATV");
 
     private DeviceUtils() {
     }
@@ -129,7 +133,8 @@ public final class DeviceUtils {
     public static boolean shouldSupportMediaTunneling() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
                 && !HI3798MV200
-                && !CVT_MT5886_EU_1G;
+                && !CVT_MT5886_EU_1G
+                && !REALTEKATV;
     }
 
     public static boolean isLandscape(final Context context) {
@@ -140,4 +145,11 @@ public final class DeviceUtils {
     public static boolean isInMultiWindow(final AppCompatActivity activity) {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && activity.isInMultiWindowMode();
     }
+
+    public static boolean hasAnimationsAnimatorDurationEnabled(final Context context) {
+        return Settings.System.getFloat(
+                context.getContentResolver(),
+                Settings.Global.ANIMATOR_DURATION_SCALE,
+                1F) != 0F;
+    }
 }

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -45,6 +45,7 @@ import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionFragment;
 import org.schabi.newpipe.local.subscription.SubscriptionsImportFragment;
 import org.schabi.newpipe.player.MainPlayer;
+import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.PlayQueueActivity;
 import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -64,13 +65,15 @@ public final class NavigationHelper {
     public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
     public static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag";
 
+    private static final String TAG = NavigationHelper.class.getSimpleName();
+
     private NavigationHelper() {
     }
 
     /*//////////////////////////////////////////////////////////////////////////
     // Players
     //////////////////////////////////////////////////////////////////////////*/
-
+    /* INTENT */
     @NonNull
     public static <T> Intent getPlayerIntent(@NonNull final Context context,
                                              @NonNull final Class<T> targetClazz,
@@ -84,8 +87,8 @@ public final class NavigationHelper {
                 intent.putExtra(Player.PLAY_QUEUE_KEY, cacheKey);
             }
         }
-        intent.putExtra(Player.RESUME_PLAYBACK, resumePlayback);
         intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.VIDEO.ordinal());
+        intent.putExtra(Player.RESUME_PLAYBACK, resumePlayback);
 
         return intent;
     }
@@ -103,14 +106,28 @@ public final class NavigationHelper {
     @NonNull
     public static <T> Intent getPlayerEnqueueIntent(@NonNull final Context context,
                                                     @NonNull final Class<T> targetClazz,
-                                                    @Nullable final PlayQueue playQueue,
-                                                    final boolean selectOnAppend,
-                                                    final boolean resumePlayback) {
-        return getPlayerIntent(context, targetClazz, playQueue, resumePlayback)
-                .putExtra(Player.APPEND_ONLY, true)
-                .putExtra(Player.SELECT_ON_APPEND, selectOnAppend);
+                                                    @Nullable final PlayQueue playQueue) {
+        // when enqueueing `resumePlayback` is always `false` since:
+        // - if there is a video already playing, the value of `resumePlayback` just doesn't make
+        //   any difference.
+        // - if there is nothing already playing, it is useful for the enqueue action to have a
+        //   slightly different behaviour than the normal play action: the latter resumes playback,
+        //   the former doesn't. (note that enqueue can be triggered when nothing is playing only
+        //   by long pressing the video detail fragment, playlist or channel controls
+        return getPlayerIntent(context, targetClazz, playQueue, false)
+                .putExtra(Player.ENQUEUE, true);
     }
 
+    @NonNull
+    public static <T> Intent getPlayerEnqueueNextIntent(@NonNull final Context context,
+                                                        @NonNull final Class<T> targetClazz,
+                                                        @Nullable final PlayQueue playQueue) {
+        // see comment in `getPlayerEnqueueIntent` as to why `resumePlayback` is false
+        return getPlayerIntent(context, targetClazz, playQueue, false)
+                .putExtra(Player.ENQUEUE_NEXT, true);
+    }
+
+    /* PLAY */
     public static void playOnMainPlayer(final AppCompatActivity activity,
                                         @NonNull final PlayQueue playQueue) {
         final PlayQueueItem item = playQueue.getItem();
@@ -140,7 +157,9 @@ public final class NavigationHelper {
             return;
         }
 
-        Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
+        if (PlayerHolder.getInstance().getType() != PlayerType.POPUP) {
+            Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
+        }
         final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
         intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
         ContextCompat.startForegroundService(context, intent);
@@ -149,63 +168,47 @@ public final class NavigationHelper {
     public static void playOnBackgroundPlayer(final Context context,
                                               final PlayQueue queue,
                                               final boolean resumePlayback) {
-        Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
-                .show();
+        if (PlayerHolder.getInstance().getType() != MainPlayer.PlayerType.AUDIO) {
+            Toast.makeText(context, R.string.background_player_playing_toast, Toast.LENGTH_SHORT)
+                    .show();
+        }
         final Intent intent = getPlayerIntent(context, MainPlayer.class, queue, resumePlayback);
         intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
-    public static void enqueueOnVideoPlayer(final Context context, final PlayQueue queue,
-                                            final boolean resumePlayback) {
-        enqueueOnVideoPlayer(context, queue, false, resumePlayback);
-    }
-
-    public static void enqueueOnVideoPlayer(final Context context, final PlayQueue queue,
-                                            final boolean selectOnAppend,
-                                            final boolean resumePlayback) {
-
+    /* ENQUEUE */
+    public static void enqueueOnPlayer(final Context context,
+                                       final PlayQueue queue,
+                                       final PlayerType playerType) {
         Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show();
-        final Intent intent = getPlayerEnqueueIntent(
-                context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
+        final Intent intent = getPlayerEnqueueIntent(context, MainPlayer.class, queue);
 
-        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.VIDEO.ordinal());
+        intent.putExtra(Player.PLAYER_TYPE, playerType.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
-    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue,
-                                            final boolean resumePlayback) {
-        enqueueOnPopupPlayer(context, queue, false, resumePlayback);
-    }
-
-    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue,
-                                            final boolean selectOnAppend,
-                                            final boolean resumePlayback) {
-        if (!PermissionHelper.isPopupEnabled(context)) {
-            PermissionHelper.showPopupEnablementToast(context);
-            return;
+    public static void enqueueOnPlayer(final Context context, final PlayQueue queue) {
+        PlayerType playerType = PlayerHolder.getInstance().getType();
+        if (!PlayerHolder.getInstance().isPlayerOpen()) {
+            Log.e(TAG, "Enqueueing but no player is open; defaulting to background player");
+            playerType = MainPlayer.PlayerType.AUDIO;
         }
 
-        Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show();
-        final Intent intent = getPlayerEnqueueIntent(
-                context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
-        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
-        ContextCompat.startForegroundService(context, intent);
+        enqueueOnPlayer(context, queue, playerType);
     }
 
-    public static void enqueueOnBackgroundPlayer(final Context context, final PlayQueue queue,
-                                                 final boolean resumePlayback) {
-        enqueueOnBackgroundPlayer(context, queue, false, resumePlayback);
-    }
+    /* ENQUEUE NEXT */
+    public static void enqueueNextOnPlayer(final Context context, final PlayQueue queue) {
+        PlayerType playerType = PlayerHolder.getInstance().getType();
+        if (!PlayerHolder.getInstance().isPlayerOpen()) {
+            Log.e(TAG, "Enqueueing next but no player is open; defaulting to background player");
+            playerType = MainPlayer.PlayerType.AUDIO;
+        }
+        Toast.makeText(context, R.string.enqueued_next, Toast.LENGTH_SHORT).show();
+        final Intent intent = getPlayerEnqueueNextIntent(context, MainPlayer.class, queue);
 
-    public static void enqueueOnBackgroundPlayer(final Context context,
-                                                 final PlayQueue queue,
-                                                 final boolean selectOnAppend,
-                                                 final boolean resumePlayback) {
-        Toast.makeText(context, R.string.enqueued, Toast.LENGTH_SHORT).show();
-        final Intent intent = getPlayerEnqueueIntent(
-                context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
-        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
+        intent.putExtra(Player.PLAYER_TYPE, playerType.ordinal());
         ContextCompat.startForegroundService(context, intent);
     }
 
@@ -348,7 +351,7 @@ public final class NavigationHelper {
 
         final boolean autoPlay;
         @Nullable final MainPlayer.PlayerType playerType = PlayerHolder.getInstance().getType();
-        if (playerType == null) {
+        if (!PlayerHolder.getInstance().isPlayerOpen()) {
             // no player open
             autoPlay = PlayerHelper.isAutoplayAllowedByUser(context);
         } else if (switchingPlayers) {
@@ -503,6 +506,27 @@ public final class NavigationHelper {
         context.startActivity(intent);
     }
 
+    /**
+     * Opens {@link ChannelFragment}.
+     * Use this instead of {@link #openChannelFragment(FragmentManager, int, String, String)}
+     * when no fragments are used / no FragmentManager is available.
+     * @param context
+     * @param serviceId
+     * @param url
+     * @param title
+     */
+    public static void openChannelFragmentUsingIntent(final Context context,
+                                                      final int serviceId,
+                                                      final String url,
+                                                      @NonNull final String title) {
+        final Intent intent = getOpenIntent(context, url, serviceId,
+                StreamingService.LinkType.CHANNEL);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(Constants.KEY_TITLE, title);
+
+        context.startActivity(intent);
+    }
+
     public static void openMainActivity(final Context context) {
         final Intent mIntent = new Intent(context, MainActivity.class);
         mIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

app/src/main/java/org/schabi/newpipe/util/NewPipeTextViewHelper.java

@@ -0,0 +1,61 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.text.Selection;
+import android.text.Spannable;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.views.NewPipeEditText;
+import org.schabi.newpipe.views.NewPipeTextView;
+
+public final class NewPipeTextViewHelper {
+    private NewPipeTextViewHelper() {
+    }
+
+    /**
+     * Share the selected text of {@link NewPipeTextView NewPipeTextViews} and
+     * {@link NewPipeEditText NewPipeEditTexts} with
+     * {@link ShareUtils#shareText(Context, String, String)}.
+     *
+     * <p>
+     * This allows EMUI users to get the Android share sheet instead of the EMUI share sheet when
+     * using the {@code Share} command of the popup menu which appears when selecting text.
+     * </p>
+     *
+     * @param textView the {@link TextView} on which sharing the selected text. It should be a
+     *                 {@link NewPipeTextView} or a {@link NewPipeEditText} (even if
+     *                 {@link TextView standard TextViews} are supported).
+     */
+    public static void shareSelectedTextWithShareUtils(@NonNull final TextView textView) {
+        final CharSequence textViewText = textView.getText();
+        shareSelectedTextIfNotNullAndNotEmpty(textView, getSelectedText(textView, textViewText));
+        if (textViewText instanceof Spannable) {
+            Selection.setSelection((Spannable) textViewText, textView.getSelectionEnd());
+        }
+    }
+
+    @Nullable
+    private static CharSequence getSelectedText(@NonNull final TextView textView,
+                                                @Nullable final CharSequence text) {
+        if (!textView.hasSelection() || text == null) {
+            return null;
+        }
+
+        final int start = textView.getSelectionStart();
+        final int end = textView.getSelectionEnd();
+        return String.valueOf(start > end ? text.subSequence(end, start)
+                : text.subSequence(start, end));
+    }
+
+    private static void shareSelectedTextIfNotNullAndNotEmpty(
+            @NonNull final TextView textView,
+            @Nullable final CharSequence selectedText) {
+        if (selectedText != null && selectedText.length() != 0) {
+            ShareUtils.shareText(textView.getContext(), "", selectedText.toString());
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java

@@ -5,15 +5,16 @@ import android.net.Uri;
 import android.widget.Toast;
 
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
@@ -25,8 +26,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
-import static org.schabi.newpipe.player.MainPlayer.PlayerType.AUDIO;
-import static org.schabi.newpipe.player.MainPlayer.PlayerType.POPUP;
 
 public enum StreamDialogEntry {
     //////////////////////////////////////
@@ -43,7 +42,7 @@ public enum StreamDialogEntry {
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(result -> {
-                        NewPipeDatabase.getInstance(fragment.getContext()).streamDAO()
+                        NewPipeDatabase.getInstance(fragment.requireContext()).streamDAO()
                                 .setUploaderUrl(serviceId, url, result.getUploaderUrl())
                                 .subscribeOn(Schedulers.io()).subscribe();
                         openChannelFragment(fragment, item, result.getUploaderUrl());
@@ -64,18 +63,11 @@ public enum StreamDialogEntry {
      * Info: Add this entry within showStreamDialog.
      */
     enqueue(R.string.enqueue_stream, (fragment, item) -> {
-        final MainPlayer.PlayerType type = PlayerHolder.getInstance().getType();
+        NavigationHelper.enqueueOnPlayer(fragment.getContext(), new SinglePlayQueue(item));
+    }),
 
-        if (type == AUDIO) {
-            NavigationHelper.enqueueOnBackgroundPlayer(fragment.getContext(),
-                    new SinglePlayQueue(item), false);
-        } else if (type == POPUP) {
-            NavigationHelper.enqueueOnPopupPlayer(fragment.getContext(),
-                    new SinglePlayQueue(item), false);
-        } else /* type == VIDEO */ {
-            NavigationHelper.enqueueOnVideoPlayer(fragment.getContext(),
-                    new SinglePlayQueue(item), false);
-        }
+    enqueue_next(R.string.enqueue_next_stream, (fragment, item) -> {
+        NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), new SinglePlayQueue(item));
     }),
 
     start_here_on_background(R.string.start_here_on_background, (fragment, item) ->
@@ -92,14 +84,16 @@ public enum StreamDialogEntry {
     delete(R.string.delete, (fragment, item) -> {
     }), // has to be set manually
 
-    append_playlist(R.string.append_playlist, (fragment, item) -> {
-        final PlaylistAppendDialog d = PlaylistAppendDialog
-                .fromStreamInfoItems(Collections.singletonList(item));
-
-        PlaylistAppendDialog.onPlaylistFound(fragment.getContext(),
-            () -> d.show(fragment.getParentFragmentManager(), "StreamDialogEntry@append_playlist"),
-            () -> PlaylistCreationDialog.newInstance(d)
-                    .show(fragment.getParentFragmentManager(), "StreamDialogEntry@create_playlist")
+    append_playlist(R.string.add_to_playlist, (fragment, item) -> {
+        PlaylistDialog.createCorrespondingDialog(
+                fragment.getContext(),
+                Collections.singletonList(new StreamEntity(item)),
+                dialog -> dialog.show(
+                        fragment.getParentFragmentManager(),
+                        "StreamDialogEntry@"
+                                + (dialog instanceof PlaylistAppendDialog ? "append" : "create")
+                                + "_playlist"
+                )
         );
     }),
 
@@ -108,16 +102,16 @@ public enum StreamDialogEntry {
         try {
             NavigationHelper.playWithKore(fragment.requireContext(), videoUrl);
         } catch (final Exception e) {
-            KoreUtils.showInstallKoreDialog(fragment.getActivity());
+            KoreUtils.showInstallKoreDialog(fragment.requireActivity());
         }
     }),
 
     share(R.string.share, (fragment, item) ->
-            ShareUtils.shareText(fragment.getContext(), item.getName(), item.getUrl(),
+            ShareUtils.shareText(fragment.requireContext(), item.getName(), item.getUrl(),
                     item.getThumbnailUrl())),
 
     open_in_browser(R.string.open_in_browser, (fragment, item) ->
-            ShareUtils.openUrlInBrowser(fragment.getContext(), item.getUrl())),
+            ShareUtils.openUrlInBrowser(fragment.requireContext(), item.getUrl())),
 
 
     mark_as_watched(R.string.mark_as_watched, (fragment, item) -> {
@@ -202,6 +196,16 @@ public enum StreamDialogEntry {
         void onClick(Fragment fragment, StreamInfoItem infoItem);
     }
 
+    public static boolean shouldAddMarkAsWatched(final StreamType streamType,
+                                                 final Context context) {
+        final boolean isWatchHistoryEnabled = PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.enable_watch_history_key), false);
+        return streamType != StreamType.AUDIO_LIVE_STREAM
+                && streamType != StreamType.LIVE_STREAM
+                && isWatchHistoryEnabled;
+    }
+
     /////////////////////////////////////////////
     // private method to open channel fragment //
     /////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/util/StreamTypeUtil.java

@@ -0,0 +1,24 @@
+package org.schabi.newpipe.util;
+
+import org.schabi.newpipe.extractor.stream.StreamType;
+
+/**
+ * Utility class for {@link org.schabi.newpipe.extractor.stream.StreamType}.
+ */
+public final class StreamTypeUtil {
+    private StreamTypeUtil() {
+        // No impl pls
+    }
+
+    /**
+     * Checks if the streamType is a livestream.
+     *
+     * @param streamType
+     * @return <code>true</code> when the streamType is a
+     * {@link StreamType#LIVE_STREAM} or {@link StreamType#AUDIO_LIVE_STREAM}
+     */
+    public static boolean isLiveStream(final StreamType streamType) {
+        return streamType == StreamType.LIVE_STREAM
+                || streamType == StreamType.AUDIO_LIVE_STREAM;
+    }
+}

app/src/main/java/org/schabi/newpipe/util/TLSSocketFactoryCompat.java

@@ -10,9 +10,8 @@ import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
 
-import static org.schabi.newpipe.MainActivity.DEBUG;
+import android.util.Log;
 
 
 /**
@@ -21,6 +20,7 @@ import static org.schabi.newpipe.MainActivity.DEBUG;
  */
 public class TLSSocketFactoryCompat extends SSLSocketFactory {
 
+    private static final String TAG = "TLSSocketFactoryCom";
 
     private static TLSSocketFactoryCompat instance = null;
 
@@ -32,14 +32,6 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
         internalSSLSocketFactory = context.getSocketFactory();
     }
 
-
-    public TLSSocketFactoryCompat(final TrustManager[] tm)
-            throws KeyManagementException, NoSuchAlgorithmException {
-        final SSLContext context = SSLContext.getInstance("TLS");
-        context.init(null, tm, new java.security.SecureRandom());
-        internalSSLSocketFactory = context.getSocketFactory();
-    }
-
     public static TLSSocketFactoryCompat getInstance()
             throws NoSuchAlgorithmException, KeyManagementException {
         if (instance != null) {
@@ -53,9 +45,7 @@ public class TLSSocketFactoryCompat extends SSLSocketFactory {
         try {
             HttpsURLConnection.setDefaultSSLSocketFactory(getInstance());
         } catch (NoSuchAlgorithmException | KeyManagementException e) {
-            if (DEBUG) {
-                e.printStackTrace();
-            }
+            Log.e(TAG, "Unable to setAsDefault", e);
         }
     }
 

app/src/main/java/org/schabi/newpipe/util/external_communication/ShareUtils.java

@@ -9,6 +9,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Build;
+import android.text.TextUtils;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -246,7 +247,7 @@ public final class ShareUtils {
         final Intent shareIntent = new Intent(Intent.ACTION_SEND);
         shareIntent.setType("text/plain");
         shareIntent.putExtra(Intent.EXTRA_TEXT, content);
-        if (!title.isEmpty()) {
+        if (!TextUtils.isEmpty(title)) {
             shareIntent.putExtra(Intent.EXTRA_TITLE, title);
             shareIntent.putExtra(Intent.EXTRA_SUBJECT, title);
         }

app/src/main/java/org/schabi/newpipe/views/NewPipeEditText.java

@@ -0,0 +1,45 @@
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
+
+import org.schabi.newpipe.util.NewPipeTextViewHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+
+/**
+ * An {@link AppCompatEditText} which uses {@link ShareUtils#shareText(Context, String, String)}
+ * when sharing selected text by using the {@code Share} command of the floating actions.
+ * <p>
+ * This allows NewPipe to show Android share sheet instead of EMUI share sheet when sharing text
+ * from {@link AppCompatEditText} on EMUI devices.
+ * </p>
+ */
+public class NewPipeEditText extends AppCompatEditText {
+
+    public NewPipeEditText(@NonNull final Context context) {
+        super(context);
+    }
+
+    public NewPipeEditText(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NewPipeEditText(@NonNull final Context context,
+                           @Nullable final AttributeSet attrs,
+                           final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public boolean onTextContextMenuItem(final int id) {
+        if (id == android.R.id.shareText) {
+            NewPipeTextViewHelper.shareSelectedTextWithShareUtils(this);
+            return true;
+        }
+        return super.onTextContextMenuItem(id);
+    }
+}

app/src/main/java/org/schabi/newpipe/views/NewPipeTextView.java

@@ -0,0 +1,45 @@
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import org.schabi.newpipe.util.NewPipeTextViewHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+
+/**
+ * An {@link AppCompatTextView} which uses {@link ShareUtils#shareText(Context, String, String)}
+ * when sharing selected text by using the {@code Share} command of the floating actions.
+ * <p>
+ * This allows NewPipe to show Android share sheet instead of EMUI share sheet when sharing text
+ * from {@link AppCompatTextView} on EMUI devices.
+ * </p>
+ */
+public class NewPipeTextView extends AppCompatTextView {
+
+    public NewPipeTextView(@NonNull final Context context) {
+        super(context);
+    }
+
+    public NewPipeTextView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public NewPipeTextView(@NonNull final Context context,
+                           @Nullable final AttributeSet attrs,
+                           final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public boolean onTextContextMenuItem(final int id) {
+        if (id == android.R.id.shareText) {
+            NewPipeTextViewHelper.shareSelectedTextWithShareUtils(this);
+            return true;
+        }
+        return super.onTextContextMenuItem(id);
+    }
+}

app/src/main/res/drawable-night/ic_campaign.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,11v2h4v-2h-4zM16,17.61c0.96,0.71 2.21,1.65 3.2,2.39 0.4,-0.53 0.8,-1.07 1.2,-1.6 -0.99,-0.74 -2.24,-1.68 -3.2,-2.4 -0.4,0.54 -0.8,1.08 -1.2,1.61zM20.4,5.6c-0.4,-0.53 -0.8,-1.07 -1.2,-1.6 -0.99,0.74 -2.24,1.68 -3.2,2.4 0.4,0.53 0.8,1.07 1.2,1.6 0.96,-0.72 2.21,-1.65 3.2,-2.4zM4,9c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v4h2v-4h1l5,3L13,6L8,9L4,9zM15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69c0.92,-0.81 1.5,-2.01 1.5,-3.34z" />
+</vector>

app/src/main/res/drawable-night/ic_drag_handle.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
+        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z" />
 </vector>

app/src/main/res/drawable-night/ic_edit.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
-</vector>

app/src/main/res/drawable-night/ic_expand_less.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
-</vector>

app/src/main/res/drawable-night/ic_import_export.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
-</vector>

app/src/main/res/drawable-night/ic_info_outline.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
+        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
 </vector>

app/src/main/res/drawable-night/ic_megaphone.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,8H4A2,2 0 0,0 2,10V14A2,2 0 0,0 4,16H5V20A1,1 0 0,0 6,21H8A1,1 0 0,0 9,20V16H12L17,20V4L12,8M21.5,12C21.5,13.71 20.54,15.26 19,16V8C20.53,8.75 21.5,10.3 21.5,12Z" />
-</vector>

app/src/main/res/drawable-night/ic_motorcycle.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19.44,9.03L15.41,5H11v2h3.59l2,2H5c-2.8,0 -5,2.2 -5,5s2.2,5 5,5c2.46,0 4.45,-1.69 4.9,-4h1.65l2.77,-2.77c-0.21,0.54 -0.32,1.14 -0.32,1.77 0,2.8 2.2,5 5,5s5,-2.2 5,-5c0,-2.65 -1.97,-4.77 -4.56,-4.97zM7.82,15C7.4,16.15 6.28,17 5,17c-1.63,0 -3,-1.37 -3,-3s1.37,-3 3,-3c1.28,0 2.4,0.85 2.82,2H5v2h2.82zM19,17c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z" />
+        android:pathData="M17.42,10L13.41,6H9V8H12.59L14.59,10H6.5C4,10 2,12 2,14.5C2,17 4,19 6.5,19C8.72,19 10.56,17.38 10.92,15.27L13.04,14C13,14.17 13,14.33 13,14.5C13,17 15,19 17.5,19C20,19 22,17 22,14.5C22,12 20,10 17.5,10M8.84,15.26C8.5,16.27 7.58,17 6.47,17C5.09,17 3.97,15.88 3.97,14.5C3.97,13.12 5.09,12 6.47,12C7.59,12 8.5,12.74 8.84,13.75H6V15.25L8.84,15.26M17.47,17C16.09,17 14.97,15.88 14.97,14.5C14.97,13.12 16.09,12 17.47,12A2.5,2.5 0 0,1 19.97,14.5A2.5,2.5 0 0,1 17.47,17Z" />
 </vector>

app/src/main/res/drawable-night/ic_palette.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
+        android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" />
 </vector>

app/src/main/res/drawable-night/ic_playlist_add.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z" />
+        android:pathData="M14,10H3v2h11V10zM14,6H3v2h11V6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2H18zM3,16h7v-2H3V16z" />
 </vector>

app/src/main/res/drawable-night/ic_playlist_add_check.xml

@@ -2,9 +2,18 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM2,16h8v-2L2,14v2zM21.5,11.5L23,13l-6.99,7 -4.51,-4.5L13,14l3.01,3 5.49,-5.5z" />
+        android:pathData="M3,10h11v2h-11z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,6h11v2h-11z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,14h7v2h-7z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.59,11.93l-4.25,4.24l-2.12,-2.12l-1.41,1.41l3.53,3.54l5.66,-5.66z" />
 </vector>

app/src/main/res/drawable-night/ic_search_add.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M15 5L15 7L8.41 7L20 18.59L18.59 20L7 8.41L7 15L5 15L5 5Z" />
+        android:pathData="M19,17.59L17.59,19L7,8.41V15H5V5H15V7H8.41L19,17.59Z" />
 </vector>

app/src/main/res/drawable-night/ic_settings.xml

@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" />
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
 </vector>

app/src/main/res/drawable-night/ic_thumb_down.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v1.91l0.01,0.01L1,14c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z" />
+        android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v2c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z" />
 </vector>

app/src/main/res/drawable-night/ic_thumb_up.xml

@@ -2,9 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z" />
+        android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" />
 </vector>

app/src/main/res/drawable-night/ic_watch_later.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13L11,7h1.5v5.2l4.5,2.7 -0.8,1.3z" />
+        android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z" />
 </vector>

app/src/main/res/drawable/ic_campaign.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,11v2h4v-2h-4zM16,17.61c0.96,0.71 2.21,1.65 3.2,2.39 0.4,-0.53 0.8,-1.07 1.2,-1.6 -0.99,-0.74 -2.24,-1.68 -3.2,-2.4 -0.4,0.54 -0.8,1.08 -1.2,1.61zM20.4,5.6c-0.4,-0.53 -0.8,-1.07 -1.2,-1.6 -0.99,0.74 -2.24,1.68 -3.2,2.4 0.4,0.53 0.8,1.07 1.2,1.6 0.96,-0.72 2.21,-1.65 3.2,-2.4zM4,9c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v4h2v-4h1l5,3L13,6L8,9L4,9zM15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69c0.92,-0.81 1.5,-2.01 1.5,-3.34z" />
+</vector>

app/src/main/res/drawable/ic_drag_handle.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
+        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z" />
 </vector>

app/src/main/res/drawable/ic_info_outline.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
+        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
 </vector>

app/src/main/res/drawable/ic_megaphone.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,8H4A2,2 0 0,0 2,10V14A2,2 0 0,0 4,16H5V20A1,1 0 0,0 6,21H8A1,1 0 0,0 9,20V16H12L17,20V4L12,8M21.5,12C21.5,13.71 20.54,15.26 19,16V8C20.53,8.75 21.5,10.3 21.5,12Z" />
-</vector>

app/src/main/res/drawable/ic_motorcycle.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19.44,9.03L15.41,5H11v2h3.59l2,2H5c-2.8,0 -5,2.2 -5,5s2.2,5 5,5c2.46,0 4.45,-1.69 4.9,-4h1.65l2.77,-2.77c-0.21,0.54 -0.32,1.14 -0.32,1.77 0,2.8 2.2,5 5,5s5,-2.2 5,-5c0,-2.65 -1.97,-4.77 -4.56,-4.97zM7.82,15C7.4,16.15 6.28,17 5,17c-1.63,0 -3,-1.37 -3,-3s1.37,-3 3,-3c1.28,0 2.4,0.85 2.82,2H5v2h2.82zM19,17c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z" />
+        android:pathData="M17.42,10L13.41,6H9V8H12.59L14.59,10H6.5C4,10 2,12 2,14.5C2,17 4,19 6.5,19C8.72,19 10.56,17.38 10.92,15.27L13.04,14C13,14.17 13,14.33 13,14.5C13,17 15,19 17.5,19C20,19 22,17 22,14.5C22,12 20,10 17.5,10M8.84,15.26C8.5,16.27 7.58,17 6.47,17C5.09,17 3.97,15.88 3.97,14.5C3.97,13.12 5.09,12 6.47,12C7.59,12 8.5,12.74 8.84,13.75H6V15.25L8.84,15.26M17.47,17C16.09,17 14.97,15.88 14.97,14.5C14.97,13.12 16.09,12 17.47,12A2.5,2.5 0 0,1 19.97,14.5A2.5,2.5 0 0,1 17.47,17Z" />
 </vector>

app/src/main/res/drawable/ic_next.xml

@@ -7,5 +7,5 @@
     <!-- Tint here is for preventing pixelization -->
     <path
         android:fillColor="#ffffff"
-        android:pathData="M5,19 L15,12 5,5ZM16,5v14h3v-14z" />
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
 </vector>