[AndroidTV] Fix selecting PeerTube instance in navigation drawer

Fixes #10020

.github/CONTRIBUTING.md

@@ -42,6 +42,10 @@ You'll see *exactly* what is sent, be able to add **your comments**, and then se
 * Create PRs that cover only **one specific issue/solution/bug**. Do not create PRs that are huge monoliths and could have been split into multiple independent contributions.
 * NewPipe uses [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor) to fetch data from services. If you need to change something there, you must test your changes in NewPipe. Telling NewPipe to use your extractor version can be accomplished by editing the `app/build.gradle` file: the comments under the "NewPipe libraries" section of `dependencies` will help you out.
 
+### Kotlin in NewPipe
+* NewPipe will remain mostly Java for time being
+* Contributions containing a simple conversion from Java to Kotlin should be avoided. Conversions to Kotlin should only be done if Kotlin actually brings improvements like bug fixes or better performance which are not, or only with much more effort, implementable in Java. The core team sees Java as an easier to learn and generally well adopted programming language.
+
 ### Creating a Pull Request (PR)
 
 * Make changes on a **separate branch** with a meaningful name, not on the _master_ branch or the _dev_ branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request (PR) on GitHub.
@@ -79,6 +83,6 @@ The [ktlint](https://github.com/pinterest/ktlint) plugin does the same job as ch
 
 ## Communication
 
-* You can use a Matrix account to join the NewPipe channel at [#newpipe:matrix.newpipe-ev.de](https://matrix.to/#/#newpipe:matrix.newpipe-ev.de). Some convenient clients, available both for phone and desktop, are listed at that link.
-* Alternatively, the #newpipe channel on Libera Chat (`ircs://irc.libera.chat:6697/newpipe`) can also be joined, as it is bridged to the Matrix room. [Click here for webchat](https://web.libera.chat/#newpipe)!
-* You can post your suggestions, changes, ideas etc. on either GitHub or Matrix (including via IRC).
+* The #newpipe channel on Libera Chat (`ircs://irc.libera.chat:6697/newpipe`) has the core team and other developers in it. [Click here for webchat](https://web.libera.chat/#newpipe)!
+* You can also use a Matrix account to join the NewPipe channel at [#newpipe:libera.chat](https://matrix.to/#/#newpipe:libera.chat). Some convenient clients, available both for phone and desktop, are listed at that link.
+* You can post your suggestions, changes, ideas etc. on either GitHub or IRC.

.github/DISCUSSION_TEMPLATE/questions.yml

@@ -1,3 +1,6 @@
+name: Question
+description: Ask about anything NewPipe-related
+labels: [question]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,7 +14,7 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I am able to reproduce the bug with the latest version given here: [CLICK THIS LINK](https://github.com/TeamNewPipe/NewPipe/releases/latest)."
+        - label: "I am able to reproduce the bug with the [latest version](https://github.com/TeamNewPipe/NewPipe/releases/latest)."
           required: true
         - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -3,9 +3,9 @@ contact_links:
   - name: ❓ Question
     url: https://github.com/TeamNewPipe/NewPipe/discussions/new?category=questions
     about: Ask about anything NewPipe-related
-  - name: 💬 Matrix
-    url: https://matrix.to/#/#newpipe:matrix.newpipe-ev.de
-    about: Chat with us via Matrix for quick Q/A
   - name: 💬 IRC
     url: https://web.libera.chat/#newpipe
     about: Chat with us via IRC for quick Q/A
+  - name: 💬 Matrix
+    url: https://matrix.to/#/#newpipe:libera.chat
+    about: Chat with us via Matrix for quick Q/A

.github/changed-lines-count-labeler.yml

@@ -1,17 +0,0 @@
-# Add 'size/small' label to any changes with less than 50 lines
-size/small:
-  max: 49
-
-# Add 'size/medium' label to any changes between 50 and 249 lines
-size/medium:
-  min: 50
-  max: 249
-
-# Add 'size/large' label to any changes between 250 and 749 lines
-size/large:
-  min: 250
-  max: 749
-
-# Add 'size/giant' label to any changes for more than 749 lines
-size/giant:
-  min: 750

.github/workflows/ci.yml

@@ -6,7 +6,6 @@ on:
     branches:
       - dev
       - master
-      - refactor
       - release**
     paths-ignore:
       - 'README.md'
@@ -37,8 +36,8 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
 
       - name: create and checkout branch
         # push events already checked out the branch
@@ -47,10 +46,10 @@ jobs:
           BRANCH: ${{ github.head_ref }}
         run: git checkout -B "$BRANCH"
 
-      - name: set up JDK
-        uses: actions/setup-java@v4
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 21
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
@@ -58,13 +57,14 @@ jobs:
         run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
 
       - name: Upload APK
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: app
           path: app/build/outputs/apk/debug/*.apk
 
   test-android:
-    runs-on: ubuntu-latest
+    # macos has hardware acceleration. See android-emulator-runner action
+    runs-on: macos-latest
     timeout-minutes: 20
     strategy:
       matrix:
@@ -80,18 +80,12 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: set up JDK
-        uses: actions/setup-java@v4
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 21
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
@@ -104,7 +98,7 @@ jobs:
           script: ./gradlew connectedCheck --stacktrace
 
       - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: android-test-report-api${{ matrix.api-level }}
@@ -117,19 +111,19 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 21
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar

.github/workflows/image-minimizer.js

@@ -17,8 +17,6 @@ module.exports = async ({github, context}) => {
         initialBody = context.payload.comment.body;
     } else if (context.eventName == 'issues') {
         initialBody = context.payload.issue.body;
-    } else if (context.eventName == 'pull_request') {
-        initialBody = context.payload.pull_request.body;
     } else {
         console.log('Aborting: No body found');
         return;
@@ -76,17 +74,9 @@ module.exports = async ({github, context}) => {
             repo: context.repo.repo,
             body: newBody
         });
-    } else if (context.eventName == 'pull_request') {
-        console.log('Updating pull request', context.payload.pull_request.number);
-        await github.rest.pulls.update({
-            pull_number: context.payload.pull_request.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: newBody
-        });
     }
 
-    // Async replace function from https://stackoverflow.com/a/48032528
+    // Asnyc replace function from https://stackoverflow.com/a/48032528
     async function replaceAsync(str, regex, asyncFn) {
         const promises = [];
         str.replace(regex, (match, ...args) => {
@@ -138,7 +128,7 @@ module.exports = async ({github, context}) => {
             if (shouldModify) {
                 wasMatchModified = true;
                 console.log(`Modifying match '${match}'`);
-                return `<img alt="${g1}" src="${g2}" width=${Math.min(600, Math.floor(IMG_MAX_HEIGHT_PX * probeAspectRatio))} />`;
+                return `<img alt="${g1}" src="${g2}" width=${Math.min(600, (IMG_MAX_HEIGHT_PX * probeAspectRatio).toFixed(0))} />`;
             }
 
             console.log(`Match '${match}' is ok/will not be modified`);

.github/workflows/image-minimizer.yml

@@ -5,8 +5,6 @@ on:
     types: [created, edited]
   issues:
     types: [opened, edited]
-  pull_request:
-    types: [opened, edited]
 
 permissions:
   issues: write
@@ -17,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
 
@@ -27,7 +25,7 @@ jobs:
         run: npm i probe-image-size@7.2.3 --ignore-scripts
 
       - name: Minimize simple images
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         timeout-minutes: 3
         with:
           script: |

.github/workflows/pr-labeler.yml

@@ -1,18 +0,0 @@
-name: "PR size labeler"
-on: [pull_request_target]
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  changed-lines-count-labeler:
-    runs-on: ubuntu-latest
-    name: Automatically labelling pull requests based on the changed lines count
-    permissions:
-      pull-requests: write
-    steps:
-    - name: Set a label
-      uses: TeamNewPipe/changed-lines-count-labeler@main
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        configuration-path: .github/changed-lines-count-labeler.yml

.gitignore

@@ -10,7 +10,6 @@ captures/
 *.class
 app/debug/
 app/release/
-.kotlin/
 
 # vscode / eclipse files
 *.classpath

.idea/icon.svg

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#CD201F;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g id="Alapkör">
-	<circle id="XMLID_23_" class="st0" cx="50" cy="50" r="50"/>
-</g>
-<g id="Elemek">
-	<path id="XMLID_19_" class="st1" d="M47,28.2c-9-5.3-15.3-9-15.3-9v61.7c0,0,30.4-18,52.3-30.9C72.1,43,57.7,34.5,47,28.2z"/>
-</g>
-<g id="Fedő">
-	<path id="XMLID_5_" class="st0" d="M48.4,40.1c-4.1-2.4-7-4.1-7-4.1V64c0,0,13.9-8.2,23.8-14C59.8,46.8,53.3,42.9,48.4,40.1z"/>
-	<rect id="XMLID_4_" x="41.4" y="55.6" class="st0" width="6.2" height="21"/>
-</g>
-<g id="Vonalak">
-</g>
-</svg>

README.md

@@ -13,19 +13,18 @@
 <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/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
 <a href="https://web.libera.chat/#newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
-<a href="https://matrix.to/#/#newpipe:matrix.newpipe-ev.de" alt="Matrix channel: #newpipe"><img src="https://img.shields.io/badge/Matrix%20chat-%23newpipe-blue"></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>
 </p>
 <hr>
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#supported-services">Supported Services</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#installation-and-updates">Installation and updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this document in other languages: [Deutsch](doc/README.de.md), [English](README.md), [Español](doc/README.es.md), [Français](doc/README.fr.md), [हिन्दी](doc/README.hi.md), [Italiano](doc/README.it.md), [한국어](doc/README.ko.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [ਪੰਜਾਬੀ ](doc/README.pa.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Soomaali](doc/README.so.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md), [অসমীয়া](doc/README.asm.md), [Српски](doc/README.sr.md)*
+*Read this in other languages: [English](README.md), [Español](doc/README.es.md), [हिन्दी](doc/README.hi.md), [한국어](doc/README.ko.md), [Soomaali](doc/README.so.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md).*
 
-> [!warning]
-> <b>THIS APP IS IN BETA, SO YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE IN OUR GITHUB REPOSITORY BY FILLING OUT THE ISSUE TEMPLATE.</b>
-> 
-> <b>PUTTING NEWPIPE, OR ANY FORK OF IT, INTO THE GOOGLE PLAY STORE VIOLATES THEIR TERMS AND CONDITIONS.</b>
+<b>WARNING: THIS APP IS IN BETA, SO YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE IN OUR GITHUB REPOSITORY BY FILLING OUT THE ISSUE TEMPLATE.</b>
+
+<b>PUTTING NEWPIPE, OR ANY FORK OF IT, INTO THE GOOGLE PLAY STORE VIOLATES THEIR TERMS AND CONDITIONS.</b>
 
 ## Screenshots
 
@@ -104,10 +103,10 @@ You can install NewPipe using one of the following methods:
 We recommend method 1 for most users. APKs installed using method 1 or 2 are compatible with each other (meaning that if you installed NewPipe using either method 1 or 2, you can also update NewPipe using the other), but not with those installed using method 3. This is due to the same signing key (ours) being used for 1 and 2, but a different signing key (F-Droid's) being used for 3. Building a debug APK using method 4 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app. When using method 5, each APK is signed with a different random key supplied by GitHub Actions, so you cannot even update it. You will have to backup and restore the app data each time you wish to use a new APK.
 
 In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality breaks and F-Droid doesn't have the latest update yet), we recommend following this procedure:
-1. Back up your data via Settings > Backup and Restore > Export Database so you keep your history, subscriptions, and playlists
+1. Back up your data via Settings > Content > Export Database so you keep your history, subscriptions, and playlists
 2. Uninstall NewPipe
 3. Download the APK from the new source and install it
-4. Import the data from step 1 via Settings > Backup and Restore > Import Database
+4. Import the data from step 1 via Settings > Content > Import Database
 
 <b>Note: when you're importing a database into the official app, always make sure that it is the one you exported _from_ the official app. If you import a database exported from an APK other than the official app, it may break things. Such an action is unsupported, and you should only do so when you're absolutely certain you know what you're doing.</b>
 
@@ -127,6 +126,16 @@ If you like NewPipe, you're welcome to send a donation. We prefer Liberapay, as
     <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>
   </tr>
+  <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><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></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>
+  </tr>
 </table>
 
 ## Privacy Policy

app/build.gradle

@@ -1,22 +1,18 @@
 import com.android.tools.profgen.ArtProfileKt
 import com.android.tools.profgen.ArtProfileSerializer
 import com.android.tools.profgen.DexFile
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 
 plugins {
-    alias libs.plugins.android.application
-    alias libs.plugins.kotlin.android
-    alias libs.plugins.kotlin.compose
-    alias libs.plugins.kotlin.kapt
-    alias libs.plugins.kotlin.parcelize
-    alias libs.plugins.checkstyle
-    alias libs.plugins.sonarqube
-    alias libs.plugins.hilt
-    alias libs.plugins.aboutlibraries
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "kotlin-parcelize"
+    id "checkstyle"
+    id "org.sonarqube" version "4.0.0.2929"
 }
 
 android {
-    compileSdk 34
+    compileSdk 33
     namespace 'org.schabi.newpipe'
 
     defaultConfig {
@@ -24,8 +20,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdk 21
         targetSdk 33
-        versionCode 999
-        versionName "0.27.2"
+        versionCode 993
+        versionName "0.25.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -42,7 +38,7 @@ android {
 
             // suffix the app id and the app name with git branch name
             def workingBranch = getGitWorkingBranch()
-            def normalizedWorkingBranch = ""
+            def normalizedWorkingBranch = workingBranch.replaceFirst("^[^A-Za-z]+", "").replaceAll("[^0-9A-Za-z]+", "")
             if (normalizedWorkingBranch.isEmpty() || workingBranch == "master" || workingBranch == "dev") {
                 // default values when branch name could not be determined or is master or dev
                 applicationIdSuffix ".debug"
@@ -54,6 +50,9 @@ android {
             }
         }
 
+        // Keep the release build type at the end of the list to override 'archivesBaseName' of
+        // debug build. This seems to be a Gradle bug, therefore
+        // TODO: update Gradle version
         release {
             if (System.properties.containsKey('packageSuffix')) {
                 applicationIdSuffix System.getProperty('packageSuffix')
@@ -88,11 +87,6 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17
-        freeCompilerArgs += [
-                // Generate default method implementations for interfaces
-                // https://kotlinlang.org/docs/java-to-kotlin-interop.html#default-methods-in-interfaces
-                '-Xjvm-default=all'
-        ]
     }
 
     sourceSets {
@@ -101,21 +95,35 @@ android {
 
     buildFeatures {
         viewBinding true
-        compose true
-        buildConfig true
     }
 
     packagingOptions {
         resources {
             // remove two files which belong to jsoup
             // no idea how they ended up in the META-INF dir...
-            excludes += ['META-INF/README.md', 'META-INF/CHANGES',
-                         // 'COPYRIGHT' belongs to RxJava...
-                         'META-INF/COPYRIGHT']
+            excludes += ['META-INF/README.md', 'META-INF/CHANGES']
         }
     }
 }
 
+ext {
+    checkstyleVersion = '10.12.1'
+
+    androidxLifecycleVersion = '2.5.1'
+    androidxRoomVersion = '2.4.3'
+    androidxWorkVersion = '2.7.1'
+
+    icepickVersion = '3.2.0'
+    exoPlayerVersion = '2.18.7'
+    googleAutoServiceVersion = '1.0.1'
+    groupieVersion = '2.10.1'
+    markwonVersion = '4.6.2'
+
+    leakCanaryVersion = '2.9.1'
+    stethoVersion = '1.6.0'
+    mockitoVersion = '4.0.0'
+}
+
 configurations {
     checkstyle
     ktlint
@@ -125,10 +133,10 @@ checkstyle {
     getConfigDirectory().set(rootProject.file("checkstyle"))
     ignoreFailures false
     showViolations true
-    toolVersion = libs.versions.checkstyle.get()
+    toolVersion = checkstyleVersion
 }
 
-tasks.register('runCheckstyle', Checkstyle) {
+task runCheckstyle(type: Checkstyle) {
     source 'src'
     include '**/*.java'
     exclude '**/gen/**'
@@ -149,7 +157,7 @@ tasks.register('runCheckstyle', Checkstyle) {
 def outputDir = "${project.buildDir}/reports/ktlint/"
 def inputFiles = project.fileTree(dir: "src", include: "**/*.kt")
 
-tasks.register('runKtlint', JavaExec) {
+task runKtlint(type: JavaExec) {
     inputs.files(inputFiles)
     outputs.dir(outputDir)
     getMainClass().set("com.pinterest.ktlint.Main")
@@ -158,7 +166,7 @@ tasks.register('runKtlint', JavaExec) {
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
-tasks.register('formatKtlint', JavaExec) {
+task formatKtlint(type: JavaExec) {
     inputs.files(inputFiles)
     outputs.dir(outputDir)
     getMainClass().set("com.pinterest.ktlint.Main")
@@ -167,14 +175,11 @@ tasks.register('formatKtlint', JavaExec) {
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
-apply from: 'check-dependencies.gradle'
-
 afterEvaluate {
     if (!System.properties.containsKey('skipFormatKtlint')) {
         preDebugBuild.dependsOn formatKtlint
     }
-    // preDebugBuild.dependsOn runCheckstyle,
-    preDebugBuild.dependsOn runKtlint, checkDependenciesOrder
+    preDebugBuild.dependsOn runCheckstyle, runKtlint
 }
 
 sonar {
@@ -185,159 +190,120 @@ sonar {
     }
 }
 
-kapt {
-    correctErrorTypes true
-}
-
-aboutLibraries {
-    // note: offline mode prevents the plugin from fetching licenses at build time, which would be
-    // harmful for reproducible builds
-    offlineMode = true
-    duplicationMode = DuplicateMode.MERGE
-}
-
 dependencies {
 /** Desugaring **/
-    coreLibraryDesugaring libs.desugar.jdk.libs.nio
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
 /** NewPipe libraries **/
-    implementation libs.teamnewpipe.nanojson
-    implementation libs.teamnewpipe.newpipe.extractor
-    implementation libs.teamnewpipe.nononsense.filepicker
-
-    implementation 'com.github.TeamNewPipe:NewPlayer'
+    // You can use a local version by uncommenting a few lines in settings.gradle
+    // Or you can use a commit you pushed to GitHub by just replacing TeamNewPipe with your GitHub
+    // 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:8495ad619e'
+    implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
-    checkstyle libs.tools.checkstyle
-    ktlint libs.tools.ktlint
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
+    ktlint 'com.pinterest:ktlint:0.45.2'
 
 /** Kotlin **/
-    implementation libs.kotlin.stdlib
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
 
 /** AndroidX **/
-    implementation libs.androidx.appcompat
-    implementation libs.androidx.cardview
-    implementation libs.androidx.constraintlayout
-    implementation libs.androidx.core.ktx
-    implementation libs.androidx.documentfile
-    implementation libs.androidx.fragment.compose
-    implementation libs.androidx.lifecycle.livedata
-    implementation libs.androidx.lifecycle.viewmodel
-    implementation libs.androidx.localbroadcastmanager
-    implementation libs.androidx.media
-    implementation libs.androidx.preference
-    implementation libs.androidx.recyclerview
-    implementation libs.androidx.room.runtime
-    implementation libs.androidx.room.rxjava3
-    kapt libs.androidx.room.compiler
-    implementation libs.androidx.swiperefreshlayout
-    implementation libs.androidx.work.runtime
-    implementation libs.androidx.work.rxjava3
-    implementation libs.androidx.material
-    implementation libs.androidx.media3.common
-    implementation libs.androidx.media3.exoplayer
-    implementation libs.androidx.media3.ui
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+    implementation 'androidx.media:media:1.6.0'
+    implementation 'androidx.preference:preference:1.2.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.work:work-runtime-ktx:${androidxWorkVersion}"
+    implementation "androidx.work:work-rxjava3:${androidxWorkVersion}"
+    implementation 'com.google.android.material:material:1.6.1'
 
 /** Third-party libraries **/
     // Instance state boilerplate elimination
-    implementation libs.livefront.bridge
-    implementation libs.android.state
-    kapt libs.android.state.processor
+    implementation "frankiesardo:icepick:${icepickVersion}"
+    kapt "frankiesardo:icepick-processor:${icepickVersion}"
 
     // HTML parser
-    implementation libs.jsoup
+    implementation "org.jsoup:jsoup:1.16.1"
 
     // HTTP client
-    implementation libs.okhttp
+    implementation "com.squareup.okhttp3:okhttp:4.11.0"
 
     // Media player
-    implementation libs.exoplayer.core
-    implementation libs.exoplayer.dash
-    implementation libs.exoplayer.database
-    implementation libs.exoplayer.datasource
-    implementation libs.exoplayer.hls
-    implementation libs.exoplayer.smoothstreaming
-    implementation libs.exoplayer.ui
-    implementation libs.extension.mediasession
+    implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-dash:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-database:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-datasource:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-hls:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-ui:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
     // Metadata generator for service descriptors
-    compileOnly libs.auto.service
-    kapt libs.auto.service.kapt
+    compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}"
+    kapt "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
 
     // Manager for complex RecyclerView layouts
-    implementation libs.lisawray.groupie
-    implementation libs.lisawray.groupie.viewbinding
+    implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
+    implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
 
     // Image loading
-    implementation libs.coil.compose
-    implementation libs.coil.network.okhttp
+    //noinspection GradleDependency --> 2.8 is the last version, not 2.71828!
+    implementation "com.squareup.picasso:picasso:2.8"
 
     // Markdown library for Android
-    implementation libs.markwon.core
-    implementation libs.markwon.linkify
+    implementation "io.noties.markwon:core:${markwonVersion}"
+    implementation "io.noties.markwon:linkify:${markwonVersion}"
 
     // Crash reporting
-    implementation libs.acra.core
+    implementation "ch.acra:acra-core:5.10.1"
 
     // Properly restarting
-    implementation libs.process.phoenix
+    implementation 'com.jakewharton:process-phoenix:2.1.2'
 
     // Reactive extensions for Java VM
-    implementation libs.rxjava3.rxjava
-    implementation libs.rxjava3.rxandroid
+    implementation "io.reactivex.rxjava3:rxjava:3.1.6"
+    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
     // RxJava binding APIs for Android UI widgets
-    implementation libs.rxbinding4.rxbinding
+    implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
 
     // Date and time formatting
-    implementation libs.prettytime
-
-    // Jetpack Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation libs.androidx.compose.material3
-    implementation libs.androidx.compose.adaptive
-    implementation libs.androidx.activity.compose
-    implementation libs.androidx.compose.ui.tooling.preview
-    implementation libs.androidx.lifecycle.viewmodel.compose
-    implementation libs.androidx.compose.ui.text // Needed for parsing HTML to AnnotatedString
-    implementation libs.androidx.compose.material.icons.extended
-
-    // Jetpack Compose related dependencies
-    implementation libs.androidx.paging.compose
-    implementation libs.androidx.navigation.compose
-
-    // Coroutines interop
-    implementation libs.kotlinx.coroutines.rx3
-
-    // Library loading for About screen
-    implementation libs.aboutlibraries.compose.m3
-
-    // Hilt
-    implementation libs.hilt.android
-    kapt(libs.hilt.compiler)
-
-    // Scroll
-    implementation libs.lazycolumnscrollbar
+    implementation "org.ocpsoft.prettytime:prettytime:5.0.6.Final"
 
 /** Debugging **/
     // Memory leak detection
-    debugImplementation libs.leakcanary.object.watcher
-    debugImplementation libs.leakcanary.plumber.android
-    debugImplementation libs.leakcanary.android.core
+    implementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}"
+    implementation "com.squareup.leakcanary:plumber-android:${leakCanaryVersion}"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
     // Debug bridge for Android
-    debugImplementation libs.stetho
-    debugImplementation libs.stetho.okhttp3
-
-    // Jetpack Compose
-    debugImplementation libs.androidx.compose.ui.tooling
+    debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
 
 /** Testing **/
-    testImplementation libs.junit
-    testImplementation libs.mockito.core
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.mockito:mockito-core:${mockitoVersion}"
+    testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
 
-    androidTestImplementation libs.androidx.junit
-    androidTestImplementation libs.androidx.runner
-    androidTestImplementation libs.androidx.room.testing
-    androidTestImplementation libs.assertj.core
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test:runner:1.5.2"
+    androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
+    androidTestImplementation "org.assertj:assertj-core:3.23.1"
 }
 
 static String getGitWorkingBranch() {

app/check-dependencies.gradle

@@ -1,48 +0,0 @@
-tasks.register('checkDependenciesOrder') {
-    group = 'verification'
-    description = 'Checks that each section in libs.versions.toml is sorted alphabetically'
-
-    def tomlFile = file('../gradle/libs.versions.toml')
-
-    doLast {
-        if (!tomlFile.exists()) {
-            throw new GradleException('TOML file not found')
-        }
-
-        def lines = tomlFile.readLines()
-        def nonSortedBlocks = []
-        def currentBlock = []
-        def prevLine = ''
-        def prevIndex = 0
-
-        lines.eachWithIndex { line, lineIndex ->
-            if (line.trim() && !line.startsWith('#')) {
-                if (line.startsWith('[')) {
-                    prevLine = ''
-                } else {
-                    def currIndex = lineIndex + 1
-                    if (prevLine > line) {
-                        if (currentBlock && currentBlock[-1] == "${prevIndex}: ${prevLine}") {
-                            currentBlock.add("${currIndex}: ${line}")
-                        } else {
-                            if (!currentBlock.isEmpty()) {
-                                nonSortedBlocks.add(currentBlock)
-                                currentBlock = []
-                            }
-                            currentBlock.add("${prevIndex}: ${prevLine}")
-                            currentBlock.add("${currIndex}: ${line}")
-                        }
-                    }
-                    prevLine = line
-                    prevIndex = lineIndex + 1
-                }
-            }
-        }
-
-        if (!currentBlock.isEmpty()) {
-            nonSortedBlocks.add(currentBlock)
-            throw new GradleException("The following lines were not sorted:\n" +
-                    nonSortedBlocks.collect { it.join("\n") }.join("\n\n"))
-        }
-    }
-}

app/proguard-rules.pro

@@ -7,12 +7,20 @@
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
 -keep class org.mozilla.javascript.** { *; }
 -keep class org.mozilla.classfile.ClassFileWriter
--dontwarn org.mozilla.javascript.JavaToJSONConverters
 -dontwarn org.mozilla.javascript.tools.**
 
 ## Rules for ExoPlayer
 -keep class com.google.android.exoplayer2.** { *; }
 
+## Rules for Icepick. Copy pasted from https://github.com/frankiesardo/icepick
+-dontwarn icepick.**
+-keep class icepick.** { *; }
+-keep class **$$Icepick { *; }
+-keepclasseswithmembernames class * {
+    @icepick.* <fields>;
+}
+-keepnames class * { @icepick.State *;}
+
 ## Rules for OkHttp. Copy pasted from https://github.com/square/okhttp
 -dontwarn okhttp3.**
 -dontwarn okio.**

app/schemas/org.schabi.newpipe.database.AppDatabase/8.json

@@ -1,737 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 8,
-    "identityHash": "012fc8e7ad3333f1597347f34e76a513",
-    "entities": [
-      {
-        "tableName": "subscriptions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `url` TEXT, `name` TEXT, `avatar_url` TEXT, `subscriber_count` INTEGER, `description` TEXT, `notification_mode` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatarUrl",
-            "columnName": "avatar_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "subscriberCount",
-            "columnName": "subscriber_count",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "notificationMode",
-            "columnName": "notification_mode",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_subscriptions_service_id_url",
-            "unique": true,
-            "columnNames": [
-              "service_id",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_subscriptions_service_id_url` ON `${TABLE_NAME}` (`service_id`, `url`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "search_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`creation_date` INTEGER, `service_id` INTEGER NOT NULL, `search` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "creationDate",
-            "columnName": "creation_date",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "search",
-            "columnName": "search",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_search_history_search",
-            "unique": false,
-            "columnNames": [
-              "search"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_search_history_search` ON `${TABLE_NAME}` (`search`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "streams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `url` TEXT NOT NULL, `title` TEXT NOT NULL, `stream_type` TEXT NOT NULL, `duration` INTEGER NOT NULL, `uploader` TEXT NOT NULL, `uploader_url` TEXT, `thumbnail_url` TEXT, `view_count` INTEGER, `textual_upload_date` TEXT, `upload_date` INTEGER, `is_upload_date_approximation` INTEGER)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "streamType",
-            "columnName": "stream_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "duration",
-            "columnName": "duration",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "uploader",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "uploaderUrl",
-            "columnName": "uploader_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbnailUrl",
-            "columnName": "thumbnail_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "viewCount",
-            "columnName": "view_count",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "textualUploadDate",
-            "columnName": "textual_upload_date",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploadDate",
-            "columnName": "upload_date",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isUploadDateApproximation",
-            "columnName": "is_upload_date_approximation",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_streams_service_id_url",
-            "unique": true,
-            "columnNames": [
-              "service_id",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_streams_service_id_url` ON `${TABLE_NAME}` (`service_id`, `url`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "stream_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stream_id` INTEGER NOT NULL, `access_date` INTEGER NOT NULL, `repeat_count` INTEGER NOT NULL, PRIMARY KEY(`stream_id`, `access_date`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "streamUid",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessDate",
-            "columnName": "access_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "repeatCount",
-            "columnName": "repeat_count",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "stream_id",
-            "access_date"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_stream_history_stream_id",
-            "unique": false,
-            "columnNames": [
-              "stream_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_stream_history_stream_id` ON `${TABLE_NAME}` (`stream_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "stream_state",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stream_id` INTEGER NOT NULL, `progress_time` INTEGER NOT NULL, PRIMARY KEY(`stream_id`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "streamUid",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "progressMillis",
-            "columnName": "progress_time",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "stream_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playlists",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `is_thumbnail_permanent` INTEGER NOT NULL, `thumbnail_stream_id` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isThumbnailPermanent",
-            "columnName": "is_thumbnail_permanent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "thumbnailStreamId",
-            "columnName": "thumbnail_stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_playlists_name",
-            "unique": false,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_playlists_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "playlist_stream_join",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`playlist_id` INTEGER NOT NULL, `stream_id` INTEGER NOT NULL, `join_index` INTEGER NOT NULL, PRIMARY KEY(`playlist_id`, `join_index`), FOREIGN KEY(`playlist_id`) REFERENCES `playlists`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "playlistUid",
-            "columnName": "playlist_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "streamUid",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "index",
-            "columnName": "join_index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "playlist_id",
-            "join_index"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_playlist_stream_join_playlist_id_join_index",
-            "unique": true,
-            "columnNames": [
-              "playlist_id",
-              "join_index"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_playlist_stream_join_playlist_id_join_index` ON `${TABLE_NAME}` (`playlist_id`, `join_index`)"
-          },
-          {
-            "name": "index_playlist_stream_join_stream_id",
-            "unique": false,
-            "columnNames": [
-              "stream_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_playlist_stream_join_stream_id` ON `${TABLE_NAME}` (`stream_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "playlists",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "playlist_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          },
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "remote_playlists",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `name` TEXT, `url` TEXT, `thumbnail_url` TEXT, `uploader` TEXT, `stream_count` INTEGER)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbnailUrl",
-            "columnName": "thumbnail_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "uploader",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "streamCount",
-            "columnName": "stream_count",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_remote_playlists_name",
-            "unique": false,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_remote_playlists_name` ON `${TABLE_NAME}` (`name`)"
-          },
-          {
-            "name": "index_remote_playlists_service_id_url",
-            "unique": true,
-            "columnNames": [
-              "service_id",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_remote_playlists_service_id_url` ON `${TABLE_NAME}` (`service_id`, `url`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "feed",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stream_id` INTEGER NOT NULL, `subscription_id` INTEGER NOT NULL, PRIMARY KEY(`stream_id`, `subscription_id`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`subscription_id`) REFERENCES `subscriptions`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "streamId",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscription_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "stream_id",
-            "subscription_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_feed_subscription_id",
-            "unique": false,
-            "columnNames": [
-              "subscription_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_subscription_id` ON `${TABLE_NAME}` (`subscription_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          },
-          {
-            "table": "subscriptions",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "subscription_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "feed_group",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `icon_id` INTEGER NOT NULL, `sort_order` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "icon",
-            "columnName": "icon_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sortOrder",
-            "columnName": "sort_order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_feed_group_sort_order",
-            "unique": false,
-            "columnNames": [
-              "sort_order"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_group_sort_order` ON `${TABLE_NAME}` (`sort_order`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "feed_group_subscription_join",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`group_id` INTEGER NOT NULL, `subscription_id` INTEGER NOT NULL, PRIMARY KEY(`group_id`, `subscription_id`), FOREIGN KEY(`group_id`) REFERENCES `feed_group`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`subscription_id`) REFERENCES `subscriptions`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "feedGroupId",
-            "columnName": "group_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscription_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "group_id",
-            "subscription_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_feed_group_subscription_join_subscription_id",
-            "unique": false,
-            "columnNames": [
-              "subscription_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_group_subscription_join_subscription_id` ON `${TABLE_NAME}` (`subscription_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "feed_group",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "group_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          },
-          {
-            "table": "subscriptions",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "subscription_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "feed_last_updated",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`subscription_id` INTEGER NOT NULL, `last_updated` INTEGER, PRIMARY KEY(`subscription_id`), FOREIGN KEY(`subscription_id`) REFERENCES `subscriptions`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscription_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastUpdated",
-            "columnName": "last_updated",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "subscription_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "subscriptions",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "subscription_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '012fc8e7ad3333f1597347f34e76a513')"
-    ]
-  }
-}

app/schemas/org.schabi.newpipe.database.AppDatabase/9.json

@@ -1,730 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 9,
-    "identityHash": "7591e8039faa74d8c0517dc867af9d3e",
-    "entities": [
-      {
-        "tableName": "subscriptions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `url` TEXT, `name` TEXT, `avatar_url` TEXT, `subscriber_count` INTEGER, `description` TEXT, `notification_mode` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatarUrl",
-            "columnName": "avatar_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "subscriberCount",
-            "columnName": "subscriber_count",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "notificationMode",
-            "columnName": "notification_mode",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_subscriptions_service_id_url",
-            "unique": true,
-            "columnNames": [
-              "service_id",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_subscriptions_service_id_url` ON `${TABLE_NAME}` (`service_id`, `url`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "search_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`creation_date` INTEGER, `service_id` INTEGER NOT NULL, `search` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "creationDate",
-            "columnName": "creation_date",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "search",
-            "columnName": "search",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_search_history_search",
-            "unique": false,
-            "columnNames": [
-              "search"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_search_history_search` ON `${TABLE_NAME}` (`search`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "streams",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `url` TEXT NOT NULL, `title` TEXT NOT NULL, `stream_type` TEXT NOT NULL, `duration` INTEGER NOT NULL, `uploader` TEXT NOT NULL, `uploader_url` TEXT, `thumbnail_url` TEXT, `view_count` INTEGER, `textual_upload_date` TEXT, `upload_date` INTEGER, `is_upload_date_approximation` INTEGER)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "streamType",
-            "columnName": "stream_type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "duration",
-            "columnName": "duration",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "uploader",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "uploaderUrl",
-            "columnName": "uploader_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbnailUrl",
-            "columnName": "thumbnail_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "viewCount",
-            "columnName": "view_count",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "textualUploadDate",
-            "columnName": "textual_upload_date",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploadDate",
-            "columnName": "upload_date",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isUploadDateApproximation",
-            "columnName": "is_upload_date_approximation",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_streams_service_id_url",
-            "unique": true,
-            "columnNames": [
-              "service_id",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_streams_service_id_url` ON `${TABLE_NAME}` (`service_id`, `url`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "stream_history",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stream_id` INTEGER NOT NULL, `access_date` INTEGER NOT NULL, `repeat_count` INTEGER NOT NULL, PRIMARY KEY(`stream_id`, `access_date`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "streamUid",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "accessDate",
-            "columnName": "access_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "repeatCount",
-            "columnName": "repeat_count",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "stream_id",
-            "access_date"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_stream_history_stream_id",
-            "unique": false,
-            "columnNames": [
-              "stream_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_stream_history_stream_id` ON `${TABLE_NAME}` (`stream_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "stream_state",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stream_id` INTEGER NOT NULL, `progress_time` INTEGER NOT NULL, PRIMARY KEY(`stream_id`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "streamUid",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "progressMillis",
-            "columnName": "progress_time",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "stream_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "playlists",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `is_thumbnail_permanent` INTEGER NOT NULL, `thumbnail_stream_id` INTEGER NOT NULL, `display_index` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isThumbnailPermanent",
-            "columnName": "is_thumbnail_permanent",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "thumbnailStreamId",
-            "columnName": "thumbnail_stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "displayIndex",
-            "columnName": "display_index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "playlist_stream_join",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`playlist_id` INTEGER NOT NULL, `stream_id` INTEGER NOT NULL, `join_index` INTEGER NOT NULL, PRIMARY KEY(`playlist_id`, `join_index`), FOREIGN KEY(`playlist_id`) REFERENCES `playlists`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "playlistUid",
-            "columnName": "playlist_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "streamUid",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "index",
-            "columnName": "join_index",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "playlist_id",
-            "join_index"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_playlist_stream_join_playlist_id_join_index",
-            "unique": true,
-            "columnNames": [
-              "playlist_id",
-              "join_index"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_playlist_stream_join_playlist_id_join_index` ON `${TABLE_NAME}` (`playlist_id`, `join_index`)"
-          },
-          {
-            "name": "index_playlist_stream_join_stream_id",
-            "unique": false,
-            "columnNames": [
-              "stream_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_playlist_stream_join_stream_id` ON `${TABLE_NAME}` (`stream_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "playlists",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "playlist_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          },
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "remote_playlists",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `name` TEXT, `url` TEXT, `thumbnail_url` TEXT, `uploader` TEXT, `display_index` INTEGER NOT NULL, `stream_count` INTEGER)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "serviceId",
-            "columnName": "service_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbnailUrl",
-            "columnName": "thumbnail_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "uploader",
-            "columnName": "uploader",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "displayIndex",
-            "columnName": "display_index",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "streamCount",
-            "columnName": "stream_count",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_remote_playlists_service_id_url",
-            "unique": true,
-            "columnNames": [
-              "service_id",
-              "url"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_remote_playlists_service_id_url` ON `${TABLE_NAME}` (`service_id`, `url`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "feed",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stream_id` INTEGER NOT NULL, `subscription_id` INTEGER NOT NULL, PRIMARY KEY(`stream_id`, `subscription_id`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`subscription_id`) REFERENCES `subscriptions`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "streamId",
-            "columnName": "stream_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscription_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "stream_id",
-            "subscription_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_feed_subscription_id",
-            "unique": false,
-            "columnNames": [
-              "subscription_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_subscription_id` ON `${TABLE_NAME}` (`subscription_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "streams",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "stream_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          },
-          {
-            "table": "subscriptions",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "subscription_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "feed_group",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `icon_id` INTEGER NOT NULL, `sort_order` INTEGER NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "uid",
-            "columnName": "uid",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "icon",
-            "columnName": "icon_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "sortOrder",
-            "columnName": "sort_order",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "uid"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_feed_group_sort_order",
-            "unique": false,
-            "columnNames": [
-              "sort_order"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_group_sort_order` ON `${TABLE_NAME}` (`sort_order`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "feed_group_subscription_join",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`group_id` INTEGER NOT NULL, `subscription_id` INTEGER NOT NULL, PRIMARY KEY(`group_id`, `subscription_id`), FOREIGN KEY(`group_id`) REFERENCES `feed_group`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`subscription_id`) REFERENCES `subscriptions`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "feedGroupId",
-            "columnName": "group_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscription_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "group_id",
-            "subscription_id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_feed_group_subscription_join_subscription_id",
-            "unique": false,
-            "columnNames": [
-              "subscription_id"
-            ],
-            "orders": [],
-            "createSql": "CREATE INDEX IF NOT EXISTS `index_feed_group_subscription_join_subscription_id` ON `${TABLE_NAME}` (`subscription_id`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "feed_group",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "group_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          },
-          {
-            "table": "subscriptions",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "subscription_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "feed_last_updated",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`subscription_id` INTEGER NOT NULL, `last_updated` INTEGER, PRIMARY KEY(`subscription_id`), FOREIGN KEY(`subscription_id`) REFERENCES `subscriptions`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)",
-        "fields": [
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscription_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "lastUpdated",
-            "columnName": "last_updated",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": false,
-          "columnNames": [
-            "subscription_id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "subscriptions",
-            "onDelete": "CASCADE",
-            "onUpdate": "CASCADE",
-            "columns": [
-              "subscription_id"
-            ],
-            "referencedColumns": [
-              "uid"
-            ]
-          }
-        ]
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7591e8039faa74d8c0517dc867af9d3e')"
-    ]
-  }
-}

app/src/androidTest/java/org/schabi/newpipe/database/DatabaseMigrationTest.kt

@@ -4,18 +4,15 @@ import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNull
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity
-import org.schabi.newpipe.extractor.ServiceList
 import org.schabi.newpipe.extractor.stream.StreamType
 
 @RunWith(AndroidJUnit4::class)
@@ -24,23 +21,20 @@ class DatabaseMigrationTest {
         private const val DEFAULT_SERVICE_ID = 0
         private const val DEFAULT_URL = "https://www.youtube.com/watch?v=cDphUib5iG4"
         private const val DEFAULT_TITLE = "Test Title"
-        private const val DEFAULT_NAME = "Test Name"
         private val DEFAULT_TYPE = StreamType.VIDEO_STREAM
         private const val DEFAULT_DURATION = 480L
         private const val DEFAULT_UPLOADER_NAME = "Uploader Test"
         private const val DEFAULT_THUMBNAIL = "https://example.com/example.jpg"
 
-        private const val DEFAULT_SECOND_SERVICE_ID = 1
+        private const val DEFAULT_SECOND_SERVICE_ID = 0
         private const val DEFAULT_SECOND_URL = "https://www.youtube.com/watch?v=ncQU6iBn5Fc"
-
-        private const val DEFAULT_THIRD_SERVICE_ID = 2
-        private const val DEFAULT_THIRD_URL = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
     }
 
     @get:Rule
     val testHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java
+        AppDatabase::class.java.canonicalName,
+        FrameworkSQLiteOpenHelperFactory()
     )
 
     @Test
@@ -114,20 +108,6 @@ class DatabaseMigrationTest {
             Migrations.MIGRATION_6_7
         )
 
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME,
-            Migrations.DB_VER_8,
-            true,
-            Migrations.MIGRATION_7_8
-        )
-
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME,
-            Migrations.DB_VER_9,
-            true,
-            Migrations.MIGRATION_8_9
-        )
-
         val migratedDatabaseV3 = getMigratedDatabase()
         val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst()
 
@@ -162,157 +142,6 @@ class DatabaseMigrationTest {
         assertNull(secondStreamFromMigratedDatabase.isUploadDateApproximation)
     }
 
-    @Test
-    fun migrateDatabaseFrom7to8() {
-        val databaseInV7 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_7)
-
-        val defaultSearch1 = " abc "
-        val defaultSearch2 = " abc"
-
-        val serviceId = DEFAULT_SERVICE_ID // YouTube
-        // Use id different to YouTube because two searches with the same query
-        // but different service are considered not equal.
-        val otherServiceId = ServiceList.SoundCloud.serviceId
-
-        databaseInV7.run {
-            insert(
-                "search_history", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", serviceId)
-                    put("search", defaultSearch1)
-                }
-            )
-            insert(
-                "search_history", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", serviceId)
-                    put("search", defaultSearch2)
-                }
-            )
-            insert(
-                "search_history", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", otherServiceId)
-                    put("search", defaultSearch1)
-                }
-            )
-            insert(
-                "search_history", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", otherServiceId)
-                    put("search", defaultSearch2)
-                }
-            )
-            close()
-        }
-
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME, Migrations.DB_VER_8,
-            true, Migrations.MIGRATION_7_8
-        )
-
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME, Migrations.DB_VER_9,
-            true, Migrations.MIGRATION_8_9
-        )
-
-        val migratedDatabaseV8 = getMigratedDatabase()
-        val listFromDB = migratedDatabaseV8.searchHistoryDAO().all.blockingFirst()
-
-        assertEquals(2, listFromDB.size)
-        assertEquals("abc", listFromDB[0].search)
-        assertEquals("abc", listFromDB[1].search)
-        assertNotEquals(listFromDB[0].serviceId, listFromDB[1].serviceId)
-    }
-
-    @Test
-    fun migrateDatabaseFrom8to9() {
-        val databaseInV8 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_8)
-
-        val localUid1: Long
-        val localUid2: Long
-        val remoteUid1: Long
-        val remoteUid2: Long
-        databaseInV8.run {
-            localUid1 = insert(
-                "playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("name", DEFAULT_NAME + "1")
-                    put("is_thumbnail_permanent", false)
-                    put("thumbnail_stream_id", -1)
-                }
-            )
-            localUid2 = insert(
-                "playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("name", DEFAULT_NAME + "2")
-                    put("is_thumbnail_permanent", false)
-                    put("thumbnail_stream_id", -1)
-                }
-            )
-            delete(
-                "playlists", "uid = ?",
-                Array(1) { localUid1 }
-            )
-            remoteUid1 = insert(
-                "remote_playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", DEFAULT_SERVICE_ID)
-                    put("url", DEFAULT_URL)
-                }
-            )
-            remoteUid2 = insert(
-                "remote_playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", DEFAULT_SECOND_SERVICE_ID)
-                    put("url", DEFAULT_SECOND_URL)
-                }
-            )
-            delete(
-                "remote_playlists", "uid = ?",
-                Array(1) { remoteUid2 }
-            )
-            close()
-        }
-
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME,
-            Migrations.DB_VER_9,
-            true,
-            Migrations.MIGRATION_8_9
-        )
-
-        val migratedDatabaseV9 = getMigratedDatabase()
-        var localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
-        var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
-
-        assertEquals(1, localListFromDB.size)
-        assertEquals(localUid2, localListFromDB[0].uid)
-        assertEquals(-1, localListFromDB[0].displayIndex)
-        assertEquals(1, remoteListFromDB.size)
-        assertEquals(remoteUid1, remoteListFromDB[0].uid)
-        assertEquals(-1, remoteListFromDB[0].displayIndex)
-
-        val localUid3 = migratedDatabaseV9.playlistDAO().insert(
-            PlaylistEntity(DEFAULT_NAME + "3", false, -1, -1)
-        )
-        val remoteUid3 = migratedDatabaseV9.playlistRemoteDAO().insert(
-            PlaylistRemoteEntity(
-                DEFAULT_THIRD_SERVICE_ID, DEFAULT_NAME, DEFAULT_THIRD_URL,
-                DEFAULT_THUMBNAIL, DEFAULT_UPLOADER_NAME, -1, 10
-            )
-        )
-
-        localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
-        remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
-        assertEquals(2, localListFromDB.size)
-        assertEquals(localUid3, localListFromDB[1].uid)
-        assertEquals(-1, localListFromDB[1].displayIndex)
-        assertEquals(2, remoteListFromDB.size)
-        assertEquals(remoteUid3, remoteListFromDB[1].uid)
-        assertEquals(-1, remoteListFromDB[1].displayIndex)
-    }
-
     private fun getMigratedDatabase(): AppDatabase {
         val database: AppDatabase = Room.databaseBuilder(
             ApplicationProvider.getApplicationContext(),

app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt

@@ -1,130 +0,0 @@
-package org.schabi.newpipe.database
-
-import android.content.Context
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import io.reactivex.rxjava3.core.Single
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Before
-import org.junit.Test
-import org.schabi.newpipe.database.feed.dao.FeedDAO
-import org.schabi.newpipe.database.feed.model.FeedEntity
-import org.schabi.newpipe.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.database.stream.StreamWithState
-import org.schabi.newpipe.database.stream.dao.StreamDAO
-import org.schabi.newpipe.database.stream.model.StreamEntity
-import org.schabi.newpipe.database.subscription.SubscriptionDAO
-import org.schabi.newpipe.database.subscription.SubscriptionEntity
-import org.schabi.newpipe.extractor.ServiceList
-import org.schabi.newpipe.extractor.channel.ChannelInfo
-import org.schabi.newpipe.extractor.stream.StreamType
-import java.io.IOException
-import java.time.OffsetDateTime
-import kotlin.streams.toList
-
-class FeedDAOTest {
-    private lateinit var db: AppDatabase
-    private lateinit var feedDAO: FeedDAO
-    private lateinit var streamDAO: StreamDAO
-    private lateinit var subscriptionDAO: SubscriptionDAO
-
-    private val serviceId = ServiceList.YouTube.serviceId
-
-    private val stream1 = StreamEntity(1, serviceId, "https://youtube.com/watch?v=1", "stream 1", StreamType.VIDEO_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-01", OffsetDateTime.parse("2023-01-01T00:00:00Z"))
-    private val stream2 = StreamEntity(2, serviceId, "https://youtube.com/watch?v=2", "stream 2", StreamType.VIDEO_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-02", OffsetDateTime.parse("2023-01-02T00:00:00Z"))
-    private val stream3 = StreamEntity(3, serviceId, "https://youtube.com/watch?v=3", "stream 3", StreamType.LIVE_STREAM, 1000, "channel-1", "https://youtube.com/channel/1", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-01-03", OffsetDateTime.parse("2023-01-03T00:00:00Z"))
-    private val stream4 = StreamEntity(4, serviceId, "https://youtube.com/watch?v=4", "stream 4", StreamType.VIDEO_STREAM, 1000, "channel-2", "https://youtube.com/channel/2", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-10", OffsetDateTime.parse("2023-08-10T00:00:00Z"))
-    private val stream5 = StreamEntity(5, serviceId, "https://youtube.com/watch?v=5", "stream 5", StreamType.VIDEO_STREAM, 1000, "channel-2", "https://youtube.com/channel/2", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-20", OffsetDateTime.parse("2023-08-20T00:00:00Z"))
-    private val stream6 = StreamEntity(6, serviceId, "https://youtube.com/watch?v=6", "stream 6", StreamType.VIDEO_STREAM, 1000, "channel-3", "https://youtube.com/channel/3", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-09-01", OffsetDateTime.parse("2023-09-01T00:00:00Z"))
-    private val stream7 = StreamEntity(7, serviceId, "https://youtube.com/watch?v=7", "stream 7", StreamType.VIDEO_STREAM, 1000, "channel-4", "https://youtube.com/channel/4", "https://i.ytimg.com/vi/1/hqdefault.jpg", 100, "2023-08-10", OffsetDateTime.parse("2023-08-10T00:00:00Z"))
-
-    private val allStreams = listOf(
-        stream1, stream2, stream3, stream4, stream5, stream6, stream7
-    )
-
-    @Before
-    fun createDb() {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        db = Room.inMemoryDatabaseBuilder(
-            context, AppDatabase::class.java
-        ).build()
-        feedDAO = db.feedDAO()
-        streamDAO = db.streamDAO()
-        subscriptionDAO = db.subscriptionDAO()
-    }
-
-    @After
-    @Throws(IOException::class)
-    fun closeDb() {
-        db.close()
-    }
-
-    @Test
-    fun testUnlinkStreamsOlderThan_KeepOne() {
-        setupUnlinkDelete("2023-08-15T00:00:00Z")
-        val streams = feedDAO.getStreams(
-            FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null
-        )
-            .blockingGet()
-        val allowedStreams = listOf(stream3, stream5, stream6, stream7)
-        assertEqual(streams, allowedStreams)
-    }
-
-    @Test
-    fun testUnlinkStreamsOlderThan_KeepMultiple() {
-        setupUnlinkDelete("2023-08-01T00:00:00Z")
-        val streams = feedDAO.getStreams(
-            FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null
-        )
-            .blockingGet()
-        val allowedStreams = listOf(stream3, stream4, stream5, stream6, stream7)
-        assertEqual(streams, allowedStreams)
-    }
-
-    private fun assertEqual(streams: List<StreamWithState>?, allowedStreams: List<StreamEntity>) {
-        assertNotNull(streams)
-        assertEquals(
-            allowedStreams,
-            streams!!
-                .map { it.stream }
-                .sortedBy { it.uid }
-                .toList()
-        )
-    }
-
-    private fun setupUnlinkDelete(time: String) {
-        clearAndFillTables()
-        Single.fromCallable {
-            feedDAO.unlinkStreamsOlderThan(OffsetDateTime.parse(time))
-        }.blockingSubscribe()
-        Single.fromCallable {
-            streamDAO.deleteOrphans()
-        }.blockingSubscribe()
-    }
-
-    private fun clearAndFillTables() {
-        db.clearAllTables()
-        streamDAO.insertAll(allStreams)
-        subscriptionDAO.insertAll(
-            listOf(
-                SubscriptionEntity.from(ChannelInfo(serviceId, "1", "https://youtube.com/channel/1", "https://youtube.com/channel/1", "channel-1")),
-                SubscriptionEntity.from(ChannelInfo(serviceId, "2", "https://youtube.com/channel/2", "https://youtube.com/channel/2", "channel-2")),
-                SubscriptionEntity.from(ChannelInfo(serviceId, "3", "https://youtube.com/channel/3", "https://youtube.com/channel/3", "channel-3")),
-                SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4")),
-            )
-        )
-        feedDAO.insertAll(
-            listOf(
-                FeedEntity(1, 1),
-                FeedEntity(2, 1),
-                FeedEntity(3, 1),
-                FeedEntity(4, 2),
-                FeedEntity(5, 2),
-                FeedEntity(6, 3),
-                FeedEntity(7, 4),
-            )
-        )
-    }
-}

app/src/androidTest/java/org/schabi/newpipe/local/subscription/SubscriptionManagerTest.java

@@ -1,82 +0,0 @@
-package org.schabi.newpipe.local.subscription;
-
-import static org.junit.Assert.assertEquals;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.schabi.newpipe.database.AppDatabase;
-import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
-import org.schabi.newpipe.database.subscription.SubscriptionEntity;
-import org.schabi.newpipe.extractor.channel.ChannelInfo;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.testUtil.TestDatabase;
-import org.schabi.newpipe.testUtil.TrampolineSchedulerRule;
-
-import java.io.IOException;
-import java.util.List;
-
-public class SubscriptionManagerTest {
-    private AppDatabase database;
-    private SubscriptionManager manager;
-
-    @Rule
-    public TrampolineSchedulerRule trampolineScheduler = new TrampolineSchedulerRule();
-
-
-    private SubscriptionEntity getAssertOneSubscriptionEntity() {
-        final List<SubscriptionEntity> entities = manager
-                .getSubscriptions(FeedGroupEntity.GROUP_ALL_ID, "", false)
-                .blockingFirst();
-        assertEquals(1, entities.size());
-        return entities.get(0);
-    }
-
-
-    @Before
-    public void setup() {
-        database = TestDatabase.Companion.createReplacingNewPipeDatabase();
-        manager = new SubscriptionManager(ApplicationProvider.getApplicationContext());
-    }
-
-    @After
-    public void cleanUp() {
-        database.close();
-    }
-
-    @Test
-    public void testInsert() throws ExtractionException, IOException {
-        final ChannelInfo info = ChannelInfo.getInfo("https://www.youtube.com/c/3blue1brown");
-        final SubscriptionEntity subscription = SubscriptionEntity.from(info);
-
-        manager.insertSubscription(subscription);
-        final SubscriptionEntity readSubscription = getAssertOneSubscriptionEntity();
-
-        // the uid has changed, since the uid is chosen upon inserting, but the rest should match
-        assertEquals(subscription.getServiceId(), readSubscription.getServiceId());
-        assertEquals(subscription.getUrl(), readSubscription.getUrl());
-        assertEquals(subscription.getName(), readSubscription.getName());
-        assertEquals(subscription.getAvatarUrl(), readSubscription.getAvatarUrl());
-        assertEquals(subscription.getSubscriberCount(), readSubscription.getSubscriberCount());
-        assertEquals(subscription.getDescription(), readSubscription.getDescription());
-    }
-
-    @Test
-    public void testUpdateNotificationMode() throws ExtractionException, IOException {
-        final ChannelInfo info = ChannelInfo.getInfo("https://www.youtube.com/c/veritasium");
-        final SubscriptionEntity subscription = SubscriptionEntity.from(info);
-        subscription.setNotificationMode(0);
-
-        manager.insertSubscription(subscription);
-        manager.updateNotificationMode(subscription.getServiceId(), subscription.getUrl(), 1)
-                .blockingAwait();
-        final SubscriptionEntity anotherSubscription = getAssertOneSubscriptionEntity();
-
-        assertEquals(0, subscription.getNotificationMode());
-        assertEquals(subscription.getUrl(), anotherSubscription.getUrl());
-        assertEquals(1, anotherSubscription.getNotificationMode());
-    }
-}

app/src/androidTest/java/org/schabi/newpipe/util/StreamItemAdapterTest.kt

@@ -12,21 +12,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement
 import org.junit.Assert
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.MediaFormat
-import org.schabi.newpipe.extractor.downloader.Response
 import org.schabi.newpipe.extractor.stream.AudioStream
 import org.schabi.newpipe.extractor.stream.Stream
 import org.schabi.newpipe.extractor.stream.SubtitlesStream
 import org.schabi.newpipe.extractor.stream.VideoStream
-import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper
 
 @MediumTest
 @RunWith(AndroidJUnit4::class)
@@ -90,7 +84,7 @@ class StreamItemAdapterTest {
     @Test
     fun subtitleStreams_noIcon() {
         val adapter = StreamItemAdapter<SubtitlesStream, Stream>(
-            StreamItemAdapter.StreamInfoWrapper(
+            StreamItemAdapter.StreamSizeWrapper(
                 (0 until 5).map {
                     SubtitlesStream.Builder()
                         .setContent("https://example.com", true)
@@ -111,7 +105,7 @@ class StreamItemAdapterTest {
     @Test
     fun audioStreams_noIcon() {
         val adapter = StreamItemAdapter<AudioStream, Stream>(
-            StreamItemAdapter.StreamInfoWrapper(
+            StreamItemAdapter.StreamSizeWrapper(
                 (0 until 5).map {
                     AudioStream.Builder()
                         .setId(Stream.ID_UNKNOWN)
@@ -129,109 +123,12 @@ class StreamItemAdapterTest {
         }
     }
 
-    @Test
-    fun retrieveMediaFormatFromFileTypeHeaders() {
-        val streams = getIncompleteAudioStreams(5)
-        val wrapper = StreamInfoWrapper(streams, context)
-        val retrieveMediaFormat = { stream: AudioStream, response: Response ->
-            StreamInfoWrapper.retrieveMediaFormatFromFileTypeHeaders(stream, wrapper, response)
-        }
-        val helper = AssertionHelper(streams, wrapper, retrieveMediaFormat)
-
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("content-length", "mp3"))), 0)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("file-type", "mp0"))), 1)
-
-        helper.assertValidResponse(getResponse(mapOf(Pair("x-amz-meta-file-type", "aiff"))), 2, MediaFormat.AIFF)
-        helper.assertValidResponse(getResponse(mapOf(Pair("file-type", "mp3"))), 3, MediaFormat.MP3)
-    }
-
-    @Test
-    fun retrieveMediaFormatFromContentDispositionHeader() {
-        val streams = getIncompleteAudioStreams(11)
-        val wrapper = StreamInfoWrapper(streams, context)
-        val retrieveMediaFormat = { stream: AudioStream, response: Response ->
-            StreamInfoWrapper.retrieveMediaFormatFromContentDispositionHeader(stream, wrapper, response)
-        }
-        val helper = AssertionHelper(streams, wrapper, retrieveMediaFormat)
-
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("content-length", "mp3"))), 0)
-        helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "filename=\"train.png\""))), 1
-        )
-        helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"data.csv\""))), 2
-        )
-        helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; filename=\"data.csv\""))), 3
-        )
-        helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"fieldName\"; filename*=\"filename.jpg\""))), 4
-        )
-
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "filename=\"train.ogg\""))),
-            5, MediaFormat.OGG
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "some-form-data; filename=\"audio.flac\""))),
-            6, MediaFormat.FLAC
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"audio.aiff\"; filename=\"audio.aiff\""))),
-            7, MediaFormat.AIFF
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"alien?\"; filename*=UTF-8''%CE%B1%CE%BB%CE%B9%CF%B5%CE%BD.m4a"))),
-            8, MediaFormat.M4A
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"audio.mp3\"; filename=\"audio.opus\"; filename*=UTF-8''alien.opus"))),
-            9, MediaFormat.OPUS
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"audio.mp3\"; filename=\"audio.opus\"; filename*=\"UTF-8''alien.opus\""))),
-            10, MediaFormat.OPUS
-        )
-    }
-
-    @Test
-    fun retrieveMediaFormatFromContentTypeHeader() {
-        val streams = getIncompleteAudioStreams(12)
-        val wrapper = StreamInfoWrapper(streams, context)
-        val retrieveMediaFormat = { stream: AudioStream, response: Response ->
-            StreamInfoWrapper.retrieveMediaFormatFromContentTypeHeader(stream, wrapper, response)
-        }
-        val helper = AssertionHelper(streams, wrapper, retrieveMediaFormat)
-
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("content-length", "984501"))), 0)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("Content-Type", "audio/xyz"))), 1)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("Content-Type", "mp3"))), 2)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("Content-Type", "mp3"))), 3)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("Content-Type", "audio/mpeg"))), 4)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("Content-Type", "audio/aif"))), 5)
-        helper.assertInvalidResponse(getResponse(mapOf(Pair("Content-Type", "whatever"))), 6)
-        helper.assertInvalidResponse(getResponse(mapOf()), 7)
-
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/flac"))), 8, MediaFormat.FLAC
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/wav"))), 9, MediaFormat.WAV
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/opus"))), 10, MediaFormat.OPUS
-        )
-        helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/aiff"))), 11, MediaFormat.AIFF
-        )
-    }
-
     /**
      * @return a list of video streams, in which their video only property mirrors the provided
      * [videoOnly] vararg.
      */
     private fun getVideoStreams(vararg videoOnly: Boolean) =
-        StreamItemAdapter.StreamInfoWrapper(
+        StreamItemAdapter.StreamSizeWrapper(
             videoOnly.map {
                 VideoStream.Builder()
                     .setId(Stream.ID_UNKNOWN)
@@ -264,19 +161,6 @@ class StreamItemAdapterTest {
             }
         )
 
-    private fun getIncompleteAudioStreams(size: Int): List<AudioStream> {
-        val list = ArrayList<AudioStream>(size)
-        for (i in 1..size) {
-            list.add(
-                AudioStream.Builder()
-                    .setId(Stream.ID_UNKNOWN)
-                    .setContent("https://example.com/$i", true)
-                    .build()
-            )
-        }
-        return list
-    }
-
     /**
      * Checks whether the item at [position] in the [spinner] has the correct icon visibility when
      * it is shown in normal mode (selected) and in dropdown mode (user is choosing one of a list).
@@ -312,56 +196,11 @@ class StreamItemAdapterTest {
             streams.forEachIndexed { index, stream ->
                 val secondaryStreamHelper: SecondaryStreamHelper<T>? = stream?.let {
                     SecondaryStreamHelper(
-                        StreamItemAdapter.StreamInfoWrapper(streams, context),
+                        StreamItemAdapter.StreamSizeWrapper(streams, context),
                         it
                     )
                 }
                 put(index, secondaryStreamHelper)
             }
         }
-
-    private fun getResponse(headers: Map<String, String>): Response {
-        val listHeaders = HashMap<String, List<String>>()
-        headers.forEach { entry ->
-            listHeaders[entry.key] = listOf(entry.value)
-        }
-        return Response(200, null, listHeaders, "", "")
-    }
-
-    /**
-     * Helper class for assertion related to extractions of [MediaFormat]s.
-     */
-    class AssertionHelper<T : Stream>(
-        private val streams: List<T>,
-        private val wrapper: StreamInfoWrapper<T>,
-        private val retrieveMediaFormat: (stream: T, response: Response) -> Boolean
-    ) {
-
-        /**
-         * Assert that an invalid response does not result in wrongly extracted [MediaFormat].
-         */
-        fun assertInvalidResponse(
-            response: Response,
-            index: Int
-        ) {
-            assertFalse(
-                "invalid header returns valid value", retrieveMediaFormat(streams[index], response)
-            )
-            assertNull("Media format extracted although stated otherwise", wrapper.getFormat(index))
-        }
-
-        /**
-         * Assert that a valid response results in correctly extracted and handled [MediaFormat].
-         */
-        fun assertValidResponse(
-            response: Response,
-            index: Int,
-            format: MediaFormat
-        ) {
-            assertTrue(
-                "header was not recognized", retrieveMediaFormat(streams[index], response)
-            )
-            assertEquals("Wrong media format extracted", format, wrapper.getFormat(index))
-        }
-    }
 }

app/src/debug/java/org/schabi/newpipe/DebugApp.kt

@@ -3,6 +3,7 @@ package org.schabi.newpipe
 import androidx.preference.PreferenceManager
 import com.facebook.stetho.Stetho
 import com.facebook.stetho.okhttp3.StethoInterceptor
+import leakcanary.AppWatcher
 import leakcanary.LeakCanary
 import okhttp3.OkHttpClient
 import org.schabi.newpipe.extractor.downloader.Downloader
@@ -12,6 +13,8 @@ class DebugApp : App() {
         super.onCreate()
         initStetho()
 
+        // Give each object 10 seconds to be GC'ed, before LeakCanary gets nosy on it
+        AppWatcher.config = AppWatcher.config.copy(watchDurationMillis = 10000)
         LeakCanary.config = LeakCanary.config.copy(
             dumpHeap = PreferenceManager
                 .getDefaultSharedPreferences(this).getBoolean(

app/src/main/AndroidManifest.xml

@@ -77,11 +77,6 @@
             android:exported="false"
             android:label="@string/settings" />
 
-        <activity
-            android:name=".settings.SettingsV2Activity"
-            android:exported="true"
-            android:label="@string/settings" />
-
         <activity
             android:name=".about.AboutActivity"
             android:exported="false"
@@ -372,7 +367,6 @@
                 <data android:host="tilvids.com" />
                 <data android:host="video.lqdn.fr" />
                 <data android:host="video.ploud.fr" />
-                <data android:host="subscribeto.me" />
 
                 <data android:pathPrefix="/videos/" /> <!-- it contains playlists -->
                 <data android:pathPrefix="/w/" /> <!-- short video URLs -->

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

@@ -25,7 +25,6 @@ import android.view.ViewGroup;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.os.BundleCompat;
 import androidx.lifecycle.Lifecycle;
 import androidx.viewpager.widget.PagerAdapter;
 
@@ -285,7 +284,7 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
         Bundle state = null;
         if (!mSavedState.isEmpty()) {
             state = new Bundle();
-            state.putParcelableArrayList("states", mSavedState);
+            state.putParcelableArray("states", mSavedState.toArray(new Fragment.SavedState[0]));
         }
         for (int i = 0; i < mFragments.size(); i++) {
             final Fragment f = mFragments.get(i);
@@ -312,12 +311,13 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
         if (state != null) {
             final Bundle bundle = (Bundle) state;
             bundle.setClassLoader(loader);
-            final var states = BundleCompat.getParcelableArrayList(bundle, "states",
-                    Fragment.SavedState.class);
+            final Parcelable[] fss = bundle.getParcelableArray("states");
             mSavedState.clear();
             mFragments.clear();
-            if (states != null) {
-                mSavedState.addAll(states);
+            if (fss != null) {
+                for (final Parcelable parcelable : fss) {
+                    mSavedState.add((Fragment.SavedState) parcelable);
+                }
             }
             final Iterable<String> keys = bundle.keySet();
             for (final String key : keys) {

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

@@ -0,0 +1,255 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationChannelCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.preference.PreferenceManager;
+
+import com.jakewharton.processphoenix.ProcessPhoenix;
+
+import org.acra.ACRA;
+import org.acra.config.CoreConfigurationBuilder;
+import org.schabi.newpipe.error.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.downloader.Downloader;
+import org.schabi.newpipe.ktx.ExceptionUtils;
+import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.StateSaver;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.util.List;
+import java.util.Objects;
+
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
+import io.reactivex.rxjava3.exceptions.UndeliverableException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/*
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * App.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class App extends Application {
+    public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
+    private static final String TAG = App.class.toString();
+    private static App app;
+
+    @NonNull
+    public static App getApp() {
+        return app;
+    }
+
+    @Override
+    protected void attachBaseContext(final Context base) {
+        super.attachBaseContext(base);
+        initACRA();
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        app = this;
+
+        if (ProcessPhoenix.isPhoenixProcess(this)) {
+            Log.i(TAG, "This is a phoenix process! "
+                    + "Aborting initialization of App[onCreate]");
+            return;
+        }
+
+        // Initialize settings first because others inits can use its values
+        NewPipeSettings.initSettings(this);
+
+        NewPipe.init(getDownloader(),
+            Localization.getPreferredLocalization(this),
+            Localization.getPreferredContentCountry(this));
+        Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
+
+        StateSaver.init(this);
+        initNotificationChannels();
+
+        ServiceHelper.initServices(this);
+
+        // Initialize image loader
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        PicassoHelper.init(this);
+        PicassoHelper.setShouldLoadImages(
+                prefs.getBoolean(getString(R.string.download_thumbnail_key), true));
+        PicassoHelper.setIndicatorsEnabled(MainActivity.DEBUG
+                && prefs.getBoolean(getString(R.string.show_image_indicators_key), false));
+
+        configureRxJavaErrorHandler();
+    }
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        PicassoHelper.terminate();
+    }
+
+    protected Downloader getDownloader() {
+        final DownloaderImpl downloader = DownloaderImpl.init(null);
+        setCookiesToDownloader(downloader);
+        return downloader;
+    }
+
+    protected void setCookiesToDownloader(final DownloaderImpl downloader) {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
+                getApplicationContext());
+        final String key = getApplicationContext().getString(R.string.recaptcha_cookies_key);
+        downloader.setCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY, prefs.getString(key, null));
+        downloader.updateYoutubeRestrictedModeCookies(getApplicationContext());
+    }
+
+    private void configureRxJavaErrorHandler() {
+        // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
+        RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
+            @Override
+            public void accept(@NonNull final Throwable throwable) {
+                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : "
+                        + "throwable = [" + throwable.getClass().getName() + "]");
+
+                final Throwable actualThrowable;
+                if (throwable instanceof UndeliverableException) {
+                    // As UndeliverableException is a wrapper,
+                    // get the cause of it to get the "real" exception
+                    actualThrowable = Objects.requireNonNull(throwable.getCause());
+                } else {
+                    actualThrowable = throwable;
+                }
+
+                final List<Throwable> errors;
+                if (actualThrowable instanceof CompositeException) {
+                    errors = ((CompositeException) actualThrowable).getExceptions();
+                } else {
+                    errors = List.of(actualThrowable);
+                }
+
+                for (final Throwable error : errors) {
+                    if (isThrowableIgnored(error)) {
+                        return;
+                    }
+                    if (isThrowableCritical(error)) {
+                        reportException(error);
+                        return;
+                    }
+                }
+
+                // Out-of-lifecycle exceptions should only be reported if a debug user wishes so,
+                // When exception is not reported, log it
+                if (isDisposedRxExceptionsReported()) {
+                    reportException(actualThrowable);
+                } else {
+                    Log.e(TAG, "RxJavaPlugin: Undeliverable Exception received: ", actualThrowable);
+                }
+            }
+
+            private boolean isThrowableIgnored(@NonNull final Throwable throwable) {
+                // Don't crash the application over a simple network problem
+                return ExceptionUtils.hasAssignableCause(throwable,
+                        // network api cancellation
+                        IOException.class, SocketException.class,
+                        // blocking code disposed
+                        InterruptedException.class, InterruptedIOException.class);
+            }
+
+            private boolean isThrowableCritical(@NonNull final Throwable throwable) {
+                // Though these exceptions cannot be ignored
+                return ExceptionUtils.hasAssignableCause(throwable,
+                        NullPointerException.class, IllegalArgumentException.class, // bug in app
+                        OnErrorNotImplementedException.class, MissingBackpressureException.class,
+                        IllegalStateException.class); // bug in operator
+            }
+
+            private void reportException(@NonNull final Throwable throwable) {
+                // Throw uncaught exception that will trigger the report system
+                Thread.currentThread().getUncaughtExceptionHandler()
+                        .uncaughtException(Thread.currentThread(), throwable);
+            }
+        });
+    }
+
+    /**
+     * Called in {@link #attachBaseContext(Context)} after calling the {@code super} method.
+     * Should be overridden if MultiDex is enabled, since it has to be initialized before ACRA.
+     */
+    protected void initACRA() {
+        if (ACRA.isACRASenderServiceProcess()) {
+            return;
+        }
+
+        final CoreConfigurationBuilder acraConfig = new CoreConfigurationBuilder()
+                .withBuildConfigClass(BuildConfig.class);
+        ACRA.init(this, acraConfig);
+    }
+
+    private void initNotificationChannels() {
+        // Keep the importance below DEFAULT to avoid making noise on every notification update for
+        // the main and update channels
+        final List<NotificationChannelCompat> notificationChannelCompats = List.of(
+                new NotificationChannelCompat.Builder(getString(R.string.notification_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.notification_channel_name))
+                        .setDescription(getString(R.string.notification_channel_description))
+                        .build(),
+                new NotificationChannelCompat
+                        .Builder(getString(R.string.app_update_notification_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.app_update_notification_channel_name))
+                        .setDescription(
+                                getString(R.string.app_update_notification_channel_description))
+                        .build(),
+                new NotificationChannelCompat.Builder(getString(R.string.hash_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_HIGH)
+                        .setName(getString(R.string.hash_channel_name))
+                        .setDescription(getString(R.string.hash_channel_description))
+                        .build(),
+                new NotificationChannelCompat.Builder(getString(R.string.error_report_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.error_report_channel_name))
+                        .setDescription(getString(R.string.error_report_channel_description))
+                        .build(),
+                new NotificationChannelCompat
+                        .Builder(getString(R.string.streams_notification_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_DEFAULT)
+                        .setName(getString(R.string.streams_notification_channel_name))
+                        .setDescription(
+                                getString(R.string.streams_notification_channel_description))
+                        .build()
+        );
+
+        final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
+        notificationManager.createNotificationChannelsCompat(notificationChannelCompats);
+    }
+
+    protected boolean isDisposedRxExceptionsReported() {
+        return false;
+    }
+
+}

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

@@ -1,286 +0,0 @@
-package org.schabi.newpipe
-
-import android.app.ActivityManager
-import android.app.Application
-import android.content.Context
-import android.util.Log
-import androidx.core.app.NotificationChannelCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.getSystemService
-import androidx.preference.PreferenceManager
-import coil3.ImageLoader
-import coil3.SingletonImageLoader
-import coil3.network.okhttp.OkHttpNetworkFetcherFactory
-import coil3.request.allowRgb565
-import coil3.request.crossfade
-import coil3.util.DebugLogger
-import com.jakewharton.processphoenix.ProcessPhoenix
-import dagger.hilt.android.HiltAndroidApp
-import io.reactivex.rxjava3.exceptions.CompositeException
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException
-import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException
-import io.reactivex.rxjava3.exceptions.UndeliverableException
-import io.reactivex.rxjava3.functions.Consumer
-import io.reactivex.rxjava3.plugins.RxJavaPlugins
-import org.acra.ACRA.init
-import org.acra.ACRA.isACRASenderServiceProcess
-import org.acra.config.CoreConfigurationBuilder
-import org.schabi.newpipe.error.ReCaptchaActivity
-import org.schabi.newpipe.extractor.NewPipe
-import org.schabi.newpipe.extractor.downloader.Downloader
-import org.schabi.newpipe.ktx.hasAssignableCause
-import org.schabi.newpipe.settings.NewPipeSettings
-import org.schabi.newpipe.util.BridgeStateSaverInitializer
-import org.schabi.newpipe.util.Localization
-import org.schabi.newpipe.util.ServiceHelper
-import org.schabi.newpipe.util.StateSaver
-import org.schabi.newpipe.util.image.ImageStrategy
-import org.schabi.newpipe.util.image.PreferredImageQuality
-import java.io.IOException
-import java.io.InterruptedIOException
-import java.net.SocketException
-
-/*
- * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
- * App.kt is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-@HiltAndroidApp
-open class App :
-    Application(),
-    SingletonImageLoader.Factory {
-    var isFirstRun = false
-        private set
-
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        initACRA()
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        instance = this
-
-        if (ProcessPhoenix.isPhoenixProcess(this)) {
-            Log.i(TAG, "This is a phoenix process! Aborting initialization of App[onCreate]")
-            return
-        }
-
-        // check if the last used preference version is set
-        // to determine whether this is the first app run
-        val lastUsedPrefVersion =
-            PreferenceManager
-                .getDefaultSharedPreferences(this)
-                .getInt(getString(R.string.last_used_preferences_version), -1)
-        isFirstRun = lastUsedPrefVersion == -1
-
-        // Initialize settings first because other initializations can use its values
-        NewPipeSettings.initSettings(this)
-
-        NewPipe.init(
-            getDownloader(),
-            Localization.getPreferredLocalization(this),
-            Localization.getPreferredContentCountry(this),
-        )
-        Localization.initPrettyTime(Localization.resolvePrettyTime(this))
-
-        BridgeStateSaverInitializer.init(this)
-        StateSaver.init(this)
-        initNotificationChannels()
-
-        ServiceHelper.initServices(this)
-
-        // Initialize image loader
-        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-        ImageStrategy.setPreferredImageQuality(
-            PreferredImageQuality.fromPreferenceKey(
-                this,
-                prefs.getString(
-                    getString(R.string.image_quality_key),
-                    getString(R.string.image_quality_default),
-                ),
-            ),
-        )
-
-        configureRxJavaErrorHandler()
-    }
-
-    override fun newImageLoader(context: Context): ImageLoader =
-        ImageLoader
-            .Builder(this)
-            .logger(if (BuildConfig.DEBUG) DebugLogger() else null)
-            .allowRgb565(getSystemService<ActivityManager>()!!.isLowRamDevice)
-            .crossfade(true)
-            .components {
-                add(OkHttpNetworkFetcherFactory(callFactory = DownloaderImpl.getInstance().client))
-            }.build()
-
-    protected open fun getDownloader(): Downloader {
-        val downloader = DownloaderImpl.init(null)
-        setCookiesToDownloader(downloader)
-        return downloader
-    }
-
-    protected fun setCookiesToDownloader(downloader: DownloaderImpl) {
-        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-        val key = getString(R.string.recaptcha_cookies_key)
-        downloader.setCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY, prefs.getString(key, null))
-        downloader.updateYoutubeRestrictedModeCookies(this)
-    }
-
-    private fun configureRxJavaErrorHandler() {
-        // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
-        RxJavaPlugins.setErrorHandler(
-            object : Consumer<Throwable> {
-                override fun accept(throwable: Throwable) {
-                    Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : throwable = [${throwable.javaClass.getName()}]")
-
-                    // As UndeliverableException is a wrapper,
-                    // get the cause of it to get the "real" exception
-                    val actualThrowable = (throwable as? UndeliverableException)?.cause ?: throwable
-
-                    val errors = (actualThrowable as? CompositeException)?.exceptions ?: listOf(actualThrowable)
-
-                    for (error in errors) {
-                        if (isThrowableIgnored(error)) {
-                            return
-                        }
-                        if (isThrowableCritical(error)) {
-                            reportException(error)
-                            return
-                        }
-                    }
-
-                    // Out-of-lifecycle exceptions should only be reported if a debug user wishes so,
-                    // When exception is not reported, log it
-                    if (isDisposedRxExceptionsReported()) {
-                        reportException(actualThrowable)
-                    } else {
-                        Log.e(TAG, "RxJavaPlugin: Undeliverable Exception received: ", actualThrowable)
-                    }
-                }
-
-                fun isThrowableIgnored(throwable: Throwable): Boolean {
-                    // Don't crash the application over a simple network problem
-                    return throwable // network api cancellation
-                        .hasAssignableCause(
-                            IOException::class.java,
-                            SocketException::class.java, // blocking code disposed
-                            InterruptedException::class.java,
-                            InterruptedIOException::class.java,
-                        )
-                }
-
-                fun isThrowableCritical(throwable: Throwable): Boolean {
-                    // Though these exceptions cannot be ignored
-                    return throwable
-                        .hasAssignableCause(
-                            // bug in app
-                            NullPointerException::class.java,
-                            IllegalArgumentException::class.java,
-                            OnErrorNotImplementedException::class.java,
-                            MissingBackpressureException::class.java,
-                            // bug in operator
-                            IllegalStateException::class.java,
-                        )
-                }
-
-                fun reportException(throwable: Throwable) {
-                    // Throw uncaught exception that will trigger the report system
-                    Thread
-                        .currentThread()
-                        .uncaughtExceptionHandler
-                        .uncaughtException(Thread.currentThread(), throwable)
-                }
-            },
-        )
-    }
-
-    /**
-     * Called in [.attachBaseContext] after calling the `super` method.
-     * Should be overridden if MultiDex is enabled, since it has to be initialized before ACRA.
-     */
-    protected fun initACRA() {
-        if (isACRASenderServiceProcess()) {
-            return
-        }
-
-        val acraConfig =
-            CoreConfigurationBuilder()
-                .withBuildConfigClass(BuildConfig::class.java)
-        init(this, acraConfig)
-    }
-
-    private fun initNotificationChannels() {
-        // Keep the importance below DEFAULT to avoid making noise on every notification update for
-        // the main and update channels
-        val mainChannel =
-            NotificationChannelCompat
-                .Builder(
-                    getString(R.string.notification_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_LOW,
-                ).setName(getString(R.string.notification_channel_name))
-                .setDescription(getString(R.string.notification_channel_description))
-                .build()
-        val appUpdateChannel =
-            NotificationChannelCompat
-                .Builder(
-                    getString(R.string.app_update_notification_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_LOW,
-                ).setName(getString(R.string.app_update_notification_channel_name))
-                .setDescription(getString(R.string.app_update_notification_channel_description))
-                .build()
-        val hashChannel =
-            NotificationChannelCompat
-                .Builder(
-                    getString(R.string.hash_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_HIGH,
-                ).setName(getString(R.string.hash_channel_name))
-                .setDescription(getString(R.string.hash_channel_description))
-                .build()
-        val errorReportChannel =
-            NotificationChannelCompat
-                .Builder(
-                    getString(R.string.error_report_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_LOW,
-                ).setName(getString(R.string.error_report_channel_name))
-                .setDescription(getString(R.string.error_report_channel_description))
-                .build()
-        val newStreamChannel =
-            NotificationChannelCompat
-                .Builder(
-                    getString(R.string.streams_notification_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_DEFAULT,
-                ).setName(getString(R.string.streams_notification_channel_name))
-                .setDescription(getString(R.string.streams_notification_channel_description))
-                .build()
-
-        val channels = listOf(mainChannel, appUpdateChannel, hashChannel, errorReportChannel, newStreamChannel)
-
-        NotificationManagerCompat.from(this).createNotificationChannelsCompat(channels)
-    }
-
-    protected open fun isDisposedRxExceptionsReported(): Boolean = false
-
-    companion object {
-        const val PACKAGE_NAME: String = BuildConfig.APPLICATION_ID
-        private val TAG = App::class.java.toString()
-
-        @JvmStatic
-        lateinit var instance: App
-            private set
-    }
-}

app/src/main/java/org/schabi/newpipe/AppModule.kt

@@ -1,22 +0,0 @@
-package org.schabi.newpipe
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class AppModule {
-
-    @Provides
-    @Singleton
-    fun providesSharedPreference(@ApplicationContext context: Context): SharedPreferences {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-    }
-}

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

@@ -10,9 +10,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
-
+import icepick.Icepick;
+import icepick.State;
+import leakcanary.AppWatcher;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
@@ -49,7 +49,7 @@ public abstract class BaseFragment extends Fragment {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
         super.onCreate(savedInstanceState);
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
         if (savedInstanceState != null) {
             onRestoreInstanceState(savedInstanceState);
         }
@@ -71,39 +71,26 @@ public abstract class BaseFragment extends Fragment {
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
     protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        AppWatcher.INSTANCE.getObjectWatcher().watch(this);
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    /**
-     * This method is called in {@link #onViewCreated(View, Bundle)} to initialize the views.
-     *
-     * <p>
-     * {@link #initListeners()} is called after this method to initialize the corresponding
-     * listeners.
-     * </p>
-     * @param rootView The inflated view for this fragment
-     *                 (provided by {@link #onViewCreated(View, Bundle)})
-     * @param savedInstanceState The saved state of this fragment
- *                               (provided by {@link #onViewCreated(View, Bundle)})
-     */
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
     }
 
-    /**
-     * Initialize the listeners for this fragment.
-     *
-     * <p>
-     * This method is called after {@link #initViews(View, Bundle)}
-     * in {@link #onViewCreated(View, Bundle)}.
-     * </p>
-     */
     protected void initListeners() {
     }
 
@@ -121,20 +108,9 @@ public abstract class BaseFragment extends Fragment {
         }
     }
 
-    /**
-     * Finds the root fragment by looping through all of the parent fragments. The root fragment
-     * is supposed to be {@link org.schabi.newpipe.fragments.MainFragment}, and is the fragment that
-     * handles keeping the backstack of opened fragments in NewPipe, and also the player bottom
-     * sheet. This function therefore returns the fragment manager of said fragment.
-     *
-     * @return the fragment manager of the root fragment, i.e.
-     *         {@link org.schabi.newpipe.fragments.MainFragment}
-     */
     protected FragmentManager getFM() {
-        Fragment current = this;
-        while (current.getParentFragment() != null) {
-            current = current.getParentFragment();
-        }
-        return current.getFragmentManager();
+        return getParentFragment() == null
+                ? getFragmentManager()
+                : getParentFragment().getFragmentManager();
     }
 }

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

@@ -48,11 +48,6 @@ public final class DownloaderImpl extends Downloader {
         this.mCookies = new HashMap<>();
     }
 
-    @NonNull
-    public OkHttpClient getClient() {
-        return client;
-    }
-
     /**
      * It's recommended to call exactly once in the entire lifetime of the application.
      *

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

@@ -63,6 +63,7 @@ import org.schabi.newpipe.databinding.InstanceSpinnerLayoutBinding;
 import org.schabi.newpipe.databinding.ToolbarLayoutBinding;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
@@ -75,7 +76,6 @@ import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.settings.UpdateSettingsFragment;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.KioskTranslator;
@@ -83,7 +83,6 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
-import org.schabi.newpipe.util.ReleaseVersionUtil;
 import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
@@ -94,11 +93,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-
-@AndroidEntryPoint
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     @SuppressWarnings("ConstantConditions")
@@ -170,22 +164,16 @@ public class MainActivity extends AppCompatActivity {
             // if this is enabled by the user.
             NotificationWorker.initialize(this);
         }
-        if (!UpdateSettingsFragment.wasUserAskedForConsent(this)
-                && !App.getInstance().isFirstRun()
-                && ReleaseVersionUtil.INSTANCE.isReleaseApk()) {
-            UpdateSettingsFragment.askForConsentToUpdateChecks(this);
-        }
     }
 
     @Override
     protected void onPostCreate(final Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
-        final App app = App.getInstance();
+        final App app = App.getApp();
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
-        if (prefs.getBoolean(app.getString(R.string.update_app_key), false)
-                && prefs.getBoolean(app.getString(R.string.update_check_consent_key), false)) {
+        if (prefs.getBoolean(app.getString(R.string.update_app_key), true)) {
             // Start the worker which is checking all conditions
             // and eventually searching for a new version.
             NewVersionWorker.enqueueNewVersionCheckingWork(app, false);
@@ -232,14 +220,14 @@ public class MainActivity extends AppCompatActivity {
         final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
         final StreamingService service = NewPipe.getService(currentServiceId);
 
-        int kioskMenuItemId = 0;
+        int kioskId = 0;
 
         for (final String ks : service.getKioskList().getAvailableKiosks()) {
             drawerLayoutBinding.navigation.getMenu()
-                    .add(R.id.menu_tabs_group, kioskMenuItemId, 0, KioskTranslator
+                    .add(R.id.menu_tabs_group, kioskId, 0, KioskTranslator
                             .getTranslatedKioskName(ks, this))
                     .setIcon(KioskTranslator.getKioskIcon(ks));
-            kioskMenuItemId++;
+            kioskId++;
         }
 
         drawerLayoutBinding.navigation.getMenu()
@@ -271,8 +259,15 @@ public class MainActivity extends AppCompatActivity {
     private boolean drawerItemSelected(final MenuItem item) {
         switch (item.getGroupId()) {
             case R.id.menu_services_group:
-                changeService(item);
-                break;
+                if (item.getItemId() == ServiceList.PeerTube.getServiceId()
+                        && DeviceUtils.isTv(getApplicationContext())
+                        && !item.isActionViewExpanded()) {
+                    ((Spinner) item.getActionView()).performClick();
+                    return true;
+                } else {
+                    changeService(item);
+                    break;
+                }
             case R.id.menu_tabs_group:
                 try {
                     tabSelected(item);
@@ -319,16 +314,20 @@ public class MainActivity extends AppCompatActivity {
                 NavigationHelper.openStatisticFragment(getSupportFragmentManager());
                 break;
             default:
-                final StreamingService currentService = ServiceHelper.getSelectedService(this);
-                int kioskMenuItemId = 0;
-                for (final String kioskId : currentService.getKioskList().getAvailableKiosks()) {
-                    if (kioskMenuItemId == item.getItemId()) {
-                        NavigationHelper.openKioskFragment(getSupportFragmentManager(),
-                                currentService.getServiceId(), kioskId);
-                        break;
+                final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+                final StreamingService service = NewPipe.getService(currentServiceId);
+                String serviceName = "";
+
+                int kioskId = 0;
+                for (final String ks : service.getKioskList().getAvailableKiosks()) {
+                    if (kioskId == item.getItemId()) {
+                        serviceName = ks;
                     }
-                    kioskMenuItemId++;
+                    kioskId++;
                 }
+
+                NavigationHelper.openKioskFragment(getSupportFragmentManager(), currentServiceId,
+                        serviceName);
                 break;
         }
     }
@@ -392,8 +391,8 @@ public class MainActivity extends AppCompatActivity {
                     .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
                     .setIcon(ServiceHelper.getIcon(s.getServiceId()));
 
-            // peertube specifics
-            if (s.getServiceId() == 3) {
+            // PeerTube specifics
+            if (s == ServiceList.PeerTube) {
                 enhancePeertubeMenu(menuItem);
             }
         }
@@ -558,27 +557,32 @@ public class MainActivity extends AppCompatActivity {
         // In case bottomSheet is not visible on the screen or collapsed we can assume that the user
         // interacts with a fragment inside fragment_holder so all back presses should be
         // handled by it
-        final var fragmentManager = getSupportFragmentManager();
-
         if (bottomSheetHiddenOrCollapsed()) {
-            final var fragment = fragmentManager.findFragmentById(R.id.fragment_holder);
+            final Fragment fragment = getSupportFragmentManager()
+                    .findFragmentById(R.id.fragment_holder);
             // If current fragment implements BackPressable (i.e. can/wanna handle back press)
             // delegate the back press to it
-            if (fragment instanceof BackPressable backPressable && backPressable.onBackPressed()) {
-                return;
+            if (fragment instanceof BackPressable) {
+                if (((BackPressable) fragment).onBackPressed()) {
+                    return;
+                }
             }
+
         } else {
-            final var player = fragmentManager.findFragmentById(R.id.fragment_player_holder);
+            final Fragment fragmentPlayer = getSupportFragmentManager()
+                    .findFragmentById(R.id.fragment_player_holder);
             // If current fragment implements BackPressable (i.e. can/wanna handle back press)
             // delegate the back press to it
-            if (player instanceof BackPressable backPressable && !backPressable.onBackPressed()) {
-                BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
-                        .setState(BottomSheetBehavior.STATE_COLLAPSED);
+            if (fragmentPlayer instanceof BackPressable) {
+                if (!((BackPressable) fragmentPlayer).onBackPressed()) {
+                    BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
+                            .setState(BottomSheetBehavior.STATE_COLLAPSED);
+                }
                 return;
             }
         }
 
-        if (fragmentManager.getBackStackEntryCount() == 1) {
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
             finish();
         } else {
             super.onBackPressed();
@@ -637,11 +641,10 @@ public class MainActivity extends AppCompatActivity {
      * </pre>
      */
     private void onHomeButtonPressed() {
-        final var fm = getSupportFragmentManager();
-
-        if (!NavigationHelper.tryGotoSearchFragment(fm)) {
-            // If search fragment wasn't found in the backstack go to the main fragment
-            NavigationHelper.gotoMainFragment(fm);
+        // If search fragment wasn't found in the backstack...
+        if (!NavigationHelper.tryGotoSearchFragment(getSupportFragmentManager())) {
+            // ...go to the main fragment
+            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
         }
     }
 

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

@@ -7,8 +7,6 @@ import static org.schabi.newpipe.database.Migrations.MIGRATION_3_4;
 import static org.schabi.newpipe.database.Migrations.MIGRATION_4_5;
 import static org.schabi.newpipe.database.Migrations.MIGRATION_5_6;
 import static org.schabi.newpipe.database.Migrations.MIGRATION_6_7;
-import static org.schabi.newpipe.database.Migrations.MIGRATION_7_8;
-import static org.schabi.newpipe.database.Migrations.MIGRATION_8_9;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -29,7 +27,7 @@ public final class NewPipeDatabase {
         return Room
                 .databaseBuilder(context.getApplicationContext(), AppDatabase.class, DATABASE_NAME)
                 .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5,
-                        MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9)
+                        MIGRATION_5_6, MIGRATION_6_7)
                 .build();
     }
 

app/src/main/java/org/schabi/newpipe/NewPlayerComponent.kt

@@ -1,268 +0,0 @@
-/* NewPlayer
- *
- * @author Christian Schabesberger
- *
- * Copyright (C) NewPipe e.V. 2024 <code(at)newpipe-ev.de>
- *
- * NewPlayer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.newpipe.newplayer.testapp
-
-import android.app.Application
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.util.Log
-import androidx.annotation.OptIn
-import androidx.core.graphics.drawable.IconCompat
-import androidx.media3.common.MediaMetadata
-import androidx.media3.common.util.UnstableApi
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import net.newpipe.newplayer.NewPlayer
-import net.newpipe.newplayer.NewPlayerImpl
-import net.newpipe.newplayer.data.AudioStreamTrack
-import net.newpipe.newplayer.data.Chapter
-import net.newpipe.newplayer.data.Stream
-import net.newpipe.newplayer.data.Subtitle
-import net.newpipe.newplayer.data.VideoStreamTrack
-import net.newpipe.newplayer.repository.CachingRepository
-import net.newpipe.newplayer.repository.MediaRepository
-import net.newpipe.newplayer.repository.PrefetchingRepository
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.schabi.newpipe.App
-import org.schabi.newpipe.MainActivity
-import org.schabi.newpipe.extractor.ServiceList
-import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCStreamExtractor
-import org.schabi.newpipe.extractor.services.media_ccc.extractors.data.MediaCCCRecording
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-object NewPlayerComponent {
-    @Provides
-    @Singleton
-    fun provideNewPlayer(app: Application): NewPlayer {
-        val player = NewPlayerImpl(
-            app = app,
-            repository = PrefetchingRepository(CachingRepository(MediaCCCTestRepository())),
-            notificationIcon = IconCompat.createWithResource(app, net.newpipe.newplayer.R.drawable.new_player_tiny_icon),
-            playerActivityClass = MainActivity::class.java,
-            // rescueStreamFault = …
-        )
-        if (app is App) {
-            CoroutineScope(Dispatchers.IO).launch {
-                while (true) {
-                    player.errorFlow.collect { e ->
-                        Log.e("NewPlayerException", e.stackTraceToString())
-                    }
-                }
-            }
-        }
-        return player
-    }
-}
-
-class TestMediaRepository() : MediaRepository {
-    private val client = OkHttpClient()
-
-    override fun getRepoInfo() =
-        MediaRepository.RepoMetaInfo(canHandleTimestampedLinks = true, pullsDataFromNetwork = true)
-
-    @OptIn(UnstableApi::class)
-    override suspend fun getMetaInfo(item: String): MediaMetadata =
-        MediaMetadata.Builder()
-            .setTitle("BGP and the rule of bla")
-            .setArtist("mr BGP")
-            .setArtworkUri(Uri.parse("https://static.media.ccc.de/media/congress/2017/9072-hd.jpg"))
-            .setDurationMs(
-                1871L * 1000L
-            )
-            .build()
-
-    override suspend fun getStreams(item: String): List<Stream> {
-        return listOf(
-            Stream(
-                item = "bgp",
-                streamUri = Uri.parse("https://cdn.media.ccc.de/congress/2017/h264-hd/34c3-9072-eng-BGP_and_the_Rule_of_Custom.mp4"),
-                mimeType = null,
-                streamTracks = listOf(
-                    AudioStreamTrack(
-                        bitrate = 480000,
-                        fileFormat = "MPEG4",
-                        language = "en"
-                    ),
-                    VideoStreamTrack(
-                        width = 1920,
-                        height = 1080,
-                        frameRate = 25,
-                        fileFormat = "MPEG4"
-                    )
-                )
-            )
-        )
-    }
-
-    override suspend fun getSubtitles(item: String) =
-        emptyList<Subtitle>()
-
-    override suspend fun getPreviewThumbnail(item: String, timestampInMs: Long): Bitmap? {
-
-        val templateUrl = "https://static.media.ccc.de/media/congress/2017/9072-hd.jpg"
-
-        val thumbnailId = (timestampInMs / (10 * 1000)) + 1
-
-        if (getPreviewThumbnailsInfo(item).count < thumbnailId) {
-            return null
-        }
-
-        val thumbUrl = String.format(templateUrl, thumbnailId)
-
-        val bitmap = withContext(Dispatchers.IO) {
-            val request = Request.Builder().url(thumbUrl).build()
-            val response = client.newCall(request).execute()
-            try {
-                val responseBody = response.body
-                val bitmap = BitmapFactory.decodeStream(responseBody?.byteStream())
-                return@withContext bitmap
-            } catch (e: Exception) {
-                return@withContext null
-            }
-        }
-
-        return bitmap
-    }
-
-    override suspend fun getPreviewThumbnailsInfo(item: String) =
-        MediaRepository.PreviewThumbnailsInfo(0, 0)
-
-    override suspend fun getChapters(item: String) =
-        listOf<Chapter>()
-
-    override suspend fun getTimestampLink(item: String, timestampInSeconds: Long) =
-        ""
-}
-
-class MediaCCCTestRepository() : MediaRepository {
-    private val client = OkHttpClient()
-
-    private val service = ServiceList.MediaCCC
-
-    suspend fun fetchPage(item: String): MediaCCCStreamExtractor {
-        return withContext(Dispatchers.IO) {
-            // TODO: handle MediaCCCLiveStreamExtractor as well
-            val extractor = service.getStreamExtractor(item) as MediaCCCStreamExtractor
-            extractor.fetchPage()
-            extractor
-        }
-    }
-
-    override fun getRepoInfo() =
-        MediaRepository.RepoMetaInfo(canHandleTimestampedLinks = true, pullsDataFromNetwork = true)
-
-    @OptIn(UnstableApi::class)
-    override suspend fun getMetaInfo(item: String): MediaMetadata {
-        val extractor = fetchPage(item)
-        return MediaMetadata.Builder().apply {
-            setTitle(extractor.name)
-            setArtist(extractor.subChannelName)
-            setDurationMs(
-                extractor.length * 1000L
-            )
-            extractor.thumbnails.firstOrNull()?.url?.let {
-                setArtworkUri(Uri.parse(it))
-            }
-        }.build()
-    }
-
-    override suspend fun getStreams(item: String): List<Stream> {
-        val extractor = fetchPage(item)
-        return extractor.recordings.filterIsInstance<MediaCCCRecording.Video>()
-            .filter { it.recordingType == MediaCCCRecording.VideoType.MAIN }
-            .map { track ->
-                Stream(
-                    item = item,
-                    streamUri = Uri.parse(track.url),
-                    streamTracks =
-                    listOf(
-                        VideoStreamTrack(
-                            width = track.width,
-                            height = track.height,
-                            fileFormat = track.mimeType
-                        ),
-                    ) +
-                        // one audio track per language
-                        // (TODO: probably don’t need to attach the audio track here?)
-                        track.languages.map { language ->
-                            AudioStreamTrack(
-                                // TODO: should we pass the Locale instead??
-                                language = language.language,
-                                fileFormat = track.mimeType,
-                                // TODO: that’s something ExoPlayer should determine for us,
-                                // we don’t know that from the metadata
-                                bitrate = 44100,
-                            )
-                        }
-                )
-            }
-    }
-
-    override suspend fun getSubtitles(item: String) =
-        emptyList<Subtitle>()
-
-    override suspend fun getPreviewThumbnail(item: String, timestampInMs: Long): Bitmap? {
-        val extractor = fetchPage(item)
-
-        val templateUrl = extractor.thumbnails.firstOrNull()?.url ?: return null
-
-        val thumbnailId = (timestampInMs / (10 * 1000)) + 1
-
-        if (getPreviewThumbnailsInfo(item).count < thumbnailId) {
-            return null
-        }
-
-        val thumbUrl = String.format(templateUrl, thumbnailId)
-
-        val bitmap = withContext(Dispatchers.IO) {
-            val request = Request.Builder().url(thumbUrl).build()
-            val response = client.newCall(request).execute()
-            try {
-                val responseBody = response.body
-                val bitmap = BitmapFactory.decodeStream(responseBody?.byteStream())
-                return@withContext bitmap
-            } catch (e: Exception) {
-                return@withContext null
-            }
-        }
-
-        return bitmap
-    }
-
-    override suspend fun getPreviewThumbnailsInfo(item: String) =
-        MediaRepository.PreviewThumbnailsInfo(1, 0)
-
-    override suspend fun getChapters(item: String) =
-        listOf<Chapter>()
-
-    override suspend fun getTimestampLink(item: String, timestampInSeconds: Long) =
-        ""
-}

app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt

@@ -20,7 +20,9 @@ import com.grack.nanojson.JsonParser
 import com.grack.nanojson.JsonParserException
 import org.schabi.newpipe.extractor.downloader.Response
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
-import org.schabi.newpipe.util.ReleaseVersionUtil
+import org.schabi.newpipe.util.ReleaseVersionUtil.coerceUpdateCheckExpiry
+import org.schabi.newpipe.util.ReleaseVersionUtil.isLastUpdateCheckExpired
+import org.schabi.newpipe.util.ReleaseVersionUtil.isReleaseApk
 import java.io.IOException
 
 class NewVersionWorker(
@@ -82,7 +84,7 @@ class NewVersionWorker(
     @Throws(IOException::class, ReCaptchaException::class)
     private fun checkNewVersion() {
         // Check if the current apk is a github one or not.
-        if (!ReleaseVersionUtil.isReleaseApk) {
+        if (!isReleaseApk()) {
             return
         }
 
@@ -91,7 +93,7 @@ class NewVersionWorker(
             // Check if the last request has happened a certain time ago
             // to reduce the number of API requests.
             val expiry = prefs.getLong(applicationContext.getString(R.string.update_expiry_key), 0)
-            if (!ReleaseVersionUtil.isLastUpdateCheckExpired(expiry)) {
+            if (!isLastUpdateCheckExpired(expiry)) {
                 return
             }
         }
@@ -106,7 +108,7 @@ class NewVersionWorker(
         try {
             // Store a timestamp which needs to be exceeded,
             // before a new request to the API is made.
-            val newExpiry = ReleaseVersionUtil.coerceUpdateCheckExpiry(response.getHeader("expires"))
+            val newExpiry = coerceUpdateCheckExpiry(response.getHeader("expires"))
             prefs.edit {
                 putLong(applicationContext.getString(R.string.update_expiry_key), newExpiry)
             }
@@ -118,13 +120,13 @@ class NewVersionWorker(
 
         // Parse the json from the response.
         try {
-            val newpipeVersionInfo = JsonParser.`object`()
+            val githubStableObject = JsonParser.`object`()
                 .from(response.responseBody()).getObject("flavors")
-                .getObject("newpipe")
+                .getObject("github").getObject("stable")
 
-            val versionName = newpipeVersionInfo.getString("version")
-            val versionCode = newpipeVersionInfo.getInt("version_code")
-            val apkLocationUrl = newpipeVersionInfo.getString("apk")
+            val versionName = githubStableObject.getString("version")
+            val versionCode = githubStableObject.getInt("version_code")
+            val apkLocationUrl = githubStableObject.getString("apk")
             compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode)
         } catch (e: JsonParserException) {
             // Most likely something is wrong in data received from NEWPIPE_API_URL.

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

@@ -75,7 +75,7 @@ public final class QueueItemMenuUtil {
                     return true;
                 case R.id.menu_item_share:
                     shareText(context, item.getTitle(), item.getUrl(),
-                            item.getThumbnails());
+                            item.getThumbnailUrl());
                     return true;
                 case R.id.menu_item_download:
                     fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(),

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

@@ -41,14 +41,10 @@ import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
-
 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;
-import org.schabi.newpipe.download.LoadingDialog;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.ReCaptchaActivity;
@@ -68,7 +64,6 @@ import org.schabi.newpipe.extractor.exceptions.PrivateContentException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.exceptions.SoundCloudGoPlusContentException;
 import org.schabi.newpipe.extractor.exceptions.YoutubeMusicPremiumContentException;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.ktx.ExceptionUtils;
@@ -76,11 +71,10 @@ import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
-import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
-import org.schabi.newpipe.util.ChannelTabHelper;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -101,6 +95,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 
+import icepick.Icepick;
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
@@ -153,7 +149,7 @@ public class RouterActivity extends AppCompatActivity {
         getWindow().setAttributes(params);
 
         super.onCreate(savedInstanceState);
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
         // FragmentManager will take care to recreate (Playlist|Download)Dialog when screen rotates
         // We used to .setOnDismissListener(dialog -> finish()); when creating these DialogFragments
@@ -198,7 +194,7 @@ public class RouterActivity extends AppCompatActivity {
     @Override
     protected void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
     @Override
@@ -793,10 +789,10 @@ public class RouterActivity extends AppCompatActivity {
                     }
                 }
 
-            }, () ->
+            }, () -> {
                 // this branch is executed if there is no activity context
-                inFlight(false)
-            );
+                inFlight(false);
+            });
         }
 
         <T> Single<T> pleaseWait(final Single<T> single) {
@@ -816,24 +812,19 @@ public class RouterActivity extends AppCompatActivity {
         @SuppressLint("CheckResult")
         private void openDownloadDialog(final int currentServiceId, final String currentUrl) {
             inFlight(true);
-            final LoadingDialog loadingDialog = new LoadingDialog(R.string.loading_metadata_title);
-            loadingDialog.show(getParentFragmentManager(), "loadingDialog");
             disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .compose(this::pleaseWait)
                     .subscribe(result ->
                         runOnVisible(ctx -> {
-                            loadingDialog.dismiss();
                             final FragmentManager fm = ctx.getSupportFragmentManager();
                             final DownloadDialog downloadDialog = new DownloadDialog(ctx, result);
                             // dismiss listener to be handled by FragmentManager
                             downloadDialog.show(fm, "downloadDialog");
                         }
-                        ), throwable -> runOnVisible(ctx -> {
-                        loadingDialog.dismiss();
-                        ((RouterActivity) ctx).showUnsupportedUrlDialog(currentUrl);
-                    })));
+                    ), throwable -> runOnVisible(ctx ->
+                            ((RouterActivity) ctx).showUnsupportedUrlDialog(currentUrl))));
         }
 
         private void openAddToPlaylistDialog(final int currentServiceId, final String currentUrl) {
@@ -1025,16 +1016,7 @@ public class RouterActivity extends AppCompatActivity {
                     }
                     playQueue = new SinglePlayQueue((StreamInfo) info);
                 } else if (info instanceof ChannelInfo) {
-                    final Optional<ListLinkHandler> playableTab = ((ChannelInfo) info).getTabs()
-                            .stream()
-                            .filter(ChannelTabHelper::isStreamsTab)
-                            .findFirst();
-
-                    if (playableTab.isPresent()) {
-                        playQueue = new ChannelTabPlayQueue(info.getServiceId(), playableTab.get());
-                    } else {
-                        return; // there is no playable tab
-                    }
+                    playQueue = new ChannelPlayQueue((ChannelInfo) info);
                 } else if (info instanceof PlaylistInfo) {
                     playQueue = new PlaylistPlayQueue((PlaylistInfo) info);
                 } else {

app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt

@@ -1,31 +1,199 @@
 package org.schabi.newpipe.about
 
 import android.os.Bundle
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.ui.res.stringResource
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayoutMediator
+import org.schabi.newpipe.BuildConfig
 import org.schabi.newpipe.R
-import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar
-import org.schabi.newpipe.ui.screens.AboutScreen
-import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.databinding.ActivityAboutBinding
+import org.schabi.newpipe.databinding.FragmentAboutBinding
 import org.schabi.newpipe.util.Localization
+import org.schabi.newpipe.util.ThemeHelper
+import org.schabi.newpipe.util.external_communication.ShareUtils
 
 class AboutActivity : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Localization.assureCorrectAppLanguage(this)
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+        ThemeHelper.setTheme(this)
+        title = getString(R.string.title_activity_about)
 
-        setContent {
-            AppTheme {
-                ScaffoldWithToolbar(
-                    title = stringResource(R.string.title_activity_about),
-                    onBackClick = { onBackPressedDispatcher.onBackPressed() }
-                ) { padding ->
-                    AboutScreen(padding)
-                }
+        val aboutBinding = ActivityAboutBinding.inflate(layoutInflater)
+        setContentView(aboutBinding.root)
+        setSupportActionBar(aboutBinding.aboutToolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        // Create the adapter that will return a fragment for each of the three
+        // primary sections of the activity.
+        val mAboutStateAdapter = AboutStateAdapter(this)
+        // Set up the ViewPager with the sections adapter.
+        aboutBinding.aboutViewPager2.adapter = mAboutStateAdapter
+        TabLayoutMediator(
+            aboutBinding.aboutTabLayout,
+            aboutBinding.aboutViewPager2
+        ) { tab, position ->
+            tab.setText(mAboutStateAdapter.getPageTitle(position))
+        }.attach()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            finish()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    /**
+     * A placeholder fragment containing a simple view.
+     */
+    class AboutFragment : Fragment() {
+        private fun Button.openLink(@StringRes url: Int) {
+            setOnClickListener {
+                ShareUtils.openUrlInApp(context, requireContext().getString(url))
+            }
+        }
+
+        override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+        ): View {
+            FragmentAboutBinding.inflate(inflater, container, false).apply {
+                aboutAppVersion.text = BuildConfig.VERSION_NAME
+                aboutGithubLink.openLink(R.string.github_url)
+                aboutDonationLink.openLink(R.string.donation_url)
+                aboutWebsiteLink.openLink(R.string.website_url)
+                aboutPrivacyPolicyLink.openLink(R.string.privacy_policy_url)
+                faqLink.openLink(R.string.faq_url)
+                return root
             }
         }
     }
+
+    /**
+     * A [FragmentStateAdapter] that returns a fragment corresponding to
+     * one of the sections/tabs/pages.
+     */
+    private class AboutStateAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+        private val posAbout = 0
+        private val posLicense = 1
+        private val totalCount = 2
+
+        override fun createFragment(position: Int): Fragment {
+            return when (position) {
+                posAbout -> AboutFragment()
+                posLicense -> LicenseFragment.newInstance(SOFTWARE_COMPONENTS)
+                else -> throw IllegalArgumentException("Unknown position for ViewPager2")
+            }
+        }
+
+        override fun getItemCount(): Int {
+            // Show 2 total pages.
+            return totalCount
+        }
+
+        fun getPageTitle(position: Int): Int {
+            return when (position) {
+                posAbout -> R.string.tab_about
+                posLicense -> R.string.tab_licenses
+                else -> throw IllegalArgumentException("Unknown position for ViewPager2")
+            }
+        }
+    }
+
+    companion object {
+        /**
+         * List of all software components.
+         */
+        private val SOFTWARE_COMPONENTS = arrayOf(
+            SoftwareComponent(
+                "ACRA", "2013", "Kevin Gaudin",
+                "https://github.com/ACRA/acra", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "AndroidX", "2005 - 2011", "The Android Open Source Project",
+                "https://developer.android.com/jetpack", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "ExoPlayer", "2014 - 2020", "Google, Inc.",
+                "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "GigaGet", "2014 - 2015", "Peter Cai",
+                "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL3
+            ),
+            SoftwareComponent(
+                "Groupie", "2016", "Lisa Wray",
+                "https://github.com/lisawray/groupie", StandardLicenses.MIT
+            ),
+            SoftwareComponent(
+                "Icepick", "2015", "Frankie Sardo",
+                "https://github.com/frankiesardo/icepick", StandardLicenses.EPL1
+            ),
+            SoftwareComponent(
+                "Jsoup", "2009 - 2020", "Jonathan Hedley",
+                "https://github.com/jhy/jsoup", StandardLicenses.MIT
+            ),
+            SoftwareComponent(
+                "Markwon", "2019", "Dimitry Ivanov",
+                "https://github.com/noties/Markwon", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "Material Components for Android", "2016 - 2020", "Google, Inc.",
+                "https://github.com/material-components/material-components-android",
+                StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "NewPipe Extractor", "2017 - 2020", "Christian Schabesberger",
+                "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3
+            ),
+            SoftwareComponent(
+                "NoNonsense-FilePicker", "2016", "Jonas Kalderstam",
+                "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2
+            ),
+            SoftwareComponent(
+                "OkHttp", "2019", "Square, Inc.",
+                "https://square.github.io/okhttp/", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "Picasso", "2013", "Square, Inc.",
+                "https://square.github.io/picasso/", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
+                "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "ProcessPhoenix", "2015", "Jake Wharton",
+                "https://github.com/JakeWharton/ProcessPhoenix", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "RxAndroid", "2015", "The RxAndroid authors",
+                "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "RxBinding", "2015", "Jake Wharton",
+                "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "RxJava", "2016 - 2020", "RxJava Contributors",
+                "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2
+            ),
+            SoftwareComponent(
+                "SearchPreference", "2018", "ByteHamster",
+                "https://github.com/ByteHamster/SearchPreference", StandardLicenses.MIT
+            ),
+        )
+    }
 }

app/src/main/java/org/schabi/newpipe/about/License.kt

@@ -0,0 +1,11 @@
+package org.schabi.newpipe.about
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import java.io.Serializable
+
+/**
+ * Class for storing information about a software license.
+ */
+@Parcelize
+class License(val name: String, val abbreviation: String, val filename: String) : Parcelable, Serializable

app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt

@@ -0,0 +1,86 @@
+package org.schabi.newpipe.about
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.FragmentLicensesBinding
+import org.schabi.newpipe.databinding.ItemSoftwareComponentBinding
+
+/**
+ * Fragment containing the software licenses.
+ */
+class LicenseFragment : Fragment() {
+    private lateinit var softwareComponents: Array<SoftwareComponent>
+    private var activeLicense: License? = null
+    private val compositeDisposable = CompositeDisposable()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        softwareComponents = arguments?.getParcelableArray(ARG_COMPONENTS) as Array<SoftwareComponent>
+        activeLicense = savedInstanceState?.getSerializable(LICENSE_KEY) as? License
+        // Sort components by name
+        softwareComponents.sortBy { it.name }
+    }
+
+    override fun onDestroy() {
+        compositeDisposable.dispose()
+        super.onDestroy()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val binding = FragmentLicensesBinding.inflate(inflater, container, false)
+        binding.licensesAppReadLicense.setOnClickListener {
+            activeLicense = StandardLicenses.GPL3
+            compositeDisposable.add(
+                showLicense(activity, StandardLicenses.GPL3)
+            )
+        }
+        for (component in softwareComponents) {
+            val componentBinding = ItemSoftwareComponentBinding
+                .inflate(inflater, container, false)
+            componentBinding.name.text = component.name
+            componentBinding.copyright.text = getString(
+                R.string.copyright,
+                component.years,
+                component.copyrightOwner,
+                component.license.abbreviation
+            )
+            val root: View = componentBinding.root
+            root.tag = component
+            root.setOnClickListener {
+                activeLicense = component.license
+                compositeDisposable.add(
+                    showLicense(activity, component)
+                )
+            }
+            binding.licensesSoftwareComponents.addView(root)
+            registerForContextMenu(root)
+        }
+        activeLicense?.let { compositeDisposable.add(showLicense(activity, it)) }
+        return binding.root
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        activeLicense?.let { savedInstanceState.putSerializable(LICENSE_KEY, it) }
+    }
+
+    companion object {
+        private const val ARG_COMPONENTS = "components"
+        private const val LICENSE_KEY = "ACTIVE_LICENSE"
+        fun newInstance(softwareComponents: Array<SoftwareComponent>): LicenseFragment {
+            val fragment = LicenseFragment()
+            fragment.arguments = bundleOf(ARG_COMPONENTS to softwareComponents)
+            return fragment
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt

@@ -0,0 +1,103 @@
+package org.schabi.newpipe.about
+
+import android.content.Context
+import android.util.Base64
+import android.webkit.WebView
+import androidx.appcompat.app.AlertDialog
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.schabi.newpipe.R
+import org.schabi.newpipe.util.Localization
+import org.schabi.newpipe.util.ThemeHelper
+import org.schabi.newpipe.util.external_communication.ShareUtils
+import java.io.IOException
+
+/**
+ * @param context the context to use
+ * @param license the license
+ * @return String which contains a HTML formatted license page
+ * styled according to the context's theme
+ */
+private fun getFormattedLicense(context: Context, license: License): String {
+    try {
+        return context.assets.open(license.filename).bufferedReader().use { it.readText() }
+            // split the HTML file and insert the stylesheet into the HEAD of the file
+            .replace("</head>", "<style>${getLicenseStylesheet(context)}</style></head>")
+    } catch (e: IOException) {
+        throw IllegalArgumentException("Could not get license file: ${license.filename}", e)
+    }
+}
+
+/**
+ * @param context the Android context
+ * @return String which is a CSS stylesheet according to the context's theme
+ */
+private fun getLicenseStylesheet(context: Context): String {
+    val isLightTheme = ThemeHelper.isLightThemeSelected(context)
+    val licenseBackgroundColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_license_background_color else R.color.dark_license_background_color
+    )
+    val licenseTextColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_license_text_color else R.color.dark_license_text_color
+    )
+    val youtubePrimaryColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_youtube_primary_color else R.color.dark_youtube_primary_color
+    )
+    return "body{padding:12px 15px;margin:0;background:#$licenseBackgroundColor;color:#$licenseTextColor}" +
+        "a[href]{color:#$youtubePrimaryColor}pre{white-space:pre-wrap}"
+}
+
+/**
+ * Cast R.color to a hexadecimal color value.
+ *
+ * @param context the context to use
+ * @param color   the color number from R.color
+ * @return a six characters long String with hexadecimal RGB values
+ */
+private fun getHexRGBColor(context: Context, color: Int): String {
+    return context.getString(color).substring(3)
+}
+
+fun showLicense(context: Context?, component: SoftwareComponent): Disposable {
+    return showLicense(context, component.license) {
+        setPositiveButton(R.string.dismiss) { dialog, _ ->
+            dialog.dismiss()
+        }
+        setNeutralButton(R.string.open_website_license) { _, _ ->
+            ShareUtils.openUrlInApp(context!!, component.link)
+        }
+    }
+}
+
+fun showLicense(context: Context?, license: License) = showLicense(context, license) {
+    setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
+}
+
+private fun showLicense(
+    context: Context?,
+    license: License,
+    block: AlertDialog.Builder.() -> AlertDialog.Builder
+): Disposable {
+    return if (context == null) {
+        Disposable.empty()
+    } else {
+        Observable.fromCallable { getFormattedLicense(context, license) }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { formattedLicense ->
+                val webViewData =
+                    Base64.encodeToString(formattedLicense.toByteArray(), Base64.NO_PADDING)
+                val webView = WebView(context)
+                webView.loadData(webViewData, "text/html; charset=UTF-8", "base64")
+
+                Localization.assureCorrectAppLanguage(context)
+                AlertDialog.Builder(context)
+                    .setTitle(license.name)
+                    .setView(webView)
+                    .block()
+                    .show()
+            }
+    }
+}

app/src/main/java/org/schabi/newpipe/about/SoftwareComponent.kt

@@ -0,0 +1,16 @@
+package org.schabi.newpipe.about
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+class SoftwareComponent
+@JvmOverloads
+constructor(
+    val name: String,
+    val years: String,
+    val copyrightOwner: String,
+    val link: String,
+    val license: License,
+    val version: String? = null
+) : Parcelable

app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt

@@ -0,0 +1,21 @@
+package org.schabi.newpipe.about
+
+/**
+ * Class containing information about standard software licenses.
+ */
+object StandardLicenses {
+    @JvmField
+    val GPL3 = License("GNU General Public License, Version 3.0", "GPLv3", "gpl_3.html")
+
+    @JvmField
+    val APACHE2 = License("Apache License, Version 2.0", "ALv2", "apache2.html")
+
+    @JvmField
+    val MPL2 = License("Mozilla Public License, Version 2.0", "MPL 2.0", "mpl2.html")
+
+    @JvmField
+    val MIT = License("MIT License", "MIT", "mit.html")
+
+    @JvmField
+    val EPL1 = License("Eclipse Public License, Version 1.0", "EPL 1.0", "epl1.html")
+}

app/src/main/java/org/schabi/newpipe/database/AppDatabase.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database;
 
-import static org.schabi.newpipe.database.Migrations.DB_VER_9;
+import static org.schabi.newpipe.database.Migrations.DB_VER_7;
 
 import androidx.room.Database;
 import androidx.room.RoomDatabase;
@@ -38,7 +38,7 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity;
                 FeedEntity.class, FeedGroupEntity.class, FeedGroupSubscriptionEntity.class,
                 FeedLastUpdatedEntity.class
         },
-        version = DB_VER_9
+        version = DB_VER_7
 )
 public abstract class AppDatabase extends RoomDatabase {
     public static final String DATABASE_NAME = "newpipe.db";

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

@@ -7,7 +7,7 @@ import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
 
-class Converters {
+object Converters {
     /**
      * Convert a long value to a [OffsetDateTime].
      *
@@ -47,6 +47,6 @@ class Converters {
 
     @TypeConverter
     fun feedGroupIconOf(id: Int): FeedGroupIcon {
-        return FeedGroupIcon.entries.first { it.id == id }
+        return FeedGroupIcon.values().first { it.id == id }
     }
 }

app/src/main/java/org/schabi/newpipe/database/Migrations.java

@@ -25,8 +25,6 @@ public final class Migrations {
     public static final int DB_VER_5 = 5;
     public static final int DB_VER_6 = 6;
     public static final int DB_VER_7 = 7;
-    public static final int DB_VER_8 = 8;
-    public static final int DB_VER_9 = 9;
 
     private static final String TAG = Migrations.class.getName();
     public static final boolean DEBUG = MainActivity.DEBUG;
@@ -188,7 +186,7 @@ public final class Migrations {
         @Override
         public void migrate(@NonNull final SupportSQLiteDatabase database) {
             database.execSQL("ALTER TABLE `subscriptions` ADD COLUMN `notification_mode` "
-                    + "INTEGER NOT NULL DEFAULT 0");
+                     + "INTEGER NOT NULL DEFAULT 0");
         }
     };
 
@@ -237,71 +235,6 @@ public final class Migrations {
         }
     };
 
-    public static final Migration MIGRATION_7_8 = new Migration(DB_VER_7, DB_VER_8) {
-        @Override
-        public void migrate(@NonNull final SupportSQLiteDatabase database) {
-            database.execSQL("DELETE FROM search_history WHERE id NOT IN (SELECT id FROM (SELECT "
-                    + "MIN(id) as id FROM search_history GROUP BY trim(search), service_id ) tmp)");
-            database.execSQL("UPDATE search_history SET search = trim(search)");
-        }
-    };
-
-    public static final Migration MIGRATION_8_9 = new Migration(DB_VER_8, DB_VER_9) {
-        @Override
-        public void migrate(@NonNull final SupportSQLiteDatabase database) {
-            try {
-                database.beginTransaction();
-
-                // Update playlists.
-                // Create a temp table to initialize display_index.
-                database.execSQL("CREATE TABLE `playlists_tmp` "
-                        + "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-                        + "`name` TEXT, `is_thumbnail_permanent` INTEGER NOT NULL, "
-                        + "`thumbnail_stream_id` INTEGER NOT NULL, "
-                        + "`display_index` INTEGER NOT NULL)");
-                database.execSQL("INSERT INTO `playlists_tmp` "
-                        + "(`uid`, `name`, `is_thumbnail_permanent`, `thumbnail_stream_id`, "
-                        + "`display_index`) "
-                        + "SELECT `uid`, `name`, `is_thumbnail_permanent`, `thumbnail_stream_id`, "
-                        + "-1 "
-                        + "FROM `playlists`");
-
-                // Replace the old table, note that this also removes the index on the name which
-                // we don't need anymore.
-                database.execSQL("DROP TABLE `playlists`");
-                database.execSQL("ALTER TABLE `playlists_tmp` RENAME TO `playlists`");
-
-
-                // Update remote_playlists.
-                // Create a temp table to initialize display_index.
-                database.execSQL("CREATE TABLE `remote_playlists_tmp` "
-                        + "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
-                        + "`service_id` INTEGER NOT NULL, `name` TEXT, `url` TEXT, "
-                        + "`thumbnail_url` TEXT, `uploader` TEXT, "
-                        + "`display_index` INTEGER NOT NULL,"
-                        + "`stream_count` INTEGER)");
-                database.execSQL("INSERT INTO `remote_playlists_tmp` (`uid`, `service_id`, "
-                        + "`name`, `url`, `thumbnail_url`, `uploader`, `display_index`, "
-                        + "`stream_count`)"
-                        + "SELECT `uid`, `service_id`, `name`, `url`, `thumbnail_url`, `uploader`, "
-                        + "-1, `stream_count` FROM `remote_playlists`");
-
-                // Replace the old table, note that this also removes the index on the name which
-                // we don't need anymore.
-                database.execSQL("DROP TABLE `remote_playlists`");
-                database.execSQL("ALTER TABLE `remote_playlists_tmp` RENAME TO `remote_playlists`");
-
-                // Create index on the new table.
-                database.execSQL("CREATE UNIQUE INDEX `index_remote_playlists_service_id_url` "
-                        + "ON `remote_playlists` (`service_id`, `url`)");
-
-                database.setTransactionSuccessful();
-            } finally {
-                database.endTransaction();
-            }
-        }
-    };
-
     private Migrations() {
     }
 }

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

@@ -93,30 +93,18 @@ abstract class FeedDAO {
         uploadDateBefore: OffsetDateTime?
     ): Maybe<List<StreamWithState>>
 
-    /**
-     * Remove links to streams that are older than the given date
-     * **but keep at least one stream per uploader**.
-     *
-     * One stream per uploader is kept because it is needed as reference
-     * when fetching new streams to check if they are new or not.
-     * @param offsetDateTime the newest date to keep, older streams are removed
-     */
     @Query(
         """
-        DELETE FROM feed
-        WHERE feed.stream_id IN (SELECT uid from (
-              SELECT s.uid,
-              (SELECT MAX(upload_date)
-                    FROM streams s1
-                    INNER JOIN feed f1
-                    ON s1.uid = f1.stream_id
-                    WHERE f1.subscription_id = f.subscription_id) max_upload_date
-              FROM streams s
-              INNER JOIN feed f
-              ON s.uid = f.stream_id
-        
-              WHERE s.upload_date < :offsetDateTime
-              AND   s.upload_date <> max_upload_date))
+        DELETE FROM feed WHERE
+
+        feed.stream_id IN (
+            SELECT s.uid FROM streams s
+
+            INNER JOIN feed f
+            ON s.uid = f.stream_id
+
+            WHERE s.upload_date < :offsetDateTime
+        )
         """
     )
     abstract fun unlinkStreamsOlderThan(offsetDateTime: OffsetDateTime)

app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt

@@ -3,6 +3,7 @@ package org.schabi.newpipe.database.feed.model
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
 import androidx.room.Index
 import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity.Companion.FEED_GROUP_SUBSCRIPTION_TABLE
 import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity.Companion.GROUP_ID
@@ -18,14 +19,14 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity
             entity = FeedGroupEntity::class,
             parentColumns = [FeedGroupEntity.ID],
             childColumns = [GROUP_ID],
-            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
+            onDelete = CASCADE, onUpdate = CASCADE, deferred = true
         ),
 
         ForeignKey(
             entity = SubscriptionEntity::class,
             parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
             childColumns = [SUBSCRIPTION_ID],
-            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
+            onDelete = CASCADE, onUpdate = CASCADE, deferred = true
         )
     ]
 )

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

@@ -13,17 +13,12 @@ public class PlaylistDuplicatesEntry extends PlaylistMetadataEntry {
     @ColumnInfo(name = PLAYLIST_TIMES_STREAM_IS_CONTAINED)
     public final long timesStreamIsContained;
 
-    @SuppressWarnings("checkstyle:ParameterNumber")
     public PlaylistDuplicatesEntry(final long uid,
                                    final String name,
                                    final String thumbnailUrl,
-                                   final boolean isThumbnailPermanent,
-                                   final long thumbnailStreamId,
-                                   final long displayIndex,
                                    final long streamCount,
                                    final long timesStreamIsContained) {
-        super(uid, name, thumbnailUrl, isThumbnailPermanent, thumbnailStreamId, displayIndex,
-                streamCount);
+        super(uid, name, thumbnailUrl, streamCount);
         this.timesStreamIsContained = timesStreamIsContained;
     }
 }

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

@@ -1,13 +1,22 @@
 package org.schabi.newpipe.database.playlist;
 
 import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public interface PlaylistLocalItem extends LocalItem {
     String getOrderingName();
 
-    long getDisplayIndex();
-
-    long getUid();
-
-    void setDisplayIndex(long displayIndex);
+    static List<PlaylistLocalItem> merge(
+            final List<PlaylistMetadataEntry> localPlaylists,
+            final List<PlaylistRemoteEntity> remotePlaylists) {
+        return Stream.concat(localPlaylists.stream(), remotePlaylists.stream())
+                .sorted(Comparator.comparing(PlaylistLocalItem::getOrderingName,
+                        Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -2,40 +2,27 @@ package org.schabi.newpipe.database.playlist;
 
 import androidx.room.ColumnInfo;
 
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_DISPLAY_INDEX;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_PERMANENT;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_STREAM_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_URL;
 
 public class PlaylistMetadataEntry implements PlaylistLocalItem {
     public static final String PLAYLIST_STREAM_COUNT = "streamCount";
 
     @ColumnInfo(name = PLAYLIST_ID)
-    private final long uid;
+    public final long uid;
     @ColumnInfo(name = PLAYLIST_NAME)
     public final String name;
-    @ColumnInfo(name = PLAYLIST_THUMBNAIL_PERMANENT)
-    private final boolean isThumbnailPermanent;
-    @ColumnInfo(name = PLAYLIST_THUMBNAIL_STREAM_ID)
-    private final long thumbnailStreamId;
     @ColumnInfo(name = PLAYLIST_THUMBNAIL_URL)
     public final String thumbnailUrl;
-    @ColumnInfo(name = PLAYLIST_DISPLAY_INDEX)
-    private long displayIndex;
     @ColumnInfo(name = PLAYLIST_STREAM_COUNT)
     public final long streamCount;
 
     public PlaylistMetadataEntry(final long uid, final String name, final String thumbnailUrl,
-                                 final boolean isThumbnailPermanent, final long thumbnailStreamId,
-                                 final long displayIndex, final long streamCount) {
+                                 final long streamCount) {
         this.uid = uid;
         this.name = name;
         this.thumbnailUrl = thumbnailUrl;
-        this.isThumbnailPermanent = isThumbnailPermanent;
-        this.thumbnailStreamId = thumbnailStreamId;
-        this.displayIndex = displayIndex;
         this.streamCount = streamCount;
     }
 
@@ -48,27 +35,4 @@ public class PlaylistMetadataEntry implements PlaylistLocalItem {
     public String getOrderingName() {
         return name;
     }
-
-    public boolean isThumbnailPermanent() {
-        return isThumbnailPermanent;
-    }
-
-    public long getThumbnailStreamId() {
-        return thumbnailStreamId;
-    }
-
-    @Override
-    public long getDisplayIndex() {
-        return displayIndex;
-    }
-
-    @Override
-    public long getUid() {
-        return uid;
-    }
-
-    @Override
-    public void setDisplayIndex(final long displayIndex) {
-        this.displayIndex = displayIndex;
-    }
 }

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

@@ -7,7 +7,6 @@ import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.stream.model.StreamStateEntity
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.util.image.ImageStrategy
 
 data class PlaylistStreamEntry(
     @Embedded
@@ -29,7 +28,7 @@ data class PlaylistStreamEntry(
         item.duration = streamEntity.duration
         item.uploaderName = streamEntity.uploader
         item.uploaderUrl = streamEntity.uploaderUrl
-        item.thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+        item.thumbnailUrl = streamEntity.thumbnailUrl
 
         return item
     }

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.database.playlist.dao;
 
 import androidx.room.Dao;
 import androidx.room.Query;
-import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
@@ -37,17 +36,4 @@ public interface PlaylistDAO extends BasicDAO<PlaylistEntity> {
 
     @Query("SELECT COUNT(*) FROM " + PLAYLIST_TABLE)
     Flowable<Long> getCount();
-
-    @Transaction
-    default long upsertPlaylist(final PlaylistEntity playlist) {
-        final long playlistId = playlist.getUid();
-
-        if (playlistId == -1) {
-            // This situation is probably impossible.
-            return insert(playlist);
-        } else {
-            update(playlist);
-            return playlistId;
-        }
-    }
 }

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

@@ -11,7 +11,6 @@ import java.util.List;
 
 import io.reactivex.rxjava3.core.Flowable;
 
-import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_DISPLAY_INDEX;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_SERVICE_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_TABLE;
@@ -32,18 +31,10 @@ public interface PlaylistRemoteDAO extends BasicDAO<PlaylistRemoteEntity> {
             + " WHERE " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
     Flowable<List<PlaylistRemoteEntity>> listByService(int serviceId);
 
-    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
-            + REMOTE_PLAYLIST_ID + " = :playlistId")
-    Flowable<List<PlaylistRemoteEntity>> getPlaylist(long playlistId);
-
     @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
             + REMOTE_PLAYLIST_URL + " = :url AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
     Flowable<List<PlaylistRemoteEntity>> getPlaylist(long serviceId, String url);
 
-    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE
-     + " ORDER BY " + REMOTE_PLAYLIST_DISPLAY_INDEX)
-    Flowable<List<PlaylistRemoteEntity>> getPlaylists();
-
     @Query("SELECT " + REMOTE_PLAYLIST_ID + " FROM " + REMOTE_PLAYLIST_TABLE
             + " WHERE " + REMOTE_PLAYLIST_URL + " = :url "
             + "AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")

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

@@ -18,12 +18,10 @@ import io.reactivex.rxjava3.core.Flowable;
 
 import static org.schabi.newpipe.database.playlist.PlaylistDuplicatesEntry.PLAYLIST_TIMES_STREAM_IS_CONTAINED;
 import static org.schabi.newpipe.database.playlist.PlaylistMetadataEntry.PLAYLIST_STREAM_COUNT;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_DISPLAY_INDEX;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.DEFAULT_THUMBNAIL;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_PERMANENT;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_STREAM_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_URL;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_INDEX;
@@ -93,9 +91,7 @@ public interface PlaylistStreamDAO extends BasicDAO<PlaylistStreamEntity> {
     Flowable<List<PlaylistStreamEntry>> getOrderedStreamsOf(long playlistId);
 
     @Transaction
-    @Query("SELECT " + PLAYLIST_ID + ", " + PLAYLIST_NAME + ", "
-            + PLAYLIST_THUMBNAIL_PERMANENT + ", " + PLAYLIST_THUMBNAIL_STREAM_ID + ", "
-            + PLAYLIST_DISPLAY_INDEX + ", "
+    @Query("SELECT " + PLAYLIST_ID + ", " + PLAYLIST_NAME + ","
 
             + " CASE WHEN " + PLAYLIST_THUMBNAIL_STREAM_ID + " = "
             + PlaylistEntity.DEFAULT_THUMBNAIL_ID + " THEN " + "'" + DEFAULT_THUMBNAIL + "'"
@@ -109,7 +105,7 @@ public interface PlaylistStreamDAO extends BasicDAO<PlaylistStreamEntity> {
             + " LEFT JOIN " + PLAYLIST_STREAM_JOIN_TABLE
             + " ON " + PLAYLIST_TABLE + "." + PLAYLIST_ID + " = " + JOIN_PLAYLIST_ID
             + " GROUP BY " + PLAYLIST_ID
-            + " ORDER BY " + PLAYLIST_DISPLAY_INDEX)
+            + " ORDER BY " + PLAYLIST_NAME + " COLLATE NOCASE ASC")
     Flowable<List<PlaylistMetadataEntry>> getPlaylistMetadata();
 
     @RewriteQueriesToDropUnusedColumns
@@ -130,9 +126,8 @@ public interface PlaylistStreamDAO extends BasicDAO<PlaylistStreamEntity> {
     Flowable<List<PlaylistStreamEntry>> getStreamsWithoutDuplicates(long playlistId);
 
     @Transaction
-    @Query("SELECT " + PLAYLIST_TABLE + "." + PLAYLIST_ID + ", " + PLAYLIST_NAME + ", "
-            + PLAYLIST_THUMBNAIL_PERMANENT + ", " + PLAYLIST_THUMBNAIL_STREAM_ID + ", "
-            + PLAYLIST_DISPLAY_INDEX + ", "
+    @Query("SELECT " + PLAYLIST_TABLE + "." + PLAYLIST_ID + ", "
+            + PLAYLIST_NAME + ", "
 
             + " CASE WHEN " + PLAYLIST_THUMBNAIL_STREAM_ID + " = "
             + PlaylistEntity.DEFAULT_THUMBNAIL_ID + " THEN " + "'" + DEFAULT_THUMBNAIL + "'"
@@ -154,6 +149,6 @@ public interface PlaylistStreamDAO extends BasicDAO<PlaylistStreamEntity> {
             + " AND :streamUrl = :streamUrl"
 
             + " GROUP BY " + JOIN_PLAYLIST_ID
-            + " ORDER BY " + PLAYLIST_DISPLAY_INDEX)
+            + " ORDER BY " + PLAYLIST_NAME + " COLLATE NOCASE ASC")
     Flowable<List<PlaylistDuplicatesEntry>> getPlaylistDuplicatesMetadata(String streamUrl);
 }

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

@@ -2,15 +2,16 @@ package org.schabi.newpipe.database.playlist.model;
 
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
-import androidx.room.Ignore;
+import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 
-@Entity(tableName = PLAYLIST_TABLE)
+@Entity(tableName = PLAYLIST_TABLE,
+        indices = {@Index(value = {PLAYLIST_NAME})})
 public class PlaylistEntity {
 
     public static final String DEFAULT_THUMBNAIL = "drawable://"
@@ -21,7 +22,6 @@ public class PlaylistEntity {
     public static final String PLAYLIST_ID = "uid";
     public static final String PLAYLIST_NAME = "name";
     public static final String PLAYLIST_THUMBNAIL_URL = "thumbnail_url";
-    public static final String PLAYLIST_DISPLAY_INDEX = "display_index";
     public static final String PLAYLIST_THUMBNAIL_PERMANENT = "is_thumbnail_permanent";
     public static final String PLAYLIST_THUMBNAIL_STREAM_ID = "thumbnail_stream_id";
 
@@ -38,24 +38,11 @@ public class PlaylistEntity {
     @ColumnInfo(name = PLAYLIST_THUMBNAIL_STREAM_ID)
     private long thumbnailStreamId;
 
-    @ColumnInfo(name = PLAYLIST_DISPLAY_INDEX)
-    private long displayIndex;
-
     public PlaylistEntity(final String name, final boolean isThumbnailPermanent,
-                          final long thumbnailStreamId, final long displayIndex) {
+                          final long thumbnailStreamId) {
         this.name = name;
         this.isThumbnailPermanent = isThumbnailPermanent;
         this.thumbnailStreamId = thumbnailStreamId;
-        this.displayIndex = displayIndex;
-    }
-
-    @Ignore
-    public PlaylistEntity(final PlaylistMetadataEntry item) {
-        this.uid = item.getUid();
-        this.name = item.name;
-        this.isThumbnailPermanent = item.isThumbnailPermanent();
-        this.thumbnailStreamId = item.getThumbnailStreamId();
-        this.displayIndex = item.getDisplayIndex();
     }
 
     public long getUid() {
@@ -90,11 +77,4 @@ public class PlaylistEntity {
         this.isThumbnailPermanent = isThumbnailSet;
     }
 
-    public long getDisplayIndex() {
-        return displayIndex;
-    }
-
-    public void setDisplayIndex(final long displayIndex) {
-        this.displayIndex = displayIndex;
-    }
 }

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

@@ -11,7 +11,6 @@ import androidx.room.PrimaryKey;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.image.ImageStrategy;
 
 import static org.schabi.newpipe.database.LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM;
 import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_NAME;
@@ -21,6 +20,7 @@ import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.RE
 
 @Entity(tableName = REMOTE_PLAYLIST_TABLE,
         indices = {
+                @Index(value = {REMOTE_PLAYLIST_NAME}),
                 @Index(value = {REMOTE_PLAYLIST_SERVICE_ID, REMOTE_PLAYLIST_URL}, unique = true)
         })
 public class PlaylistRemoteEntity implements PlaylistLocalItem {
@@ -31,7 +31,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
     public static final String REMOTE_PLAYLIST_URL = "url";
     public static final String REMOTE_PLAYLIST_THUMBNAIL_URL = "thumbnail_url";
     public static final String REMOTE_PLAYLIST_UPLOADER_NAME = "uploader";
-    public static final String REMOTE_PLAYLIST_DISPLAY_INDEX = "display_index";
     public static final String REMOTE_PLAYLIST_STREAM_COUNT = "stream_count";
 
     @PrimaryKey(autoGenerate = true)
@@ -53,9 +52,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
     @ColumnInfo(name = REMOTE_PLAYLIST_UPLOADER_NAME)
     private String uploader;
 
-    @ColumnInfo(name = REMOTE_PLAYLIST_DISPLAY_INDEX)
-    private long displayIndex = -1; // Make sure the new item is on the top
-
     @ColumnInfo(name = REMOTE_PLAYLIST_STREAM_COUNT)
     private Long streamCount;
 
@@ -70,25 +66,11 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
         this.streamCount = streamCount;
     }
 
-    @Ignore
-    public PlaylistRemoteEntity(final int serviceId, final String name, final String url,
-                                final String thumbnailUrl, final String uploader,
-                                final long displayIndex, final Long streamCount) {
-        this.serviceId = serviceId;
-        this.name = name;
-        this.url = url;
-        this.thumbnailUrl = thumbnailUrl;
-        this.uploader = uploader;
-        this.displayIndex = displayIndex;
-        this.streamCount = streamCount;
-    }
-
     @Ignore
     public PlaylistRemoteEntity(final PlaylistInfo info) {
         this(info.getServiceId(), info.getName(), info.getUrl(),
-                // use uploader avatar when no thumbnail is available
-                ImageStrategy.imageListToDbUrl(info.getThumbnails().isEmpty()
-                        ? info.getUploaderAvatars() : info.getThumbnails()),
+                info.getThumbnailUrl() == null
+                        ? info.getUploaderAvatarUrl() : info.getThumbnailUrl(),
                 info.getUploaderName(), info.getStreamCount());
     }
 
@@ -102,14 +84,10 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
                 && getStreamCount() == info.getStreamCount()
                 && TextUtils.equals(getName(), info.getName())
                 && TextUtils.equals(getUrl(), info.getUrl())
-                // we want to update the local playlist data even when either the remote thumbnail
-                // URL changes, or the preferred image quality setting is changed by the user
-                && TextUtils.equals(getThumbnailUrl(),
-                ImageStrategy.imageListToDbUrl(info.getThumbnails()))
+                && TextUtils.equals(getThumbnailUrl(), info.getThumbnailUrl())
                 && TextUtils.equals(getUploader(), info.getUploaderName());
     }
 
-    @Override
     public long getUid() {
         return uid;
     }
@@ -158,16 +136,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
         this.uploader = uploader;
     }
 
-    @Override
-    public long getDisplayIndex() {
-        return displayIndex;
-    }
-
-    @Override
-    public void setDisplayIndex(final long displayIndex) {
-        this.displayIndex = displayIndex;
-    }
-
     public Long getStreamCount() {
         return streamCount;
     }

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

@@ -7,7 +7,6 @@ import org.schabi.newpipe.database.history.model.StreamHistoryEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_PROGRESS_MILLIS
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.util.image.ImageStrategy
 import java.time.OffsetDateTime
 
 class StreamStatisticsEntry(
@@ -31,7 +30,7 @@ class StreamStatisticsEntry(
         item.duration = streamEntity.duration
         item.uploaderName = streamEntity.uploader
         item.uploaderUrl = streamEntity.uploaderUrl
-        item.thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+        item.thumbnailUrl = streamEntity.thumbnailUrl
 
         return item
     }

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

@@ -8,7 +8,6 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Maybe
 import org.schabi.newpipe.database.BasicDAO
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_ID
@@ -28,7 +27,7 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
     abstract override fun listByService(serviceId: Int): Flowable<List<StreamEntity>>
 
     @Query("SELECT * FROM streams WHERE url = :url AND service_id = :serviceId")
-    abstract fun getStream(serviceId: Long, url: String): Maybe<StreamEntity>
+    abstract fun getStream(serviceId: Long, url: String): Flowable<List<StreamEntity>>
 
     @Query("UPDATE streams SET uploader_url = :uploaderUrl WHERE url = :url AND service_id = :serviceId")
     abstract fun setUploaderUrl(serviceId: Long, url: String, uploaderUrl: String): Completable

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java

@@ -1,8 +1,5 @@
 package org.schabi.newpipe.database.stream.dao;
 
-import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
-import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
-
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
@@ -15,7 +12,9 @@ import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import java.util.List;
 
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.core.Maybe;
+
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
 
 @Dao
 public interface StreamStateDAO extends BasicDAO<StreamStateEntity> {
@@ -33,7 +32,7 @@ public interface StreamStateDAO extends BasicDAO<StreamStateEntity> {
     }
 
     @Query("SELECT * FROM " + STREAM_STATE_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
-    Maybe<StreamStateEntity> getState(long streamId);
+    Flowable<List<StreamStateEntity>> getState(long streamId);
 
     @Query("DELETE FROM " + STREAM_STATE_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
     int deleteState(long streamId);

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

@@ -13,7 +13,6 @@ import org.schabi.newpipe.extractor.stream.StreamInfo
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.extractor.stream.StreamType
 import org.schabi.newpipe.player.playqueue.PlayQueueItem
-import org.schabi.newpipe.util.image.ImageStrategy
 import java.io.Serializable
 import java.time.OffsetDateTime
 
@@ -68,8 +67,7 @@ data class StreamEntity(
     constructor(item: StreamInfoItem) : this(
         serviceId = item.serviceId, url = item.url, title = item.name,
         streamType = item.streamType, duration = item.duration, uploader = item.uploaderName,
-        uploaderUrl = item.uploaderUrl,
-        thumbnailUrl = ImageStrategy.imageListToDbUrl(item.thumbnails), viewCount = item.viewCount,
+        uploaderUrl = item.uploaderUrl, thumbnailUrl = item.thumbnailUrl, viewCount = item.viewCount,
         textualUploadDate = item.textualUploadDate, uploadDate = item.uploadDate?.offsetDateTime(),
         isUploadDateApproximation = item.uploadDate?.isApproximation
     )
@@ -78,8 +76,7 @@ data class StreamEntity(
     constructor(info: StreamInfo) : this(
         serviceId = info.serviceId, url = info.url, title = info.name,
         streamType = info.streamType, duration = info.duration, uploader = info.uploaderName,
-        uploaderUrl = info.uploaderUrl,
-        thumbnailUrl = ImageStrategy.imageListToDbUrl(info.thumbnails), viewCount = info.viewCount,
+        uploaderUrl = info.uploaderUrl, thumbnailUrl = info.thumbnailUrl, viewCount = info.viewCount,
         textualUploadDate = info.textualUploadDate, uploadDate = info.uploadDate?.offsetDateTime(),
         isUploadDateApproximation = info.uploadDate?.isApproximation
     )
@@ -88,8 +85,7 @@ data class StreamEntity(
     constructor(item: PlayQueueItem) : this(
         serviceId = item.serviceId, url = item.url, title = item.title,
         streamType = item.streamType, duration = item.duration, uploader = item.uploader,
-        uploaderUrl = item.uploaderUrl,
-        thumbnailUrl = ImageStrategy.imageListToDbUrl(item.thumbnails)
+        uploaderUrl = item.uploaderUrl, thumbnailUrl = item.thumbnailUrl
     )
 
     fun toStreamInfoItem(): StreamInfoItem {
@@ -97,7 +93,7 @@ data class StreamEntity(
         item.duration = duration
         item.uploaderName = uploader
         item.uploaderUrl = uploaderUrl
-        item.thumbnails = ImageStrategy.dbUrlToImageList(thumbnailUrl)
+        item.thumbnailUrl = thumbnailUrl
 
         if (viewCount != null) item.viewCount = viewCount as Long
         item.textualUploadDate = textualUploadDate

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.database.subscription;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -11,7 +10,6 @@ import androidx.room.PrimaryKey;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.image.ImageStrategy;
 
 import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_SERVICE_ID;
 import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_TABLE;
@@ -59,8 +57,8 @@ public class SubscriptionEntity {
         final SubscriptionEntity result = new SubscriptionEntity();
         result.setServiceId(info.getServiceId());
         result.setUrl(info.getUrl());
-        result.setData(info.getName(), ImageStrategy.imageListToDbUrl(info.getAvatars()),
-                info.getDescription(), info.getSubscriberCount());
+        result.setData(info.getName(), info.getAvatarUrl(), info.getDescription(),
+                info.getSubscriberCount());
         return result;
     }
 
@@ -96,12 +94,11 @@ public class SubscriptionEntity {
         this.name = name;
     }
 
-    @Nullable
     public String getAvatarUrl() {
         return avatarUrl;
     }
 
-    public void setAvatarUrl(@Nullable final String avatarUrl) {
+    public void setAvatarUrl(final String avatarUrl) {
         this.avatarUrl = avatarUrl;
     }
 
@@ -141,7 +138,7 @@ public class SubscriptionEntity {
     @Ignore
     public ChannelInfoItem toChannelInfoItem() {
         final ChannelInfoItem item = new ChannelInfoItem(getServiceId(), getUrl(), getName());
-        item.setThumbnails(ImageStrategy.dbUrlToImageList(getAvatarUrl()));
+        item.setThumbnailUrl(getAvatarUrl());
         item.setSubscriberCount(getSubscriberCount());
         item.setDescription(getDescription());
         return item;

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -7,6 +7,8 @@ import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
@@ -14,7 +16,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
-import android.provider.Settings;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -39,8 +40,6 @@ import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
 import com.nononsenseapps.filepicker.Utils;
 
 import org.schabi.newpipe.MainActivity;
@@ -61,8 +60,6 @@ import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
 import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
 import org.schabi.newpipe.streams.io.StoredFileHelper;
-import org.schabi.newpipe.util.AudioTrackAdapter;
-import org.schabi.newpipe.util.AudioTrackAdapter.AudioTracksWrapper;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
@@ -70,17 +67,20 @@ import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.SecondaryStreamHelper;
 import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
 import org.schabi.newpipe.util.StreamItemAdapter;
-import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
+import org.schabi.newpipe.util.AudioTrackAdapter;
+import org.schabi.newpipe.util.AudioTrackAdapter.AudioTracksWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 
+import icepick.Icepick;
+import icepick.State;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import us.shandian.giga.get.MissionRecoveryInfo;
 import us.shandian.giga.postprocessing.Postprocessing;
@@ -97,9 +97,9 @@ public class DownloadDialog extends DialogFragment
     @State
     StreamInfo currentInfo;
     @State
-    StreamInfoWrapper<VideoStream> wrappedVideoStreams;
+    StreamSizeWrapper<VideoStream> wrappedVideoStreams;
     @State
-    StreamInfoWrapper<SubtitlesStream> wrappedSubtitleStreams;
+    StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams;
     @State
     AudioTracksWrapper wrappedAudioTracks;
     @State
@@ -111,11 +111,14 @@ public class DownloadDialog extends DialogFragment
     @State
     int selectedSubtitleIndex = 0; // default to the first item
 
+    @Nullable
+    private OnDismissListener onDismissListener = null;
+
     private StoredDirectoryHelper mainStorageAudio = null;
     private StoredDirectoryHelper mainStorageVideo = null;
     private DownloadManager downloadManager = null;
     private ActionMenuItemView okButton = null;
-    private Context context = null;
+    private Context context;
     private boolean askForSavePath;
 
     private AudioTrackAdapter audioTrackAdapter;
@@ -143,6 +146,7 @@ public class DownloadDialog extends DialogFragment
             registerForActivityResult(
                     new StartActivityForResult(), this::requestDownloadPickVideoFolderResult);
 
+
     /*//////////////////////////////////////////////////////////////////////////
     // Instance creation
     //////////////////////////////////////////////////////////////////////////*/
@@ -183,13 +187,20 @@ public class DownloadDialog extends DialogFragment
                 wrappedAudioTracks.size() > 1
         );
 
-        this.wrappedVideoStreams = new StreamInfoWrapper<>(videoStreams, context);
-        this.wrappedSubtitleStreams = new StreamInfoWrapper<>(
+        this.wrappedVideoStreams = new StreamSizeWrapper<>(videoStreams, context);
+        this.wrappedSubtitleStreams = new StreamSizeWrapper<>(
                 getStreamsOfSpecifiedDelivery(info.getSubtitles(), PROGRESSIVE_HTTP), context);
 
         this.selectedVideoIndex = ListHelper.getDefaultResolutionIndex(context, videoStreams);
     }
 
+    /**
+     * @param onDismissListener the listener to call in {@link #onDismiss(DialogInterface)}
+     */
+    public void setOnDismissListener(@Nullable final OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
 
     /*//////////////////////////////////////////////////////////////////////////
     // Android lifecycle
@@ -209,12 +220,10 @@ public class DownloadDialog extends DialogFragment
             return;
         }
 
-        // context will remain null if dismiss() was called above, allowing to check whether the
-        // dialog is being dismissed in onViewCreated()
         context = getContext();
 
         setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
         this.audioTrackAdapter = new AudioTrackAdapter(wrappedAudioTracks);
         this.subtitleStreamsAdapter = new StreamItemAdapter<>(wrappedSubtitleStreams);
@@ -249,17 +258,17 @@ public class DownloadDialog extends DialogFragment
      * Update the displayed video streams based on the selected audio track.
      */
     private void updateSecondaryStreams() {
-        final StreamInfoWrapper<AudioStream> audioStreams = getWrappedAudioStreams();
+        final StreamSizeWrapper<AudioStream> audioStreams = getWrappedAudioStreams();
         final var secondaryStreams = new SparseArrayCompat<SecondaryStreamHelper<AudioStream>>(4);
         final List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
-        wrappedVideoStreams.resetInfo();
+        wrappedVideoStreams.resetSizes();
 
         for (int i = 0; i < videoStreams.size(); i++) {
             if (!videoStreams.get(i).isVideoOnly()) {
                 continue;
             }
-            final AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(
-                    context, audioStreams.getStreamsList(), videoStreams.get(i));
+            final AudioStream audioStream = SecondaryStreamHelper
+                    .getAudioStreamFor(audioStreams.getStreamsList(), videoStreams.get(i));
 
             if (audioStream != null) {
                 secondaryStreams.append(i, new SecondaryStreamHelper<>(audioStreams, audioStream));
@@ -295,9 +304,6 @@ public class DownloadDialog extends DialogFragment
                               @Nullable final Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         dialogBinding = DownloadDialogBinding.bind(view);
-        if (context == null) {
-            return; // the dialog is being dismissed, see the call to dismiss() in onCreate()
-        }
 
         dialogBinding.fileName.setText(FilenameUtils.createFilename(getContext(),
                 currentInfo.getName()));
@@ -307,7 +313,6 @@ public class DownloadDialog extends DialogFragment
         selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
 
         dialogBinding.qualitySpinner.setOnItemSelectedListener(this);
-        dialogBinding.audioStreamSpinner.setOnItemSelectedListener(this);
         dialogBinding.audioTrackSpinner.setOnItemSelectedListener(this);
         dialogBinding.videoAudioGroup.setOnCheckedChangeListener(this);
 
@@ -357,6 +362,14 @@ public class DownloadDialog extends DialogFragment
         });
     }
 
+    @Override
+    public void onDismiss(@NonNull final DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -372,7 +385,7 @@ public class DownloadDialog extends DialogFragment
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
 
@@ -382,7 +395,7 @@ public class DownloadDialog extends DialogFragment
 
     private void fetchStreamsSize() {
         disposables.clear();
-        disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(wrappedVideoStreams)
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams)
                 .subscribe(result -> {
                     if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
                             == R.id.video_button) {
@@ -392,7 +405,7 @@ public class DownloadDialog extends DialogFragment
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading video stream size",
                                 currentInfo.getServiceId()))));
-        disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(getWrappedAudioStreams())
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(getWrappedAudioStreams())
                 .subscribe(result -> {
                     if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
                             == R.id.audio_button) {
@@ -402,7 +415,7 @@ public class DownloadDialog extends DialogFragment
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading audio stream size",
                                 currentInfo.getServiceId()))));
-        disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(wrappedSubtitleStreams)
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams)
                 .subscribe(result -> {
                     if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
                             == R.id.subtitle_button) {
@@ -550,6 +563,7 @@ public class DownloadDialog extends DialogFragment
         }
     }
 
+
     /*//////////////////////////////////////////////////////////////////////////
     // Listeners
     //////////////////////////////////////////////////////////////////////////*/
@@ -709,9 +723,9 @@ public class DownloadDialog extends DialogFragment
         dialogBinding.subtitleButton.setEnabled(enabled);
     }
 
-    private StreamInfoWrapper<AudioStream> getWrappedAudioStreams() {
+    private StreamSizeWrapper<AudioStream> getWrappedAudioStreams() {
         if (selectedAudioTrackIndex < 0 || selectedAudioTrackIndex > wrappedAudioTracks.size()) {
-            return StreamInfoWrapper.empty();
+            return StreamSizeWrapper.empty();
         }
         return wrappedAudioTracks.getTracksList().get(selectedAudioTrackIndex);
     }
@@ -751,7 +765,7 @@ public class DownloadDialog extends DialogFragment
     }
 
     private void showFailedDialog(@StringRes final int msg) {
-        assureCorrectAppLanguage(requireContext());
+        assureCorrectAppLanguage(getContext());
         new AlertDialog.Builder(context)
                 .setTitle(R.string.general_error)
                 .setMessage(msg)
@@ -768,7 +782,6 @@ public class DownloadDialog extends DialogFragment
         final StoredDirectoryHelper mainStorage;
         final MediaFormat format;
         final String selectedMediaType;
-        final long size;
 
         // first, build the filename and get the output folder (if possible)
         // later, run a very very very large file checking logic
@@ -780,38 +793,35 @@ public class DownloadDialog extends DialogFragment
                 selectedMediaType = getString(R.string.last_download_type_audio_key);
                 mainStorage = mainStorageAudio;
                 format = audioStreamsAdapter.getItem(selectedAudioIndex).getFormat();
-                size = getWrappedAudioStreams().getSizeInBytes(selectedAudioIndex);
                 if (format == MediaFormat.WEBMA_OPUS) {
                     mimeTmp = "audio/ogg";
                     filenameTmp += "opus";
                 } else if (format != null) {
                     mimeTmp = format.mimeType;
-                    filenameTmp += format.getSuffix();
+                    filenameTmp += format.suffix;
                 }
                 break;
             case R.id.video_button:
                 selectedMediaType = getString(R.string.last_download_type_video_key);
                 mainStorage = mainStorageVideo;
                 format = videoStreamsAdapter.getItem(selectedVideoIndex).getFormat();
-                size = wrappedVideoStreams.getSizeInBytes(selectedVideoIndex);
                 if (format != null) {
                     mimeTmp = format.mimeType;
-                    filenameTmp += format.getSuffix();
+                    filenameTmp += format.suffix;
                 }
                 break;
             case R.id.subtitle_button:
                 selectedMediaType = getString(R.string.last_download_type_subtitle_key);
                 mainStorage = mainStorageVideo; // subtitle & video files go together
                 format = subtitleStreamsAdapter.getItem(selectedSubtitleIndex).getFormat();
-                size = wrappedSubtitleStreams.getSizeInBytes(selectedSubtitleIndex);
                 if (format != null) {
                     mimeTmp = format.mimeType;
                 }
 
                 if (format == MediaFormat.TTML) {
-                    filenameTmp += MediaFormat.SRT.getSuffix();
+                    filenameTmp += MediaFormat.SRT.suffix;
                 } else if (format != null) {
-                    filenameTmp += format.getSuffix();
+                    filenameTmp += format.suffix;
                 }
                 break;
             default:
@@ -859,21 +869,6 @@ public class DownloadDialog extends DialogFragment
             return;
         }
 
-        // Check for free storage space
-        final long freeSpace = mainStorage.getFreeStorageSpace();
-        if (freeSpace <= size) {
-            Toast.makeText(context, getString(R.
-                    string.error_insufficient_storage), Toast.LENGTH_LONG).show();
-            // move the user to storage setting tab
-            final Intent storageSettingsIntent = new Intent(Settings.
-                    ACTION_INTERNAL_STORAGE_SETTINGS);
-            if (storageSettingsIntent.resolveActivity(context.getPackageManager())
-                    != null) {
-                startActivity(storageSettingsIntent);
-            }
-            return;
-        }
-
         // check for existing file with the same name
         checkSelectedDownload(mainStorage, mainStorage.findFile(filenameTmp), filenameTmp,
                 mimeTmp);
@@ -1056,7 +1051,7 @@ public class DownloadDialog extends DialogFragment
         final char kind;
         int threads = dialogBinding.threads.getProgress() + 1;
         final String[] urls;
-        final List<MissionRecoveryInfo> recoveryInfo;
+        final MissionRecoveryInfo[] recoveryInfo;
         String psName = null;
         String[] psArgs = null;
         long nearLength = 0;
@@ -1121,7 +1116,9 @@ public class DownloadDialog extends DialogFragment
             urls = new String[] {
                     selectedStream.getContent()
             };
-            recoveryInfo = List.of(new MissionRecoveryInfo(selectedStream));
+            recoveryInfo = new MissionRecoveryInfo[] {
+                    new MissionRecoveryInfo(selectedStream)
+            };
         } else {
             if (secondaryStream.getDeliveryMethod() != PROGRESSIVE_HTTP) {
                 throw new IllegalArgumentException("Unsupported stream delivery format"
@@ -1131,14 +1128,12 @@ public class DownloadDialog extends DialogFragment
             urls = new String[] {
                     selectedStream.getContent(), secondaryStream.getContent()
             };
-            recoveryInfo = List.of(
-                    new MissionRecoveryInfo(selectedStream),
-                    new MissionRecoveryInfo(secondaryStream)
-            );
+            recoveryInfo = new MissionRecoveryInfo[] {new MissionRecoveryInfo(selectedStream),
+                    new MissionRecoveryInfo(secondaryStream)};
         }
 
         DownloadManagerService.startMission(context, urls, storage, kind, threads,
-                currentInfo.getUrl(), psName, psArgs, nearLength, new ArrayList<>(recoveryInfo));
+                currentInfo.getUrl(), psName, psArgs, nearLength, recoveryInfo);
 
         Toast.makeText(context, getString(R.string.download_has_started),
                 Toast.LENGTH_SHORT).show();

app/src/main/java/org/schabi/newpipe/download/LoadingDialog.java

@@ -1,87 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.DialogFragment;
-
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.DownloadLoadingDialogBinding;
-
-/**
- * This class contains a dialog which shows a loading indicator and has a customizable title.
- */
-public class LoadingDialog extends DialogFragment {
-    private static final String TAG = "LoadingDialog";
-    private static final boolean DEBUG = MainActivity.DEBUG;
-    private DownloadLoadingDialogBinding dialogLoadingBinding;
-    private final @StringRes int title;
-
-    /**
-     * Create a new LoadingDialog.
-     *
-     * <p>
-     *     The dialog contains a loading indicator and has a customizable title.
-     *     <br/>
-     *     Use {@code show()} to display the dialog to the user.
-     * </p>
-     *
-     * @param title an informative title shown in the dialog's toolbar
-     */
-    public LoadingDialog(final @StringRes int title) {
-        this.title = title;
-    }
-
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (DEBUG) {
-            Log.d(TAG, "onCreate() called with: "
-                    + "savedInstanceState = [" + savedInstanceState + "]");
-        }
-        this.setCancelable(false);
-    }
-
-    @Override
-    public View onCreateView(
-            @NonNull final LayoutInflater inflater,
-            final ViewGroup container,
-            final Bundle savedInstanceState) {
-        if (DEBUG) {
-            Log.d(TAG, "onCreateView() called with: "
-                    + "inflater = [" + inflater + "], container = [" + container + "], "
-                    + "savedInstanceState = [" + savedInstanceState + "]");
-        }
-        return inflater.inflate(R.layout.download_loading_dialog, container);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        dialogLoadingBinding = DownloadLoadingDialogBinding.bind(view);
-        initToolbar(dialogLoadingBinding.toolbarLayout.toolbar);
-    }
-
-    private void initToolbar(final Toolbar toolbar) {
-        if (DEBUG) {
-            Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]");
-        }
-        toolbar.setTitle(requireContext().getString(title));
-        toolbar.setNavigationOnClickListener(v -> dismiss());
-
-    }
-
-    @Override
-    public void onDestroyView() {
-        dialogLoadingBinding = null;
-        super.onDestroyView();
-    }
-}

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

@@ -2,6 +2,7 @@ package org.schabi.newpipe.error;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -12,14 +13,15 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.IntentCompat;
 
 import com.grack.nanojson.JsonWriter;
 
 import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.ActivityErrorBinding;
 import org.schabi.newpipe.util.Localization;
@@ -103,7 +105,7 @@ public class ErrorActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        errorInfo = IntentCompat.getParcelableExtra(intent, ERROR_INFO, ErrorInfo.class);
+        errorInfo = intent.getParcelableExtra(ERROR_INFO);
 
         // important add guru meditation
         addGuruMeditation();
@@ -184,6 +186,25 @@ public class ErrorActivity extends AppCompatActivity {
                 .collect(Collectors.joining(separator + "\n", separator + "\n", separator));
     }
 
+    /**
+     * Get the checked activity.
+     *
+     * @param returnActivity the activity to return to
+     * @return the casted return activity or null
+     */
+    @Nullable
+    static Class<? extends Activity> getReturnActivity(final Class<?> returnActivity) {
+        Class<? extends Activity> checkedReturnActivity = null;
+        if (returnActivity != null) {
+            if (Activity.class.isAssignableFrom(returnActivity)) {
+                checkedReturnActivity = returnActivity.asSubclass(Activity.class);
+            } else {
+                checkedReturnActivity = MainActivity.class;
+            }
+        }
+        return checkedReturnActivity;
+    }
+
     private void buildInfo(final ErrorInfo info) {
         String text = "";
 

app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt

@@ -11,6 +11,7 @@ import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
+import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
 import org.schabi.newpipe.ktx.isNetworkRelated
 import org.schabi.newpipe.util.ServiceHelper
 
@@ -95,6 +96,7 @@ class ErrorInfo(
                 throwable is ContentNotAvailableException -> R.string.content_not_available
                 throwable != null && throwable.isNetworkRelated -> R.string.network_error
                 throwable is ContentNotSupportedException -> R.string.content_not_supported
+                throwable is DeobfuscateException -> R.string.youtube_signature_deobfuscation_error
                 throwable is ExtractionException -> R.string.parsing_error
                 throwable is ExoPlaybackException -> {
                     when (throwable.type) {

app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt

@@ -54,7 +54,7 @@ class ErrorUtil {
          */
         @JvmStatic
         fun showSnackbar(context: Context, errorInfo: ErrorInfo) {
-            val rootView = (context as? Activity)?.findViewById<View>(android.R.id.content)
+            val rootView = if (context is Activity) context.findViewById<View>(R.id.content) else null
             showSnackbar(context, rootView, errorInfo)
         }
 
@@ -71,7 +71,7 @@ class ErrorUtil {
         fun showSnackbar(fragment: Fragment, errorInfo: ErrorInfo) {
             var rootView = fragment.view
             if (rootView == null && fragment.activity != null) {
-                rootView = fragment.requireActivity().findViewById(android.R.id.content)
+                rootView = fragment.requireActivity().findViewById(R.id.content)
             }
             showSnackbar(fragment.requireContext(), rootView, errorInfo)
         }

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

@@ -27,6 +27,8 @@ import org.schabi.newpipe.databinding.ActivityRecaptchaBinding;
 import org.schabi.newpipe.extractor.utils.Utils;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.UnsupportedEncodingException;
+
 /*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
  *
@@ -185,11 +187,14 @@ public class ReCaptchaActivity extends AppCompatActivity {
             final int abuseEnd = url.indexOf("+path");
 
             try {
-                handleCookies(Utils.decodeUrlUtf8(url.substring(abuseStart + 13, abuseEnd)));
-            } catch (final StringIndexOutOfBoundsException e) {
+                String abuseCookie = url.substring(abuseStart + 13, abuseEnd);
+                abuseCookie = Utils.decodeUrlUtf8(abuseCookie);
+                handleCookies(abuseCookie);
+            } catch (UnsupportedEncodingException | StringIndexOutOfBoundsException e) {
                 if (MainActivity.DEBUG) {
-                    Log.e(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
-                            + abuseStart + " and ending at " + abuseEnd + " for url " + url, e);
+                    e.printStackTrace();
+                    Log.d(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
+                            + abuseStart + " and ending at " + abuseEnd + " for url " + url);
                 }
             }
         }

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

@@ -6,7 +6,6 @@ package org.schabi.newpipe.error;
 public enum UserAction {
     USER_REPORT("user report"),
     UI_ERROR("ui error"),
-    DATABASE_IMPORT_EXPORT("database import or export"),
     SUBSCRIPTION_CHANGE("subscription change"),
     SUBSCRIPTION_UPDATE("subscription update"),
     SUBSCRIPTION_GET("get subscription"),
@@ -20,7 +19,6 @@ public enum UserAction {
     REQUESTED_PLAYLIST("requested playlist"),
     REQUESTED_KIOSK("requested kiosk"),
     REQUESTED_COMMENTS("requested comments"),
-    REQUESTED_COMMENT_REPLIES("requested comment replies"),
     REQUESTED_FEED("requested feed"),
     REQUESTED_BOOKMARK("bookmark"),
     DELETE_FROM_HISTORY("delete from history"),

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

@@ -1,20 +1,14 @@
 package org.schabi.newpipe.fragments;
 
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.ProgressBar;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.fragment.app.Fragment;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -24,15 +18,17 @@ import org.schabi.newpipe.util.InfoCache;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import icepick.State;
+
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+
 public abstract class BaseStateFragment<I> extends BaseFragment implements ViewContract<I> {
     @State
     protected AtomicBoolean wasLoading = new AtomicBoolean();
     protected AtomicBoolean isLoading = new AtomicBoolean();
 
     @Nullable
-    protected View emptyStateView;
-    @Nullable
-    protected TextView emptyStateMessageView;
+    private View emptyStateView;
     @Nullable
     private ProgressBar loadingProgressBar;
 
@@ -69,7 +65,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
         emptyStateView = rootView.findViewById(R.id.empty_state_view);
-        emptyStateMessageView = rootView.findViewById(R.id.empty_state_message);
         loadingProgressBar = rootView.findViewById(R.id.loading_progress_bar);
         errorPanelHelper = new ErrorPanelHelper(this, rootView, this::onRetryButtonClicked);
     }
@@ -80,8 +75,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         if (errorPanelHelper != null) {
             errorPanelHelper.dispose();
         }
-        emptyStateView = null;
-        emptyStateMessageView = null;
     }
 
     protected void onRetryButtonClicked() {
@@ -134,7 +127,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         hideErrorPanel();
     }
 
-    @Override
     public void showEmptyState() {
         isLoading.set(false);
         if (emptyStateView != null) {
@@ -197,12 +189,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         errorPanelHelper.showTextError(errorString);
     }
 
-    protected void setEmptyStateMessage(@StringRes final int text) {
-        if (emptyStateMessageView != null) {
-            emptyStateMessageView.setText(text);
-        }
-    }
-
     public final void hideErrorPanel() {
         errorPanelHelper.hide();
         lastPanelError = null;

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

@@ -6,11 +6,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
-import androidx.compose.ui.platform.ComposeView;
 
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 
 public class EmptyFragment extends BaseFragment {
     private static final String SHOW_MESSAGE = "SHOW_MESSAGE";
@@ -28,10 +26,8 @@ public class EmptyFragment extends BaseFragment {
                              final Bundle savedInstanceState) {
         final boolean showMessage = getArguments().getBoolean(SHOW_MESSAGE);
         final View view = inflater.inflate(R.layout.fragment_empty, container, false);
-
-        final ComposeView composeView = view.findViewById(R.id.empty_state_view);
-        EmptyStateUtil.setEmptyStateComposable(composeView);
-        composeView.setVisibility(showMessage ? View.VISIBLE : View.GONE);
+        view.findViewById(R.id.empty_state_view).setVisibility(
+                showMessage ? View.VISIBLE : View.GONE);
         return view;
     }
 }

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

@@ -1,16 +1,6 @@
 package org.schabi.newpipe.fragments;
 
-import static android.widget.RelativeLayout.ABOVE;
-import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
-import static android.widget.RelativeLayout.ALIGN_PARENT_TOP;
-import static android.widget.RelativeLayout.BELOW;
-import static com.google.android.material.tabs.TabLayout.INDICATOR_GRAVITY_BOTTOM;
-import static com.google.android.material.tabs.TabLayout.INDICATOR_GRAVITY_TOP;
-
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -19,9 +9,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.RelativeLayout;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -29,7 +17,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapterMenuWorkaround;
 import androidx.preference.PreferenceManager;
-import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.tabs.TabLayout;
 
@@ -38,13 +25,10 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.FragmentMainBinding;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
 import org.schabi.newpipe.settings.tabs.Tab;
 import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.views.ScrollableTabLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,11 +42,8 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
 
     private boolean hasTabsChanged = false;
 
-    private SharedPreferences prefs;
-    private boolean youtubeRestrictedModeEnabled;
+    private boolean previousYoutubeRestrictedModeEnabled;
     private String youtubeRestrictedModeEnabledKey;
-    private boolean mainTabsPositionBottom;
-    private String mainTabsPositionKey;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's LifeCycle
@@ -85,11 +66,10 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
             }
         });
 
-        prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
         youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
-        youtubeRestrictedModeEnabled = prefs.getBoolean(youtubeRestrictedModeEnabledKey, false);
-        mainTabsPositionKey = getString(R.string.main_tabs_position_key);
-        mainTabsPositionBottom = prefs.getBoolean(mainTabsPositionKey, false);
+        previousYoutubeRestrictedModeEnabled =
+                PreferenceManager.getDefaultSharedPreferences(requireContext())
+                        .getBoolean(youtubeRestrictedModeEnabledKey, false);
     }
 
     @Override
@@ -107,26 +87,24 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
 
         binding.mainTabLayout.setupWithViewPager(binding.pager);
         binding.mainTabLayout.addOnTabSelectedListener(this);
+        binding.mainTabLayout.setTabRippleColor(binding.mainTabLayout.getTabRippleColor()
+                .withAlpha(32));
 
         setupTabs();
-        updateTabLayoutPosition();
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
-        final boolean newYoutubeRestrictedModeEnabled =
-                prefs.getBoolean(youtubeRestrictedModeEnabledKey, false);
-        if (youtubeRestrictedModeEnabled != newYoutubeRestrictedModeEnabled || hasTabsChanged) {
-            youtubeRestrictedModeEnabled = newYoutubeRestrictedModeEnabled;
+        final boolean youtubeRestrictedModeEnabled =
+                PreferenceManager.getDefaultSharedPreferences(requireContext())
+                        .getBoolean(youtubeRestrictedModeEnabledKey, false);
+        if (previousYoutubeRestrictedModeEnabled != youtubeRestrictedModeEnabled) {
+            previousYoutubeRestrictedModeEnabled = youtubeRestrictedModeEnabled;
+            setupTabs();
+        } else if (hasTabsChanged) {
             setupTabs();
-        }
-
-        final boolean newMainTabsPosition = prefs.getBoolean(mainTabsPositionKey, false);
-        if (mainTabsPositionBottom != newMainTabsPosition) {
-            mainTabsPositionBottom = newMainTabsPosition;
-            updateTabLayoutPosition();
         }
     }
 
@@ -140,12 +118,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         }
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -194,6 +166,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         }
 
         binding.pager.setAdapter(null);
+        binding.pager.setOffscreenPageLimit(tabsList.size());
         binding.pager.setAdapter(pagerAdapter);
 
         updateTabsIconAndDescription();
@@ -217,44 +190,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         setTitle(tabsList.get(tabPosition).getTabName(requireContext()));
     }
 
-    public void commitPlaylistTabs() {
-        pagerAdapter.getLocalPlaylistFragments()
-                .stream()
-                .forEach(LocalPlaylistFragment::saveImmediate);
-    }
-
-    private void updateTabLayoutPosition() {
-        final ScrollableTabLayout tabLayout = binding.mainTabLayout;
-        final ViewPager viewPager = binding.pager;
-        final boolean bottom = mainTabsPositionBottom;
-
-        // change layout params to make the tab layout appear either at the top or at the bottom
-        final var tabParams = (RelativeLayout.LayoutParams) tabLayout.getLayoutParams();
-        final var pagerParams = (RelativeLayout.LayoutParams) viewPager.getLayoutParams();
-
-        tabParams.removeRule(bottom ? ALIGN_PARENT_TOP : ALIGN_PARENT_BOTTOM);
-        tabParams.addRule(bottom ? ALIGN_PARENT_BOTTOM : ALIGN_PARENT_TOP);
-        pagerParams.removeRule(bottom ? BELOW : ABOVE);
-        pagerParams.addRule(bottom ? ABOVE : BELOW, R.id.main_tab_layout);
-        tabLayout.setSelectedTabIndicatorGravity(
-                bottom ? INDICATOR_GRAVITY_TOP : INDICATOR_GRAVITY_BOTTOM);
-
-        tabLayout.setLayoutParams(tabParams);
-        viewPager.setLayoutParams(pagerParams);
-
-        // change the background and icon color of the tab layout:
-        // service-colored at the top, app-background-colored at the bottom
-        tabLayout.setBackgroundColor(ThemeHelper.resolveColorFromAttr(requireContext(),
-                bottom ? android.R.attr.windowBackground : R.attr.colorPrimary));
-
-        @ColorInt final int iconColor = bottom
-                ? ThemeHelper.resolveColorFromAttr(requireContext(), android.R.attr.colorAccent)
-                : Color.WHITE;
-        tabLayout.setTabRippleColor(ColorStateList.valueOf(iconColor).withAlpha(32));
-        tabLayout.setTabIconTint(ColorStateList.valueOf(iconColor));
-        tabLayout.setSelectedTabIndicatorColor(iconColor);
-    }
-
     @Override
     public void onTabSelected(final TabLayout.Tab selectedTab) {
         if (DEBUG) {
@@ -274,18 +209,10 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         updateTitleForTab(tab.getPosition());
     }
 
-    public static final class SelectedTabsPagerAdapter
+    private static final class SelectedTabsPagerAdapter
             extends FragmentStatePagerAdapterMenuWorkaround {
         private final Context context;
         private final List<Tab> internalTabsList;
-        /**
-         * Keep reference to LocalPlaylistFragments, because their data can be modified by the user
-         * during runtime and changes are not committed immediately. However, in some cases,
-         * the changes need to be committed immediately by calling
-         * {@link LocalPlaylistFragment#saveImmediate()}.
-         * The fragments are removed when {@link LocalPlaylistFragment#onDestroy()} is called.
-         */
-        private final List<LocalPlaylistFragment> localPlaylistFragments = new ArrayList<>();
 
         private SelectedTabsPagerAdapter(final Context context,
                                          final FragmentManager fragmentManager,
@@ -312,17 +239,9 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
                 ((BaseFragment) fragment).useAsFrontPage(true);
             }
 
-            if (fragment instanceof LocalPlaylistFragment) {
-                localPlaylistFragments.add((LocalPlaylistFragment) fragment);
-            }
-
             return fragment;
         }
 
-        public List<LocalPlaylistFragment> getLocalPlaylistFragments() {
-            return localPlaylistFragments;
-        }
-
         @Override
         public int getItemPosition(@NonNull final Object object) {
             // Causes adapter to reload all Fragments when

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

@@ -1,281 +0,0 @@
-package org.schabi.newpipe.fragments.detail;
-
-import static android.text.TextUtils.isEmpty;
-import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
-import static org.schabi.newpipe.util.text.TextLinkifier.SET_LINK_MOVEMENT_METHOD;
-
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.text.style.StyleSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.appcompat.widget.TooltipCompat;
-import androidx.core.text.HtmlCompat;
-
-import com.google.android.material.chip.Chip;
-
-import org.schabi.newpipe.BaseFragment;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.FragmentDescriptionBinding;
-import org.schabi.newpipe.databinding.ItemMetadataBinding;
-import org.schabi.newpipe.databinding.ItemMetadataTagsBinding;
-import org.schabi.newpipe.extractor.Image;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.stream.Description;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.image.ImageStrategy;
-import org.schabi.newpipe.util.text.TextLinkifier;
-
-import java.util.List;
-
-import io.reactivex.rxjava3.disposables.CompositeDisposable;
-
-public abstract class BaseDescriptionFragment extends BaseFragment {
-    private final CompositeDisposable descriptionDisposables = new CompositeDisposable();
-    protected FragmentDescriptionBinding binding;
-
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-                             @Nullable final ViewGroup container,
-                             @Nullable final Bundle savedInstanceState) {
-        binding = FragmentDescriptionBinding.inflate(inflater, container, false);
-        setupDescription();
-        setupMetadata(inflater, binding.detailMetadataLayout);
-        addTagsMetadataItem(inflater, binding.detailMetadataLayout);
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onDestroy() {
-        descriptionDisposables.clear();
-        super.onDestroy();
-    }
-
-    /**
-     * Get the description to display.
-     * @return description object, if available
-     */
-    @Nullable
-    protected abstract Description getDescription();
-
-    /**
-     * Get the streaming service. Used for generating description links.
-     * @return streaming service
-     */
-    @NonNull
-    protected abstract StreamingService getService();
-
-    /**
-     * Get the streaming service ID. Used for tag links.
-     * @return service ID
-     */
-    protected abstract int getServiceId();
-
-    /**
-     * Get the URL of the described video or audio, used to generate description links.
-     * @return stream URL
-     */
-    @Nullable
-    protected abstract String getStreamUrl();
-
-    /**
-     * Get the list of tags to display below the description.
-     * @return tag list
-     */
-    @NonNull
-    public abstract List<String> getTags();
-
-    /**
-     * Add additional metadata to display.
-     * @param inflater LayoutInflater
-     * @param layout detailMetadataLayout
-     */
-    protected abstract void setupMetadata(LayoutInflater inflater, LinearLayout layout);
-
-    private void setupDescription() {
-        final Description description = getDescription();
-        if (description == null || isEmpty(description.getContent())
-                || description == Description.EMPTY_DESCRIPTION) {
-            binding.detailDescriptionView.setVisibility(View.GONE);
-            binding.detailSelectDescriptionButton.setVisibility(View.GONE);
-            return;
-        }
-
-        // start with disabled state. This also loads description content (!)
-        disableDescriptionSelection();
-
-        binding.detailSelectDescriptionButton.setOnClickListener(v -> {
-            if (binding.detailDescriptionNoteView.getVisibility() == View.VISIBLE) {
-                disableDescriptionSelection();
-            } else {
-                // enable selection only when button is clicked to prevent flickering
-                enableDescriptionSelection();
-            }
-        });
-    }
-
-    private void enableDescriptionSelection() {
-        binding.detailDescriptionNoteView.setVisibility(View.VISIBLE);
-        binding.detailDescriptionView.setTextIsSelectable(true);
-
-        final String buttonLabel = getString(R.string.description_select_disable);
-        binding.detailSelectDescriptionButton.setContentDescription(buttonLabel);
-        TooltipCompat.setTooltipText(binding.detailSelectDescriptionButton, buttonLabel);
-        binding.detailSelectDescriptionButton.setImageResource(R.drawable.ic_close);
-    }
-
-    private void disableDescriptionSelection() {
-        // show description content again, otherwise some links are not clickable
-        final Description description = getDescription();
-        if (description != null) {
-            TextLinkifier.fromDescription(binding.detailDescriptionView,
-                    description, HtmlCompat.FROM_HTML_MODE_LEGACY,
-                    getService(), getStreamUrl(),
-                    descriptionDisposables, SET_LINK_MOVEMENT_METHOD);
-        }
-
-        binding.detailDescriptionNoteView.setVisibility(View.GONE);
-        binding.detailDescriptionView.setTextIsSelectable(false);
-
-        final String buttonLabel = getString(R.string.description_select_enable);
-        binding.detailSelectDescriptionButton.setContentDescription(buttonLabel);
-        TooltipCompat.setTooltipText(binding.detailSelectDescriptionButton, buttonLabel);
-        binding.detailSelectDescriptionButton.setImageResource(R.drawable.ic_select_all);
-    }
-
-    protected void addMetadataItem(final LayoutInflater inflater,
-                                   final LinearLayout layout,
-                                   final boolean linkifyContent,
-                                   @StringRes final int type,
-                                   @NonNull final String content) {
-        if (isBlank(content)) {
-            return;
-        }
-
-        final ItemMetadataBinding itemBinding =
-                ItemMetadataBinding.inflate(inflater, layout, false);
-
-        itemBinding.metadataTypeView.setText(type);
-        itemBinding.metadataTypeView.setOnLongClickListener(v -> {
-            ShareUtils.copyToClipboard(requireContext(), content);
-            return true;
-        });
-
-        if (linkifyContent) {
-            TextLinkifier.fromPlainText(itemBinding.metadataContentView, content, null, null,
-                    descriptionDisposables, SET_LINK_MOVEMENT_METHOD);
-        } else {
-            itemBinding.metadataContentView.setText(content);
-        }
-
-        itemBinding.metadataContentView.setClickable(true);
-
-        layout.addView(itemBinding.getRoot());
-    }
-
-    private String imageSizeToText(final int heightOrWidth) {
-        if (heightOrWidth < 0) {
-            return getString(R.string.question_mark);
-        } else {
-            return String.valueOf(heightOrWidth);
-        }
-    }
-
-    protected void addImagesMetadataItem(final LayoutInflater inflater,
-                                         final LinearLayout layout,
-                                         @StringRes final int type,
-                                         final List<Image> images) {
-        final String preferredImageUrl = ImageStrategy.choosePreferredImage(images);
-        if (preferredImageUrl == null) {
-            return; // null will be returned in case there is no image
-        }
-
-        final ItemMetadataBinding itemBinding =
-                ItemMetadataBinding.inflate(inflater, layout, false);
-        itemBinding.metadataTypeView.setText(type);
-
-        final SpannableStringBuilder urls = new SpannableStringBuilder();
-        for (final Image image : images) {
-            if (urls.length() != 0) {
-                urls.append(", ");
-            }
-            final int entryBegin = urls.length();
-
-            if (image.getHeight() != Image.HEIGHT_UNKNOWN
-                    || image.getWidth() != Image.WIDTH_UNKNOWN
-                    // if even the resolution level is unknown, ?x? will be shown
-                    || image.getEstimatedResolutionLevel() == Image.ResolutionLevel.UNKNOWN) {
-                urls.append(imageSizeToText(image.getHeight()));
-                urls.append('x');
-                urls.append(imageSizeToText(image.getWidth()));
-            } else {
-                switch (image.getEstimatedResolutionLevel()) {
-                    case LOW -> urls.append(getString(R.string.image_quality_low));
-                    case MEDIUM -> urls.append(getString(R.string.image_quality_medium));
-                    case HIGH -> urls.append(getString(R.string.image_quality_high));
-                    default -> {
-                        // unreachable, Image.ResolutionLevel.UNKNOWN is already filtered out
-                    }
-                }
-            }
-
-            urls.setSpan(new ClickableSpan() {
-                @Override
-                public void onClick(@NonNull final View widget) {
-                    ShareUtils.openUrlInBrowser(requireContext(), image.getUrl());
-                }
-            }, entryBegin, urls.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-            if (preferredImageUrl.equals(image.getUrl())) {
-                urls.setSpan(new StyleSpan(Typeface.BOLD), entryBegin, urls.length(),
-                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            }
-        }
-
-        itemBinding.metadataContentView.setText(urls);
-        itemBinding.metadataContentView.setMovementMethod(LinkMovementMethod.getInstance());
-        layout.addView(itemBinding.getRoot());
-    }
-
-    private void addTagsMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {
-        final List<String> tags = getTags();
-
-        if (!tags.isEmpty()) {
-            final var itemBinding = ItemMetadataTagsBinding.inflate(inflater, layout, false);
-
-            tags.stream().sorted(String.CASE_INSENSITIVE_ORDER).forEach(tag -> {
-                final Chip chip = (Chip) inflater.inflate(R.layout.chip,
-                        itemBinding.metadataTagsChips, false);
-                chip.setText(tag);
-                chip.setOnClickListener(this::onTagClick);
-                chip.setOnLongClickListener(this::onTagLongClick);
-                itemBinding.metadataTagsChips.addView(chip);
-            });
-
-            layout.addView(itemBinding.getRoot());
-        }
-    }
-
-    private void onTagClick(final View chip) {
-        if (getParentFragment() != null) {
-            NavigationHelper.openSearchFragment(getParentFragment().getParentFragmentManager(),
-                    getServiceId(), ((Chip) chip).getText().toString());
-        }
-    }
-
-    private boolean onTagLongClick(final View chip) {
-        ShareUtils.copyToClipboard(requireContext(), ((Chip) chip).getText().toString());
-        return true;
-    }
-}

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

@@ -1,83 +1,134 @@
 package org.schabi.newpipe.fragments.detail;
 
+import static android.text.TextUtils.isEmpty;
 import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
+import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
 import static org.schabi.newpipe.util.Localization.getAppLocale;
+import static org.schabi.newpipe.util.text.TextLinkifier.SET_LINK_MOVEMENT_METHOD;
 
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.TooltipCompat;
+import androidx.core.text.HtmlCompat;
 
-import com.evernote.android.state.State;
+import com.google.android.material.chip.Chip;
 
+import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.databinding.FragmentDescriptionBinding;
+import org.schabi.newpipe.databinding.ItemMetadataBinding;
+import org.schabi.newpipe.databinding.ItemMetadataTagsBinding;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.util.text.TextLinkifier;
 
-import java.util.List;
+import icepick.State;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
-public class DescriptionFragment extends BaseDescriptionFragment {
+public class DescriptionFragment extends BaseFragment {
 
     @State
-    StreamInfo streamInfo;
+    StreamInfo streamInfo = null;
+    final CompositeDisposable descriptionDisposables = new CompositeDisposable();
+    FragmentDescriptionBinding binding;
+
+    public DescriptionFragment() {
+    }
 
     public DescriptionFragment(final StreamInfo streamInfo) {
         this.streamInfo = streamInfo;
     }
 
-    public DescriptionFragment() {
-        // keep empty constructor for State when resuming fragment from memory
-    }
-
-
-    @Nullable
     @Override
-    protected Description getDescription() {
-        return streamInfo.getDescription();
-    }
-
-    @NonNull
-    @Override
-    protected StreamingService getService() {
-        return streamInfo.getService();
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        binding = FragmentDescriptionBinding.inflate(inflater, container, false);
+        if (streamInfo != null) {
+            setupUploadDate();
+            setupDescription();
+            setupMetadata(inflater, binding.detailMetadataLayout);
+        }
+        return binding.getRoot();
     }
 
     @Override
-    protected int getServiceId() {
-        return streamInfo.getServiceId();
+    public void onDestroy() {
+        descriptionDisposables.clear();
+        super.onDestroy();
     }
 
-    @NonNull
-    @Override
-    protected String getStreamUrl() {
-        return streamInfo.getUrl();
-    }
 
-    @NonNull
-    @Override
-    public List<String> getTags() {
-        return streamInfo.getTags();
-    }
-
-    @Override
-    protected void setupMetadata(final LayoutInflater inflater,
-                                 final LinearLayout layout) {
-        if (streamInfo != null && streamInfo.getUploadDate() != null) {
+    private void setupUploadDate() {
+        if (streamInfo.getUploadDate() != null) {
             binding.detailUploadDateView.setText(Localization
                     .localizeUploadDate(activity, streamInfo.getUploadDate().offsetDateTime()));
         } else {
             binding.detailUploadDateView.setVisibility(View.GONE);
         }
+    }
 
-        if (streamInfo == null) {
+
+    private void setupDescription() {
+        final Description description = streamInfo.getDescription();
+        if (description == null || isEmpty(description.getContent())
+                || description == Description.EMPTY_DESCRIPTION) {
+            binding.detailDescriptionView.setVisibility(View.GONE);
+            binding.detailSelectDescriptionButton.setVisibility(View.GONE);
             return;
         }
 
+        // start with disabled state. This also loads description content (!)
+        disableDescriptionSelection();
+
+        binding.detailSelectDescriptionButton.setOnClickListener(v -> {
+            if (binding.detailDescriptionNoteView.getVisibility() == View.VISIBLE) {
+                disableDescriptionSelection();
+            } else {
+                // enable selection only when button is clicked to prevent flickering
+                enableDescriptionSelection();
+            }
+        });
+    }
+
+    private void enableDescriptionSelection() {
+        binding.detailDescriptionNoteView.setVisibility(View.VISIBLE);
+        binding.detailDescriptionView.setTextIsSelectable(true);
+
+        final String buttonLabel = getString(R.string.description_select_disable);
+        binding.detailSelectDescriptionButton.setContentDescription(buttonLabel);
+        TooltipCompat.setTooltipText(binding.detailSelectDescriptionButton, buttonLabel);
+        binding.detailSelectDescriptionButton.setImageResource(R.drawable.ic_close);
+    }
+
+    private void disableDescriptionSelection() {
+        // show description content again, otherwise some links are not clickable
+        TextLinkifier.fromDescription(binding.detailDescriptionView,
+                streamInfo.getDescription(), HtmlCompat.FROM_HTML_MODE_LEGACY,
+                streamInfo.getService(), streamInfo.getUrl(),
+                descriptionDisposables, SET_LINK_MOVEMENT_METHOD);
+
+        binding.detailDescriptionNoteView.setVisibility(View.GONE);
+        binding.detailDescriptionView.setTextIsSelectable(false);
+
+        final String buttonLabel = getString(R.string.description_select_enable);
+        binding.detailSelectDescriptionButton.setContentDescription(buttonLabel);
+        TooltipCompat.setTooltipText(binding.detailSelectDescriptionButton, buttonLabel);
+        binding.detailSelectDescriptionButton.setImageResource(R.drawable.ic_select_all);
+    }
+
+    private void setupMetadata(final LayoutInflater inflater,
+                               final LinearLayout layout) {
         addMetadataItem(inflater, layout, false, R.string.metadata_category,
                 streamInfo.getCategory());
 
@@ -100,13 +151,69 @@ public class DescriptionFragment extends BaseDescriptionFragment {
                 streamInfo.getSupportInfo());
         addMetadataItem(inflater, layout, true, R.string.metadata_host,
                 streamInfo.getHost());
+        addMetadataItem(inflater, layout, true, R.string.metadata_thumbnail_url,
+                streamInfo.getThumbnailUrl());
 
-        addImagesMetadataItem(inflater, layout, R.string.metadata_thumbnails,
-                streamInfo.getThumbnails());
-        addImagesMetadataItem(inflater, layout, R.string.metadata_uploader_avatars,
-                streamInfo.getUploaderAvatars());
-        addImagesMetadataItem(inflater, layout, R.string.metadata_subchannel_avatars,
-                streamInfo.getSubChannelAvatars());
+        addTagsMetadataItem(inflater, layout);
+    }
+
+    private void addMetadataItem(final LayoutInflater inflater,
+                                 final LinearLayout layout,
+                                 final boolean linkifyContent,
+                                 @StringRes final int type,
+                                 @Nullable final String content) {
+        if (isBlank(content)) {
+            return;
+        }
+
+        final ItemMetadataBinding itemBinding =
+                ItemMetadataBinding.inflate(inflater, layout, false);
+
+        itemBinding.metadataTypeView.setText(type);
+        itemBinding.metadataTypeView.setOnLongClickListener(v -> {
+            ShareUtils.copyToClipboard(requireContext(), content);
+            return true;
+        });
+
+        if (linkifyContent) {
+            TextLinkifier.fromPlainText(itemBinding.metadataContentView, content, null, null,
+                    descriptionDisposables, SET_LINK_MOVEMENT_METHOD);
+        } else {
+            itemBinding.metadataContentView.setText(content);
+        }
+
+        itemBinding.metadataContentView.setClickable(true);
+
+        layout.addView(itemBinding.getRoot());
+    }
+
+    private void addTagsMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {
+        if (streamInfo.getTags() != null && !streamInfo.getTags().isEmpty()) {
+            final var itemBinding = ItemMetadataTagsBinding.inflate(inflater, layout, false);
+
+            streamInfo.getTags().stream().sorted(String.CASE_INSENSITIVE_ORDER).forEach(tag -> {
+                final Chip chip = (Chip) inflater.inflate(R.layout.chip,
+                        itemBinding.metadataTagsChips, false);
+                chip.setText(tag);
+                chip.setOnClickListener(this::onTagClick);
+                chip.setOnLongClickListener(this::onTagLongClick);
+                itemBinding.metadataTagsChips.addView(chip);
+            });
+
+            layout.addView(itemBinding.getRoot());
+        }
+    }
+
+    private void onTagClick(final View chip) {
+        if (getParentFragment() != null) {
+            NavigationHelper.openSearchFragment(getParentFragment().getParentFragmentManager(),
+                    streamInfo.getServiceId(), ((Chip) chip).getText().toString());
+        }
+    }
+
+    private boolean onTagLongClick(final View chip) {
+        ShareUtils.copyToClipboard(requireContext(), ((Chip) chip).getText().toString());
+        return true;
     }
 
     private void addPrivacyMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {

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

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.fragments.list;
 
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -9,15 +7,13 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import com.evernote.android.state.State;
-
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.extractor.Page;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.views.NewPipeRecyclerView;
@@ -26,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -144,7 +141,7 @@ public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInf
         currentWorker = loadResult(forceLoad)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((@NonNull final L result) -> {
+                .subscribe((@NonNull L result) -> {
                     isLoading.set(false);
                     currentInfo = result;
                     currentNextPage = result.getNextPage();
@@ -232,11 +229,13 @@ public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInf
             if (!result.getRelatedItems().isEmpty()) {
                 infoListAdapter.addInfoItemList(result.getRelatedItems());
                 showListFooter(hasMoreItems());
-            } else if (hasMoreItems()) {
-                loadMoreItems();
             } else {
                 infoListAdapter.clearStreamItemList();
-                showEmptyState();
+                // showEmptyState should be called only if there is no item as
+                // well as no header in infoListAdapter
+                if (!(result instanceof ChannelInfo && infoListAdapter.getItemCount() == 1)) {
+                    showEmptyState();
+                }
             }
         }
 
@@ -253,20 +252,6 @@ public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInf
         }
     }
 
-    @Override
-    public void showEmptyState() {
-        // show "no streams" for SoundCloud; otherwise "no videos"
-        // showing "no live streams" is handled in KioskFragment
-        if (emptyStateView != null) {
-            if (currentInfo.getService() == SoundCloud) {
-                setEmptyStateMessage(R.string.no_streams);
-            } else {
-                setEmptyStateMessage(R.string.no_videos);
-            }
-        }
-        super.showEmptyState();
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/

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

@@ -1,94 +0,0 @@
-package org.schabi.newpipe.fragments.list.channel;
-
-import static org.schabi.newpipe.extractor.stream.StreamExtractor.UNKNOWN_SUBSCRIBER_COUNT;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.evernote.android.state.State;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.channel.ChannelInfo;
-import org.schabi.newpipe.extractor.stream.Description;
-import org.schabi.newpipe.fragments.detail.BaseDescriptionFragment;
-import org.schabi.newpipe.util.DeviceUtils;
-import org.schabi.newpipe.util.Localization;
-
-import java.util.List;
-
-public class ChannelAboutFragment extends BaseDescriptionFragment {
-    @State
-    protected ChannelInfo channelInfo;
-
-    ChannelAboutFragment(@NonNull final ChannelInfo channelInfo) {
-        this.channelInfo = channelInfo;
-    }
-
-    public ChannelAboutFragment() {
-        // keep empty constructor for State when resuming fragment from memory
-    }
-
-    @Override
-    protected void initViews(final View rootView, final Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
-        binding.constraintLayout.setPadding(0, DeviceUtils.dpToPx(8, requireContext()), 0, 0);
-    }
-
-    @Nullable
-    @Override
-    protected Description getDescription() {
-        return new Description(channelInfo.getDescription(), Description.PLAIN_TEXT);
-    }
-
-    @NonNull
-    @Override
-    protected StreamingService getService() {
-        return channelInfo.getService();
-    }
-
-    @Override
-    protected int getServiceId() {
-        return channelInfo.getServiceId();
-    }
-
-    @Nullable
-    @Override
-    protected String getStreamUrl() {
-        return null;
-    }
-
-    @NonNull
-    @Override
-    public List<String> getTags() {
-        return channelInfo.getTags();
-    }
-
-    @Override
-    protected void setupMetadata(final LayoutInflater inflater,
-                                 final LinearLayout layout) {
-        // There is no upload date available for channels, so hide the relevant UI element
-        binding.detailUploadDateView.setVisibility(View.GONE);
-
-        if (channelInfo == null) {
-            return;
-        }
-
-        if (channelInfo.getSubscriberCount() != UNKNOWN_SUBSCRIBER_COUNT) {
-            addMetadataItem(inflater, layout, false, R.string.metadata_subscribers,
-                    Localization.localizeNumber(
-                            requireContext(),
-                            channelInfo.getSubscriberCount()));
-        }
-
-        addImagesMetadataItem(inflater, layout, R.string.metadata_avatars,
-                channelInfo.getAvatars());
-        addImagesMetadataItem(inflater, layout, R.string.metadata_banners,
-                channelInfo.getBanners());
-    }
-}

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

@@ -5,65 +5,62 @@ import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.ktx.ViewUtils.animateBackgroundColor;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 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.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.core.content.ContextCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.view.MenuProvider;
-import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
 import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.tabs.TabLayout;
 import com.jakewharton.rxbinding4.view.RxView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.NotificationMode;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.databinding.ChannelHeaderBinding;
 import org.schabi.newpipe.databinding.FragmentChannelBinding;
+import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.fragments.BaseStateFragment;
-import org.schabi.newpipe.fragments.detail.TabAdapter;
+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.feed.notifications.NotificationHelper;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
-import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
-import org.schabi.newpipe.util.ChannelTabHelper;
-import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.local.feed.notifications.NotificationHelper;
+import org.schabi.newpipe.player.PlayerType;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.StateSaver;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.image.CoilHelper;
-import org.schabi.newpipe.util.image.ImageStrategy;
 
 import java.util.List;
-import java.util.Queue;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
-import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.Action;
@@ -71,37 +68,29 @@ import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-public class ChannelFragment extends BaseStateFragment<ChannelInfo>
-        implements StateSaver.WriteRead {
+public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, ChannelInfo>
+        implements View.OnClickListener {
 
     private static final int BUTTON_DEBOUNCE_INTERVAL = 100;
+    private static final String PICASSO_CHANNEL_TAG = "PICASSO_CHANNEL_TAG";
 
-    @State
-    protected int serviceId = Constants.NO_SERVICE_ID;
-    @State
-    protected String name;
-    @State
-    protected String url;
-
-    private ChannelInfo currentInfo;
-    private Disposable currentWorker;
     private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
-    private SubscriptionManager subscriptionManager;
-    private int lastTab;
+
     private boolean channelContentNotSupported = false;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
 
-    private FragmentChannelBinding binding;
-    private TabAdapter tabAdapter;
+    private SubscriptionManager subscriptionManager;
+
+    private FragmentChannelBinding channelBinding;
+    private ChannelHeaderBinding headerBinding;
+    private PlaylistControlBinding playlistControlBinding;
 
     private MenuItem menuRssButton;
     private MenuItem menuNotifyButton;
-    private SubscriptionEntity channelSubscription;
-    private MenuProvider menuProvider;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -110,78 +99,22 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
         return instance;
     }
 
-    private void setInitialData(final int sid, final String u, final String title) {
-        this.serviceId = sid;
-        this.url = u;
-        this.name = !TextUtils.isEmpty(title) ? title : "";
+    public ChannelFragment() {
+        super(UserAction.REQUESTED_CHANNEL);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (activity != null && useAsFrontPage) {
+            setTitle(currentInfo != null ? currentInfo.getName() : name);
+        }
+    }
 
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        menuProvider = new MenuProvider() {
-            @Override
-            public void onCreateMenu(@NonNull final Menu menu,
-                                     @NonNull final MenuInflater inflater) {
-                inflater.inflate(R.menu.menu_channel, menu);
-
-                if (DEBUG) {
-                    Log.d(TAG, "onCreateOptionsMenu() called with: "
-                            + "menu = [" + menu + "], inflater = [" + inflater + "]");
-                }
-
-            }
-
-            @Override
-            public void onPrepareMenu(@NonNull final Menu menu) {
-                menuRssButton = menu.findItem(R.id.menu_item_rss);
-                menuNotifyButton = menu.findItem(R.id.menu_item_notify);
-                updateRssButton();
-                updateNotifyButton(channelSubscription);
-            }
-
-            @Override
-            public boolean onMenuItemSelected(@NonNull final MenuItem item) {
-                switch (item.getItemId()) {
-                    case R.id.menu_item_notify:
-                        final boolean value = !item.isChecked();
-                        item.setEnabled(false);
-                        setNotify(value);
-                        break;
-                    case R.id.action_settings:
-                        NavigationHelper.openSettings(requireContext());
-                        break;
-                    case R.id.menu_item_rss:
-                        if (currentInfo != null) {
-                            ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
-                        }
-                        break;
-                    case R.id.menu_item_openInBrowser:
-                        if (currentInfo != null) {
-                            ShareUtils.openUrlInBrowser(requireContext(),
-                                    currentInfo.getOriginalUrl());
-                        }
-                        break;
-                    case R.id.menu_item_share:
-                        if (currentInfo != null) {
-                            ShareUtils.shareText(requireContext(), name,
-                                    currentInfo.getOriginalUrl(), currentInfo.getAvatars());
-                        }
-                        break;
-                    default:
-                        return false;
-                }
-                return true;
-            }
-        };
-        activity.addMenuProvider(menuProvider);
-    }
-
     @Override
     public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
@@ -192,62 +125,103 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     public View onCreateView(@NonNull final LayoutInflater inflater,
                              @Nullable final ViewGroup container,
                              @Nullable final Bundle savedInstanceState) {
-        binding = FragmentChannelBinding.inflate(inflater, container, false);
-        return binding.getRoot();
+        return inflater.inflate(R.layout.fragment_channel, container, false);
     }
 
-    @Override // called from onViewCreated in BaseFragment.onViewCreated
-    protected void initViews(final View rootView, final Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
+    @Override
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        channelBinding = FragmentChannelBinding.bind(rootView);
+        showContentNotSupportedIfNeeded();
+    }
 
-        EmptyStateUtil.setEmptyStateComposable(
-                binding.emptyStateView,
-                EmptyStateSpec.Companion.getContentNotSupported()
-        );
-
-        tabAdapter = new TabAdapter(getChildFragmentManager());
-        binding.viewPager.setAdapter(tabAdapter);
-        binding.tabLayout.setupWithViewPager(binding.viewPager);
-
-        setTitle(name);
-        binding.channelTitleView.setText(name);
-        if (!ImageStrategy.shouldLoadImages()) {
-            // do not waste space for the banner if it is not going to be loaded
-            binding.channelBannerImage.setImageDrawable(null);
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        disposables.clear();
+        if (subscribeButtonMonitor != null) {
+            subscribeButtonMonitor.dispose();
         }
+        channelBinding = null;
+        headerBinding = null;
+        playlistControlBinding = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Supplier<View> getListHeaderSupplier() {
+        headerBinding = ChannelHeaderBinding
+                .inflate(activity.getLayoutInflater(), itemsList, false);
+        playlistControlBinding = headerBinding.playlistControl;
+
+        return headerBinding::getRoot;
     }
 
     @Override
     protected void initListeners() {
         super.initListeners();
 
-        final View.OnClickListener openSubChannel = v -> {
-            if (!TextUtils.isEmpty(currentInfo.getParentChannelUrl())) {
-                try {
-                    NavigationHelper.openChannelFragment(getFM(), currentInfo.getServiceId(),
-                            currentInfo.getParentChannelUrl(),
-                            currentInfo.getParentChannelName());
-                } catch (final Exception e) {
-                    ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
-                }
-            } else if (DEBUG) {
-                Log.i(TAG, "Can't open parent channel because we got no channel URL");
+        headerBinding.subChannelTitleView.setOnClickListener(this);
+        headerBinding.subChannelAvatarView.setOnClickListener(this);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull final Menu menu,
+                                    @NonNull final MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        final ActionBar supportActionBar = activity.getSupportActionBar();
+        if (useAsFrontPage && supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(false);
+        } else {
+            inflater.inflate(R.menu.menu_channel, menu);
+
+            if (DEBUG) {
+                Log.d(TAG, "onCreateOptionsMenu() called with: "
+                        + "menu = [" + menu + "], inflater = [" + inflater + "]");
             }
-        };
-        binding.subChannelAvatarView.setOnClickListener(openSubChannel);
-        binding.subChannelTitleView.setOnClickListener(openSubChannel);
+            menuRssButton = menu.findItem(R.id.menu_item_rss);
+            menuNotifyButton = menu.findItem(R.id.menu_item_notify);
+        }
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (currentWorker != null) {
-            currentWorker.dispose();
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_settings:
+                NavigationHelper.openSettings(requireContext());
+                break;
+            case R.id.menu_item_notify:
+                final boolean value = !item.isChecked();
+                item.setEnabled(false);
+                setNotify(value);
+                break;
+            case R.id.menu_item_rss:
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
+                }
+                break;
+            case R.id.menu_item_openInBrowser:
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInBrowser(requireContext(), currentInfo.getOriginalUrl());
+                }
+                break;
+            case R.id.menu_item_share:
+                if (currentInfo != null) {
+                    ShareUtils.shareText(requireContext(), name, currentInfo.getOriginalUrl(),
+                            currentInfo.getAvatarUrl());
+                }
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
         }
-        disposables.clear();
-        binding = null;
-        activity.removeMenuProvider(menuProvider);
-        menuProvider = null;
+        return true;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -255,8 +229,8 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     //////////////////////////////////////////////////////////////////////////*/
 
     private void monitorSubscription(final ChannelInfo info) {
-        final Consumer<Throwable> onError = (final Throwable throwable) -> {
-            animate(binding.channelSubscribeButton, false, 100);
+        final Consumer<Throwable> onError = (Throwable throwable) -> {
+            animate(headerBinding.channelSubscribeButton, false, 100);
             showSnackBarError(new ErrorInfo(throwable, UserAction.SUBSCRIPTION_GET,
                     "Get subscription status", currentInfo));
         };
@@ -289,15 +263,16 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
                 }, onError));
     }
 
-    private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription) {
-        return (@NonNull final Object o) -> {
-            subscriptionManager.insertSubscription(subscription);
+    private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription,
+                                                    final ChannelInfo info) {
+        return (@NonNull Object o) -> {
+            subscriptionManager.insertSubscription(subscription, info);
             return o;
         };
     }
 
     private Function<Object, Object> mapOnUnsubscribe(final SubscriptionEntity subscription) {
-        return (@NonNull final Object o) -> {
+        return (@NonNull Object o) -> {
             subscriptionManager.deleteSubscription(subscription);
             return o;
         };
@@ -323,8 +298,9 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
                 .subscribe(onComplete, onError));
     }
 
-    private Disposable monitorSubscribeButton(final Function<Object, Object> action) {
-        final Consumer<Object> onNext = (@NonNull final Object o) -> {
+    private Disposable monitorSubscribeButton(final Button subscribeButton,
+                                              final Function<Object, Object> action) {
+        final Consumer<Object> onNext = (@NonNull Object o) -> {
             if (DEBUG) {
                 Log.d(TAG, "Changed subscription status to this channel!");
             }
@@ -335,7 +311,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
                         "Changing subscription for " + currentInfo.getUrl(), currentInfo));
 
         /* Emit clicks from main thread unto io thread */
-        return RxView.clicks(binding.channelSubscribeButton)
+        return RxView.clicks(subscribeButton)
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .observeOn(Schedulers.io())
                 .debounce(BUTTON_DEBOUNCE_INTERVAL, TimeUnit.MILLISECONDS) // Ignore rapid clicks
@@ -344,7 +320,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     }
 
     private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor(final ChannelInfo info) {
-        return (final List<SubscriptionEntity> subscriptionEntities) -> {
+        return (List<SubscriptionEntity> subscriptionEntities) -> {
             if (DEBUG) {
                 Log.d(TAG, "subscriptionManager.subscriptionTable.doOnNext() called with: "
                         + "subscriptionEntities = [" + subscriptionEntities + "]");
@@ -361,20 +337,20 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
                 channel.setServiceId(info.getServiceId());
                 channel.setUrl(info.getUrl());
                 channel.setData(info.getName(),
-                        ImageStrategy.imageListToDbUrl(info.getAvatars()),
+                        info.getAvatarUrl(),
                         info.getDescription(),
                         info.getSubscriberCount());
-                channelSubscription = null;
                 updateNotifyButton(null);
-                subscribeButtonMonitor = monitorSubscribeButton(mapOnSubscribe(channel));
+                subscribeButtonMonitor = monitorSubscribeButton(
+                        headerBinding.channelSubscribeButton, mapOnSubscribe(channel, info));
             } else {
                 if (DEBUG) {
                     Log.d(TAG, "Found subscription to this channel!");
                 }
-                channelSubscription = subscriptionEntities.get(0);
-                updateNotifyButton(channelSubscription);
-                subscribeButtonMonitor =
-                        monitorSubscribeButton(mapOnUnsubscribe(channelSubscription));
+                final SubscriptionEntity subscription = subscriptionEntities.get(0);
+                updateNotifyButton(subscription);
+                subscribeButtonMonitor = monitorSubscribeButton(
+                        headerBinding.channelSubscribeButton, mapOnUnsubscribe(subscription));
             }
         };
     }
@@ -385,40 +361,34 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
                     + "isSubscribed = [" + isSubscribed + "]");
         }
 
-        final boolean isButtonVisible = binding.channelSubscribeButton.getVisibility()
+        final boolean isButtonVisible = headerBinding.channelSubscribeButton.getVisibility()
                 == View.VISIBLE;
         final int backgroundDuration = isButtonVisible ? 300 : 0;
         final int textDuration = isButtonVisible ? 200 : 0;
 
+        final int subscribeBackground = ThemeHelper
+                .resolveColorFromAttr(activity, R.attr.colorPrimary);
+        final int subscribeText = ContextCompat.getColor(activity, R.color.subscribe_text_color);
         final int subscribedBackground = ContextCompat
                 .getColor(activity, R.color.subscribed_background_color);
         final int subscribedText = ContextCompat.getColor(activity, R.color.subscribed_text_color);
-        final int subscribeBackground = ColorUtils.blendARGB(ThemeHelper
-                .resolveColorFromAttr(activity, R.attr.colorPrimary), subscribedBackground, 0.35f);
-        final int subscribeText = ContextCompat.getColor(activity, R.color.subscribe_text_color);
 
-        if (isSubscribed) {
-            binding.channelSubscribeButton.setText(R.string.subscribed_button_title);
-            animateBackgroundColor(binding.channelSubscribeButton, backgroundDuration,
-                    subscribeBackground, subscribedBackground);
-            animateTextColor(binding.channelSubscribeButton, textDuration, subscribeText,
-                    subscribedText);
-        } else {
-            binding.channelSubscribeButton.setText(R.string.subscribe_button_title);
-            animateBackgroundColor(binding.channelSubscribeButton, backgroundDuration,
+        if (!isSubscribed) {
+            headerBinding.channelSubscribeButton.setText(R.string.subscribe_button_title);
+            animateBackgroundColor(headerBinding.channelSubscribeButton, backgroundDuration,
                     subscribedBackground, subscribeBackground);
-            animateTextColor(binding.channelSubscribeButton, textDuration, subscribedText,
+            animateTextColor(headerBinding.channelSubscribeButton, textDuration, subscribedText,
                     subscribeText);
+        } else {
+            headerBinding.channelSubscribeButton.setText(R.string.subscribed_button_title);
+            animateBackgroundColor(headerBinding.channelSubscribeButton, backgroundDuration,
+                    subscribeBackground, subscribedBackground);
+            animateTextColor(headerBinding.channelSubscribeButton, textDuration, subscribeText,
+                    subscribedText);
         }
 
-        animate(binding.channelSubscribeButton, true, 100, AnimationType.LIGHT_SCALE_AND_ALPHA);
-    }
-
-    private void updateRssButton() {
-        if (menuRssButton == null || currentInfo == null) {
-            return;
-        }
-        menuRssButton.setVisible(!TextUtils.isEmpty(currentInfo.getFeedUrl()));
+        animate(headerBinding.channelSubscribeButton, true, 100,
+                AnimationType.LIGHT_SCALE_AND_ALPHA);
     }
 
     private void updateNotifyButton(@Nullable final SubscriptionEntity subscription) {
@@ -454,176 +424,107 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
      * Show a snackbar with the option to enable notifications on new streams for this channel.
      */
     private void showNotifySnackbar() {
-        Snackbar.make(binding.getRoot(), R.string.you_successfully_subscribed, Snackbar.LENGTH_LONG)
+        Snackbar.make(itemsList, R.string.you_successfully_subscribed, Snackbar.LENGTH_LONG)
                 .setAction(R.string.get_notified, v -> setNotify(true))
                 .setActionTextColor(Color.YELLOW)
                 .show();
     }
 
-
     /*//////////////////////////////////////////////////////////////////////////
-    // Init
+    // Load and handle
     //////////////////////////////////////////////////////////////////////////*/
 
-    private void updateTabs() {
-        tabAdapter.clearAllItems();
+    @Override
+    protected Single<ListExtractor.InfoItemsPage<StreamInfoItem>> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextPage);
+    }
 
-        if (currentInfo != null && !channelContentNotSupported) {
-            final Context context = requireContext();
-            final SharedPreferences preferences = PreferenceManager
-                    .getDefaultSharedPreferences(context);
+    @Override
+    protected Single<ChannelInfo> loadResult(final boolean forceLoad) {
+        return ExtractorHelper.getChannelInfo(serviceId, url, forceLoad);
+    }
 
-            for (final ListLinkHandler linkHandler : currentInfo.getTabs()) {
-                final String tab = linkHandler.getContentFilters().get(0);
-                if (ChannelTabHelper.showChannelTab(context, preferences, tab)) {
-                    final ChannelTabFragment channelTabFragment =
-                            ChannelTabFragment.getInstance(serviceId, linkHandler, name);
-                    channelTabFragment.useAsFrontPage(useAsFrontPage);
-                    tabAdapter.addFragment(channelTabFragment,
-                            context.getString(ChannelTabHelper.getTranslationKey(tab)));
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnClick
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onClick(final View v) {
+        if (isLoading.get() || currentInfo == null) {
+            return;
+        }
+
+        switch (v.getId()) {
+            case R.id.sub_channel_avatar_view:
+            case R.id.sub_channel_title_view:
+                if (!TextUtils.isEmpty(currentInfo.getParentChannelUrl())) {
+                    try {
+                        NavigationHelper.openChannelFragment(getFM(), currentInfo.getServiceId(),
+                                currentInfo.getParentChannelUrl(),
+                                currentInfo.getParentChannelName());
+                    } catch (final Exception e) {
+                        ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
+                    }
+                } else if (DEBUG) {
+                    Log.i(TAG, "Can't open parent channel because we got no channel URL");
                 }
-            }
-
-            if (ChannelTabHelper.showChannelTab(
-                    context, preferences, R.string.show_channel_tabs_about)) {
-                tabAdapter.addFragment(
-                        new ChannelAboutFragment(currentInfo),
-                        context.getString(R.string.channel_tab_about));
-            }
-        }
-
-        tabAdapter.notifyDataSetUpdate();
-
-        for (int i = 0; i < tabAdapter.getCount(); i++) {
-            binding.tabLayout.getTabAt(i).setText(tabAdapter.getItemTitle(i));
-        }
-
-        // Restore previously selected tab
-        final TabLayout.Tab ltab = binding.tabLayout.getTabAt(lastTab);
-        if (ltab != null) {
-            binding.tabLayout.selectTab(ltab);
+                break;
         }
     }
 
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // State Saving
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public String generateSuffix() {
-        return null;
-    }
-
-    @Override
-    public void writeTo(final Queue<Object> objectsToSave) {
-        objectsToSave.add(currentInfo);
-        objectsToSave.add(binding == null ? 0 : binding.tabLayout.getSelectedTabPosition());
-    }
-
-    @Override
-    public void readFrom(@NonNull final Queue<Object> savedObjects) {
-        currentInfo = (ChannelInfo) savedObjects.poll();
-        lastTab = (Integer) savedObjects.poll();
-    }
-
-    @Override
-    public void onSaveInstanceState(final @NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (binding != null) {
-            outState.putInt("LastTab", binding.tabLayout.getSelectedTabPosition());
-        }
-    }
-
-    @Override
-    protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        lastTab = savedInstanceState.getInt("LastTab", 0);
-    }
-
-
     /*//////////////////////////////////////////////////////////////////////////
     // Contract
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    protected void doInitialLoadLogic() {
-        if (currentInfo == null) {
-            startLoading(false);
-        } else {
-            handleResult(currentInfo);
-        }
-    }
-
-    @Override
-    public void startLoading(final boolean forceLoad) {
-        super.startLoading(forceLoad);
-
-        currentInfo = null;
-        updateTabs();
-        if (currentWorker != null) {
-            currentWorker.dispose();
-        }
-
-        runWorker(forceLoad);
-    }
-
-    private void runWorker(final boolean forceLoad) {
-        currentWorker = ExtractorHelper.getChannelInfo(serviceId, url, forceLoad)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(result -> {
-                    isLoading.set(false);
-                    handleResult(result);
-                }, throwable -> showError(new ErrorInfo(throwable, UserAction.REQUESTED_CHANNEL,
-                        url == null ? "No URL" : url, serviceId)));
-    }
-
     @Override
     public void showLoading() {
         super.showLoading();
-        CoilUtils.dispose(binding.channelAvatarView);
-        CoilUtils.dispose(binding.channelBannerImage);
-        CoilUtils.dispose(binding.subChannelAvatarView);
-        animate(binding.channelSubscribeButton, false, 100);
+        PicassoHelper.cancelTag(PICASSO_CHANNEL_TAG);
+        animate(headerBinding.channelSubscribeButton, false, 100);
     }
 
     @Override
     public void handleResult(@NonNull final ChannelInfo result) {
         super.handleResult(result);
-        currentInfo = result;
-        setInitialData(result.getServiceId(), result.getOriginalUrl(), result.getName());
 
-        if (ImageStrategy.shouldLoadImages() && !result.getBanners().isEmpty()) {
-            CoilHelper.INSTANCE.loadBanner(binding.channelBannerImage, result.getBanners());
-        } else {
-            // do not waste space for the banner, if the user disabled images or there is not one
-            binding.channelBannerImage.setImageDrawable(null);
-        }
+        headerBinding.getRoot().setVisibility(View.VISIBLE);
+        PicassoHelper.loadBanner(result.getBannerUrl()).tag(PICASSO_CHANNEL_TAG)
+                .into(headerBinding.channelBannerImage);
+        PicassoHelper.loadAvatar(result.getAvatarUrl()).tag(PICASSO_CHANNEL_TAG)
+                .into(headerBinding.channelAvatarView);
+        PicassoHelper.loadAvatar(result.getParentChannelAvatarUrl()).tag(PICASSO_CHANNEL_TAG)
+                .into(headerBinding.subChannelAvatarView);
 
-        CoilHelper.INSTANCE.loadAvatar(binding.channelAvatarView, result.getAvatars());
-        CoilHelper.INSTANCE.loadAvatar(binding.subChannelAvatarView,
-                result.getParentChannelAvatars());
-
-        binding.channelTitleView.setText(result.getName());
-        binding.channelSubscriberView.setVisibility(View.VISIBLE);
+        headerBinding.channelSubscriberView.setVisibility(View.VISIBLE);
         if (result.getSubscriberCount() >= 0) {
-            binding.channelSubscriberView.setText(Localization
+            headerBinding.channelSubscriberView.setText(Localization
                     .shortSubscriberCount(activity, result.getSubscriberCount()));
         } else {
-            binding.channelSubscriberView.setText(R.string.subscribers_count_not_available);
+            headerBinding.channelSubscriberView.setText(R.string.subscribers_count_not_available);
         }
 
         if (!TextUtils.isEmpty(currentInfo.getParentChannelName())) {
-            binding.subChannelTitleView.setText(String.format(
+            headerBinding.subChannelTitleView.setText(String.format(
                     getString(R.string.channel_created_by),
                     currentInfo.getParentChannelName())
             );
-            binding.subChannelTitleView.setVisibility(View.VISIBLE);
-            binding.subChannelAvatarView.setVisibility(View.VISIBLE);
+            headerBinding.subChannelTitleView.setVisibility(View.VISIBLE);
+            headerBinding.subChannelAvatarView.setVisibility(View.VISIBLE);
+        } else {
+            headerBinding.subChannelTitleView.setVisibility(View.GONE);
         }
 
-        updateRssButton();
+        if (menuRssButton != null) {
+            menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
+        }
+
+        // PlaylistControls should be visible only if there is some item in
+        // infoListAdapter other than header
+        if (infoListAdapter.getItemCount() != 1) {
+            playlistControlBinding.getRoot().setVisibility(View.VISIBLE);
+        } else {
+            playlistControlBinding.getRoot().setVisibility(View.GONE);
+        }
 
         channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {
@@ -638,19 +539,62 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
         if (subscribeButtonMonitor != null) {
             subscribeButtonMonitor.dispose();
         }
-
-        updateTabs();
         updateSubscription(result);
         monitorSubscription(result);
+
+        playlistControlBinding.playlistCtrlPlayAllButton
+                .setOnClickListener(view -> NavigationHelper
+                        .playOnMainPlayer(activity, getPlayQueue()));
+        playlistControlBinding.playlistCtrlPlayPopupButton
+                .setOnClickListener(view -> NavigationHelper
+                        .playOnPopupPlayer(activity, getPlayQueue(), false));
+        playlistControlBinding.playlistCtrlPlayBgButton
+                .setOnClickListener(view -> NavigationHelper
+                        .playOnBackgroundPlayer(activity, getPlayQueue(), false));
+
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.POPUP);
+            return true;
+        });
+
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.AUDIO);
+            return true;
+        });
     }
 
     private void showContentNotSupportedIfNeeded() {
         // channelBinding might not be initialized when handleResult() is called
         // (e.g. after rotating the screen, #6696)
-        if (!channelContentNotSupported || binding == null) {
+        if (!channelContentNotSupported || channelBinding == null) {
             return;
         }
 
-        binding.emptyStateView.setVisibility(View.VISIBLE);
+        channelBinding.errorContentNotSupported.setVisibility(View.VISIBLE);
+        channelBinding.channelKaomoji.setText("(︶︹︺)");
+        channelBinding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
+        channelBinding.channelNoVideos.setVisibility(View.GONE);
+    }
+
+    private PlayQueue getPlayQueue() {
+        final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
+                .filter(StreamInfoItem.class::isInstance)
+                .map(StreamInfoItem.class::cast)
+                .collect(Collectors.toList());
+
+        return new ChannelPlayQueue(currentInfo.getServiceId(), currentInfo.getUrl(),
+                currentInfo.getNextPage(), streamItems, 0);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(final String title) {
+        super.setTitle(title);
+        if (!useAsFrontPage) {
+            headerBinding.channelTitleView.setText(title);
+        }
     }
 }

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

@@ -1,177 +0,0 @@
-package org.schabi.newpipe.fragments.list.channel;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.evernote.android.state.State;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.PlaylistControlBinding;
-import org.schabi.newpipe.error.UserAction;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.ListExtractor;
-import org.schabi.newpipe.extractor.channel.tabs.ChannelTabInfo;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
-import org.schabi.newpipe.extractor.linkhandler.ReadyChannelTabListLinkHandler;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.fragments.list.playlist.PlaylistControlViewHolder;
-import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue;
-import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
-import org.schabi.newpipe.util.ChannelTabHelper;
-import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.PlayButtonHelper;
-
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import io.reactivex.rxjava3.core.Single;
-
-public class ChannelTabFragment extends BaseListInfoFragment<InfoItem, ChannelTabInfo>
-        implements PlaylistControlViewHolder {
-
-    // states must be protected and not private for State being able to access them
-    @State
-    protected ListLinkHandler tabHandler;
-    @State
-    protected String channelName;
-
-    private PlaylistControlBinding playlistControlBinding;
-
-    @NonNull
-    public static ChannelTabFragment getInstance(final int serviceId,
-                                                 final ListLinkHandler tabHandler,
-                                                 final String channelName) {
-        final ChannelTabFragment instance = new ChannelTabFragment();
-        instance.serviceId = serviceId;
-        instance.tabHandler = tabHandler;
-        instance.channelName = channelName;
-        return instance;
-    }
-
-    public ChannelTabFragment() {
-        super(UserAction.REQUESTED_CHANNEL);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // LifeCycle
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(false);
-    }
-
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-                             @Nullable final ViewGroup container,
-                             @Nullable final Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_channel_tab, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
-        super.onViewCreated(rootView, savedInstanceState);
-        EmptyStateUtil.setEmptyStateComposable(rootView.findViewById(R.id.empty_state_view));
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        playlistControlBinding = null;
-    }
-
-    @Override
-    protected Supplier<View> getListHeaderSupplier() {
-        if (ChannelTabHelper.isStreamsTab(tabHandler)) {
-            playlistControlBinding = PlaylistControlBinding
-                    .inflate(activity.getLayoutInflater(), itemsList, false);
-            return playlistControlBinding::getRoot;
-        }
-        return null;
-    }
-
-    @Override
-    protected Single<ChannelTabInfo> loadResult(final boolean forceLoad) {
-        return ExtractorHelper.getChannelTab(serviceId, tabHandler, forceLoad);
-    }
-
-    @Override
-    protected Single<ListExtractor.InfoItemsPage<InfoItem>> loadMoreItemsLogic() {
-        return ExtractorHelper.getMoreChannelTabItems(serviceId, tabHandler, currentNextPage);
-    }
-
-    @Override
-    public void setTitle(final String title) {
-        // The channel name is displayed as title in the toolbar.
-        // The title is always a description of the content of the tab fragment.
-        // It should be unique for each channel because multiple channel tabs
-        // can be added to the main page. Therefore, the channel name is used.
-        // Using the title variable would cause the title to be the same for all channel tabs.
-        super.setTitle(channelName);
-    }
-
-    @Override
-    public void handleResult(@NonNull final ChannelTabInfo result) {
-        super.handleResult(result);
-
-        // FIXME this is a really hacky workaround, to avoid storing useless data in the fragment
-        //  state. The problem is, `ReadyChannelTabListLinkHandler` might contain raw JSON data that
-        //  uses a lot of memory (e.g. ~800KB for YouTube). While 800KB doesn't seem much, if
-        //  you combine just a couple of channel tab fragments you easily go over the 1MB
-        //  save&restore transaction limit, and get `TransactionTooLargeException`s. A proper
-        //  solution would require rethinking about `ReadyChannelTabListLinkHandler`s.
-        if (tabHandler instanceof ReadyChannelTabListLinkHandler) {
-            try {
-                // once `handleResult` is called, the parsed data was already saved to cache, so
-                // we can discard any raw data in ReadyChannelTabListLinkHandler and create a
-                // link handler with identical properties, but without any raw data
-                final ListLinkHandlerFactory channelTabLHFactory = result.getService()
-                        .getChannelTabLHFactory();
-                if (channelTabLHFactory != null) {
-                    // some services do not not have a ChannelTabLHFactory
-                    tabHandler = channelTabLHFactory.fromQuery(tabHandler.getId(),
-                            tabHandler.getContentFilters(), tabHandler.getSortFilter());
-                }
-            } catch (final ParsingException e) {
-                // silently ignore the error, as the app can continue to function normally
-                Log.w(TAG, "Could not recreate channel tab handler", e);
-            }
-        }
-
-        if (playlistControlBinding != null) {
-            // PlaylistControls should be visible only if there is some item in
-            // infoListAdapter other than header
-            if (infoListAdapter.getItemCount() > 1) {
-                playlistControlBinding.getRoot().setVisibility(View.VISIBLE);
-            } else {
-                playlistControlBinding.getRoot().setVisibility(View.GONE);
-            }
-
-            PlayButtonHelper.initPlaylistControlClickListener(
-                    activity, playlistControlBinding, this);
-        }
-    }
-
-    @Override
-    public PlayQueue getPlayQueue() {
-        final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
-                .filter(StreamInfoItem.class::isInstance)
-                .map(StreamInfoItem.class::cast)
-                .collect(Collectors.toList());
-
-        return new ChannelTabPlayQueue(currentInfo.getServiceId(), tabHandler,
-                currentInfo.getNextPage(), streamItems, 0);
-    }
-}

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java

@@ -0,0 +1,113 @@
+package org.schabi.newpipe.fragments.list.comments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.comments.CommentsInfo;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.info_list.ItemViewMode;
+import org.schabi.newpipe.ktx.ViewUtils;
+import org.schabi.newpipe.util.ExtractorHelper;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+
+public class CommentsFragment extends BaseListInfoFragment<CommentsInfoItem, CommentsInfo> {
+    private final CompositeDisposable disposables = new CompositeDisposable();
+
+    private TextView emptyStateDesc;
+
+    public static CommentsFragment getInstance(final int serviceId, final String url,
+                                               final String name) {
+        final CommentsFragment instance = new CommentsFragment();
+        instance.setInitialData(serviceId, url, name);
+        return instance;
+    }
+
+    public CommentsFragment() {
+        super(UserAction.REQUESTED_COMMENTS);
+    }
+
+    @Override
+    protected void initViews(final View rootView, final Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        emptyStateDesc = rootView.findViewById(R.id.empty_state_desc);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_comments, container, false);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        disposables.clear();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage<CommentsInfoItem>> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreCommentItems(serviceId, currentInfo, currentNextPage);
+    }
+
+    @Override
+    protected Single<CommentsInfo> loadResult(final boolean forceLoad) {
+        return ExtractorHelper.getCommentsInfo(serviceId, url, forceLoad);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void handleResult(@NonNull final CommentsInfo result) {
+        super.handleResult(result);
+
+        emptyStateDesc.setText(
+                result.isCommentsDisabled()
+                        ? R.string.comments_are_disabled
+                        : R.string.no_comments);
+
+        ViewUtils.slideUp(requireView(), 120, 150, 0.06f);
+        disposables.clear();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(final String title) { }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull final Menu menu,
+                                    @NonNull final MenuInflater inflater) { }
+
+    @Override
+    protected ItemViewMode getItemViewMode() {
+        return ItemViewMode.LIST;
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt

@@ -1,35 +0,0 @@
-package org.schabi.newpipe.fragments.list.comments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.fragment.compose.content
-import org.schabi.newpipe.ui.components.video.comment.CommentSection
-import org.schabi.newpipe.ui.theme.AppTheme
-import org.schabi.newpipe.util.KEY_SERVICE_ID
-import org.schabi.newpipe.util.KEY_URL
-
-class CommentsFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = content {
-        AppTheme {
-            Surface(color = MaterialTheme.colorScheme.background) {
-                CommentSection()
-            }
-        }
-    }
-
-    companion object {
-        @JvmStatic
-        fun getInstance(serviceId: Int, url: String?) = CommentsFragment().apply {
-            arguments = bundleOf(KEY_SERVICE_ID to serviceId, KEY_URL to url)
-        }
-    }
-}

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

@@ -11,26 +11,23 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
-import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCLiveStreamKiosk;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.Localization;
 
+import icepick.State;
 import io.reactivex.rxjava3.core.Single;
 
 /**
@@ -164,14 +161,4 @@ public class KioskFragment extends BaseListInfoFragment<StreamInfoItem, KioskInf
         name = kioskTranslatedName;
         setTitle(kioskTranslatedName);
     }
-
-    @Override
-    public void showEmptyState() {
-        // show "no live streams" for live stream kiosk
-        super.showEmptyState();
-        if (MediaCCCLiveStreamKiosk.KIOSK_ID.equals(currentInfo.getId())
-                && ServiceList.MediaCCC.getServiceId() == currentInfo.getServiceId()) {
-            setEmptyStateMessage(R.string.no_live_streams);
-        }
-    }
 }

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

@@ -1,11 +0,0 @@
-package org.schabi.newpipe.fragments.list.playlist;
-
-import org.schabi.newpipe.player.playqueue.PlayQueue;
-
-/**
- * Interface for {@code R.layout.playlist_control} view holders
- * to give access to the play queue.
- */
-public interface PlaylistControlViewHolder {
-    PlayQueue getPlayQueue();
-}

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

@@ -1,9 +1,7 @@
 package org.schabi.newpipe.fragments.list.playlist;
 
-import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
-import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -39,22 +37,20 @@ import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
-import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
 import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.PlayButtonHelper;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.image.CoilHelper;
-import org.schabi.newpipe.util.text.TextEllipsizer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,15 +58,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, PlaylistInfo>
-        implements PlaylistControlViewHolder {
+public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, PlaylistInfo> {
+
+    private static final String PICASSO_PLAYLIST_TAG = "PICASSO_PLAYLIST_TAG";
 
     private CompositeDisposable disposables;
     private Subscription bookmarkReactor;
@@ -88,9 +84,6 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
 
     private MenuItem playlistBookmarkButton;
 
-    private long streamCount;
-    private long playlistOverallDurationSeconds;
-
     public static PlaylistFragment getInstance(final int serviceId, final String url,
                                                final String name) {
         final PlaylistFragment instance = new PlaylistFragment();
@@ -240,7 +233,7 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
                 break;
             case R.id.menu_item_share:
                 ShareUtils.shareText(requireContext(), name, url,
-                        currentInfo == null ? List.of() : currentInfo.getThumbnails());
+                        currentInfo == null ? null : currentInfo.getThumbnailUrl());
                 break;
             case R.id.menu_item_bookmark:
                 onBookmarkClicked();
@@ -275,16 +268,10 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
         animate(headerBinding.getRoot(), false, 200);
         animateHideRecyclerViewAllowingScrolling(itemsList);
 
-        CoilUtils.dispose(headerBinding.uploaderAvatarView);
+        PicassoHelper.cancelTag(PICASSO_PLAYLIST_TAG);
         animate(headerBinding.uploaderLayout, false, 200);
     }
 
-    @Override
-    public void handleNextItems(final ListExtractor.InfoItemsPage result) {
-        super.handleNextItems(result);
-        setStreamCountAndOverallDuration(result.getItems(), !result.hasNextPage());
-    }
-
     @Override
     public void handleResult(@NonNull final PlaylistInfo result) {
         super.handleResult(result);
@@ -311,6 +298,7 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
 
         playlistControlBinding.getRoot().setVisibility(View.VISIBLE);
 
+        final String avatarUrl = result.getUploaderAvatarUrl();
         if (result.getServiceId() == ServiceList.YouTube.getServiceId()
                 && (YoutubeParsingHelper.isYoutubeMixId(result.getId())
                 || YoutubeParsingHelper.isYoutubeMusicMixId(result.getId()))) {
@@ -326,36 +314,12 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
                     R.drawable.ic_radio)
             );
         } else {
-            CoilHelper.INSTANCE.loadAvatar(headerBinding.uploaderAvatarView,
-                    result.getUploaderAvatars());
+            PicassoHelper.loadAvatar(avatarUrl).tag(PICASSO_PLAYLIST_TAG)
+                    .into(headerBinding.uploaderAvatarView);
         }
 
-        streamCount = result.getStreamCount();
-        setStreamCountAndOverallDuration(result.getRelatedItems(), !result.hasNextPage());
-
-        final Description description = result.getDescription();
-        if (description != null && description != Description.EMPTY_DESCRIPTION
-                && !isBlank(description.getContent())) {
-            final TextEllipsizer ellipsizer = new TextEllipsizer(
-                    headerBinding.playlistDescription, 5, getServiceById(result.getServiceId()));
-            ellipsizer.setStateChangeListener(isEllipsized ->
-                headerBinding.playlistDescriptionReadMore.setText(
-                        Boolean.TRUE.equals(isEllipsized) ? R.string.show_more : R.string.show_less
-                ));
-            ellipsizer.setOnContentChanged(canBeEllipsized -> {
-                headerBinding.playlistDescriptionReadMore.setVisibility(
-                        Boolean.TRUE.equals(canBeEllipsized) ? View.VISIBLE : View.GONE);
-                if (Boolean.TRUE.equals(canBeEllipsized)) {
-                    ellipsizer.ellipsize();
-                }
-            });
-            ellipsizer.setContent(description);
-            headerBinding.playlistDescriptionReadMore.setOnClickListener(v -> ellipsizer.toggle());
-            headerBinding.playlistDescription.setOnClickListener(v -> ellipsizer.toggle());
-        } else {
-            headerBinding.playlistDescription.setVisibility(View.GONE);
-            headerBinding.playlistDescriptionReadMore.setVisibility(View.GONE);
-        }
+        headerBinding.playlistStreamCount.setText(Localization
+                .localizeStreamCount(getContext(), result.getStreamCount()));
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.REQUESTED_PLAYLIST,
@@ -368,10 +332,25 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(getPlaylistBookmarkSubscriber());
 
-        PlayButtonHelper.initPlaylistControlClickListener(activity, playlistControlBinding, this);
+        playlistControlBinding.playlistCtrlPlayAllButton.setOnClickListener(view ->
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnClickListener(view ->
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(), false));
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnClickListener(view ->
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
+
+        playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.POPUP);
+            return true;
+        });
+
+        playlistControlBinding.playlistCtrlPlayBgButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPlayer(activity, getPlayQueue(), PlayerType.AUDIO);
+            return true;
+        });
     }
 
-    public PlayQueue getPlayQueue() {
+    private PlayQueue getPlayQueue() {
         return getPlayQueue(0);
     }
 
@@ -495,20 +474,4 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
         playlistBookmarkButton.setIcon(drawable);
         playlistBookmarkButton.setTitle(titleRes);
     }
-
-    private void setStreamCountAndOverallDuration(final List<StreamInfoItem> list,
-                                                  final boolean isDurationComplete) {
-        if (activity != null && headerBinding != null) {
-            playlistOverallDurationSeconds += list.stream()
-                    .mapToLong(x -> x.getDuration())
-                    .sum();
-            headerBinding.playlistStreamCount.setText(
-                Localization.concatenateStrings(
-                    Localization.localizeStreamCount(activity, streamCount),
-                    Localization.getDurationString(playlistOverallDurationSeconds,
-                            isDurationComplete, true))
-            );
-        }
-    }
-
 }

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.fragments.list.search;
 
 import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
-import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
 import static java.util.Arrays.asList;
@@ -40,8 +39,6 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.FragmentSearchBinding;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -64,8 +61,6 @@ import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.settings.NewPipeSettings;
-import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -81,6 +76,7 @@ import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
@@ -171,10 +167,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
     /*////////////////////////////////////////////////////////////////////////*/
 
-    /**
-     * TextWatcher to remove rich-text formatting on the search EditText when pasting content
-     * from the clipboard.
-     */
     private TextWatcher textWatcher;
 
     public static SearchFragment getInstance(final int serviceId, final String searchString) {
@@ -346,10 +338,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        EmptyStateUtil.setEmptyStateComposable(
-                searchBinding.emptyStateView,
-                EmptyStateSpec.Companion.getNoSearchResult());
-
         searchBinding.suggestionsList.setAdapter(suggestionListAdapter);
         // animations are just strange and useless, since the suggestions keep changing too much
         searchBinding.suggestionsList.setItemAnimator(null);
@@ -397,7 +385,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     @Override
     public void onSaveInstanceState(@NonNull final Bundle bundle) {
         searchString = searchEditText != null
-                ? getSearchEditString().trim()
+                ? searchEditText.getText().toString()
                 : searchString;
         super.onSaveInstanceState(bundle);
     }
@@ -408,11 +396,11 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
     @Override
     public void reloadContent() {
-        if (!TextUtils.isEmpty(searchString) || (searchEditText != null
-                && !isSearchEditBlank())) {
+        if (!TextUtils.isEmpty(searchString)
+                || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
             search(!TextUtils.isEmpty(searchString)
                     ? searchString
-                    : getSearchEditString(), this.contentFilter, "");
+                    : searchEditText.getText().toString(), this.contentFilter, "");
         } else {
             if (searchEditText != null) {
                 searchEditText.setText("");
@@ -506,8 +494,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         }
         searchEditText.setText(searchString);
 
-        if (TextUtils.isEmpty(searchString)
-                || isSearchEditBlank()) {
+        if (TextUtils.isEmpty(searchString) || TextUtils.isEmpty(searchEditText.getText())) {
             searchToolbarContainer.setTranslationX(100);
             searchToolbarContainer.setAlpha(0.0f);
             searchToolbarContainer.setVisibility(View.VISIBLE);
@@ -531,7 +518,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             if (DEBUG) {
                 Log.d(TAG, "onClick() called with: v = [" + v + "]");
             }
-            if (isSearchEditBlank()) {
+            if (TextUtils.isEmpty(searchEditText.getText())) {
                 NavigationHelper.gotoMainFragment(getFM());
                 return;
             }
@@ -557,7 +544,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             }
         });
 
-        searchEditText.setOnFocusChangeListener((final View v, final boolean hasFocus) -> {
+        searchEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
             if (DEBUG) {
                 Log.d(TAG, "onFocusChange() called with: "
                         + "v = [" + v + "], hasFocus = [" + hasFocus + "]");
@@ -596,13 +583,11 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             @Override
             public void beforeTextChanged(final CharSequence s, final int start,
                                           final int count, final int after) {
-                // Do nothing, old text is already clean
             }
 
             @Override
             public void onTextChanged(final CharSequence s, final int start,
                                       final int before, final int count) {
-                // Changes are handled in afterTextChanged; CharSequence cannot be changed here.
             }
 
             @Override
@@ -612,13 +597,13 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                     s.removeSpan(span);
                 }
 
-                final String newText = getSearchEditString().trim();
+                final String newText = searchEditText.getText().toString();
                 suggestionPublisher.onNext(newText);
             }
         };
         searchEditText.addTextChangedListener(textWatcher);
         searchEditText.setOnEditorActionListener(
-                (final TextView v, final int actionId, final KeyEvent event) -> {
+                (TextView v, int actionId, KeyEvent event) -> {
                     if (DEBUG) {
                         Log.d(TAG, "onEditorAction() called with: v = [" + v + "], "
                                 + "actionId = [" + actionId + "], event = [" + event + "]");
@@ -628,8 +613,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                     } else if (event != null
                             && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
                             || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
-                        searchEditText.setText(getSearchEditString().trim());
-                        search(getSearchEditString(), new String[0], "");
+                        search(searchEditText.getText().toString(), new String[0], "");
                         return true;
                     }
                     return false;
@@ -704,7 +688,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(
                                     howManyDeleted -> suggestionPublisher
-                                            .onNext(getSearchEditString()),
+                                            .onNext(searchEditText.getText().toString()),
                                     throwable -> showSnackBarError(new ErrorInfo(throwable,
                                             UserAction.DELETE_FROM_HISTORY,
                                             "Deleting item failed")));
@@ -733,9 +717,9 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                 .getRelatedSearches(query, similarQueryLimit, 25)
                 .toObservable()
                 .map(searchHistoryEntries ->
-                        searchHistoryEntries.stream()
-                                .map(entry -> new SuggestionItem(true, entry))
-                                .collect(Collectors.toList()));
+                    searchHistoryEntries.stream()
+                            .map(entry -> new SuggestionItem(true, entry))
+                            .collect(Collectors.toList()));
     }
 
     private Observable<List<SuggestionItem>> getRemoteSuggestionsObservable(final String query) {
@@ -802,12 +786,12 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                             } else if (listNotification.isOnError()
                                     && listNotification.getError() != null
                                     && !ExceptionUtils.isInterruptedCaused(
-                                    listNotification.getError())) {
+                                            listNotification.getError())) {
                                 showSnackBarError(new ErrorInfo(listNotification.getError(),
                                         UserAction.GET_SUGGESTIONS, searchString, serviceId));
                             }
                         }, throwable -> showSnackBarError(new ErrorInfo(
-                                throwable, UserAction.GET_SUGGESTIONS, searchString, serviceId)));
+                            throwable, UserAction.GET_SUGGESTIONS, searchString, serviceId)));
     }
 
     @Override
@@ -815,13 +799,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         // no-op
     }
 
-    /**
-     * Perform a search.
-     * @param theSearchString the trimmed search string
-     * @param theContentFilter the content filter to use. FIXME: unused param
-     * @param theSortFilter FIXME: unused param
-     */
-    private void search(@NonNull final String theSearchString,
+    private void search(final String theSearchString,
                         final String[] theContentFilter,
                         final String theSortFilter) {
         if (DEBUG) {
@@ -831,26 +809,25 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             return;
         }
 
-        // Check if theSearchString is a URL which can be opened by NewPipe directly
-        // and open it if possible.
         try {
             final StreamingService streamingService = NewPipe.getServiceByUrl(theSearchString);
-            showLoading();
-            disposables.add(Observable
-                    .fromCallable(() -> NavigationHelper.getIntentByLink(activity,
-                            streamingService, theSearchString))
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(intent -> {
-                        getFM().popBackStackImmediate();
-                        activity.startActivity(intent);
-                    }, throwable -> showTextError(getString(R.string.unsupported_url))));
-            return;
+            if (streamingService != null) {
+                showLoading();
+                disposables.add(Observable
+                        .fromCallable(() -> NavigationHelper.getIntentByLink(activity,
+                                streamingService, theSearchString))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(intent -> {
+                            getFM().popBackStackImmediate();
+                            activity.startActivity(intent);
+                        }, throwable -> showTextError(getString(R.string.unsupported_url))));
+                return;
+            }
         } catch (final Exception ignored) {
             // Exception occurred, it's not a url
         }
 
-        // prepare search
         lastSearchedString = this.searchString;
         this.searchString = theSearchString;
         infoListAdapter.clearStreamItemList();
@@ -859,17 +836,13 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                 searchBinding.searchMetaInfoSeparator, disposables);
         hideKeyboardSearch();
 
-        // store search query if search history is enabled
         disposables.add(historyRecordManager.onSearched(serviceId, theSearchString)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
-                        ignored -> {
-                        },
+                        ignored -> { },
                         throwable -> showSnackBarError(new ErrorInfo(throwable, UserAction.SEARCHED,
                                 theSearchString, serviceId))
                 ));
-
-        // load search results
         suggestionPublisher.onNext(theSearchString);
         startLoading(false);
     }
@@ -959,14 +932,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         sortFilter = theSortFilter;
     }
 
-    private String getSearchEditString() {
-        return searchEditText.getText().toString();
-    }
-
-    private boolean isSearchEditBlank() {
-        return isBlank(getSearchEditString());
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Suggestion Results
     //////////////////////////////////////////////////////////////////////////*/
@@ -1008,9 +973,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         }
 
         searchSuggestion = result.getSearchSuggestion();
-        if (searchSuggestion != null) {
-            searchSuggestion = searchSuggestion.trim();
-        }
         isCorrectedSearch = result.isCorrectedSearch();
 
         // List<MetaInfo> cannot be bundled without creating some containers
@@ -1112,7 +1074,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         howManyDeleted -> suggestionPublisher
-                                .onNext(getSearchEditString()),
+                                .onNext(searchEditText.getText().toString()),
                         throwable -> showSnackBarError(new ErrorInfo(throwable,
                                 UserAction.DELETE_FROM_HISTORY, "Deleting item failed")));
         disposables.add(onDelete);

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.java

@@ -0,0 +1,177 @@
+package org.schabi.newpipe.fragments.list.videos;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.databinding.RelatedItemsHeaderBinding;
+import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.info_list.ItemViewMode;
+import org.schabi.newpipe.ktx.ViewUtils;
+import org.schabi.newpipe.util.RelatedItemInfo;
+
+import java.io.Serializable;
+import java.util.function.Supplier;
+
+import io.reactivex.rxjava3.core.Single;
+
+public class RelatedItemsFragment extends BaseListInfoFragment<InfoItem, RelatedItemInfo>
+        implements SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final String INFO_KEY = "related_info_key";
+
+    private RelatedItemInfo relatedItemInfo;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private RelatedItemsHeaderBinding headerBinding;
+
+    public static RelatedItemsFragment getInstance(final StreamInfo info) {
+        final RelatedItemsFragment instance = new RelatedItemsFragment();
+        instance.setInitialData(info);
+        return instance;
+    }
+
+    public RelatedItemsFragment() {
+        super(UserAction.REQUESTED_STREAM);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_related_items, container, false);
+    }
+
+    @Override
+    public void onDestroyView() {
+        headerBinding = null;
+        super.onDestroyView();
+    }
+
+    @Override
+    protected Supplier<View> getListHeaderSupplier() {
+        if (relatedItemInfo == null || relatedItemInfo.getRelatedItems() == null) {
+            return null;
+        }
+
+        headerBinding = RelatedItemsHeaderBinding
+                .inflate(activity.getLayoutInflater(), itemsList, false);
+
+        final SharedPreferences pref = PreferenceManager
+                .getDefaultSharedPreferences(requireContext());
+        final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
+        headerBinding.autoplaySwitch.setChecked(autoplay);
+        headerBinding.autoplaySwitch.setOnCheckedChangeListener((compoundButton, b) ->
+                PreferenceManager.getDefaultSharedPreferences(requireContext()).edit()
+                        .putBoolean(getString(R.string.auto_queue_key), b).apply());
+
+        return headerBinding::getRoot;
+    }
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage<InfoItem>> loadMoreItemsLogic() {
+        return Single.fromCallable(ListExtractor.InfoItemsPage::emptyPage);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<RelatedItemInfo> loadResult(final boolean forceLoad) {
+        return Single.fromCallable(() -> relatedItemInfo);
+    }
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        if (headerBinding != null) {
+            headerBinding.getRoot().setVisibility(View.INVISIBLE);
+        }
+    }
+
+    @Override
+    public void handleResult(@NonNull final RelatedItemInfo result) {
+        super.handleResult(result);
+
+        if (headerBinding != null) {
+            headerBinding.getRoot().setVisibility(View.VISIBLE);
+        }
+        ViewUtils.slideUp(requireView(), 120, 96, 0.06f);
+
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(final String title) {
+        // Nothing to do - override parent
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull final Menu menu,
+                                    @NonNull final MenuInflater inflater) {
+        // Nothing to do - override parent
+    }
+
+    private void setInitialData(final StreamInfo info) {
+        super.setInitialData(info.getServiceId(), info.getUrl(), info.getName());
+        if (this.relatedItemInfo == null) {
+            this.relatedItemInfo = RelatedItemInfo.getInfo(info);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull final Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putSerializable(INFO_KEY, relatedItemInfo);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(@NonNull final Bundle savedState) {
+        super.onRestoreInstanceState(savedState);
+        final Serializable serializable = savedState.getSerializable(INFO_KEY);
+        if (serializable instanceof RelatedItemInfo) {
+            this.relatedItemInfo = (RelatedItemInfo) serializable;
+        }
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
+                                          final String key) {
+        if (headerBinding != null && getString(R.string.auto_queue_key).equals(key)) {
+            headerBinding.autoplaySwitch.setChecked(sharedPreferences.getBoolean(key, false));
+        }
+    }
+
+    @Override
+    protected ItemViewMode getItemViewMode() {
+        ItemViewMode mode = super.getItemViewMode();
+        // Only list mode is supported. Either List or card will be used.
+        if (mode != ItemViewMode.LIST && mode != ItemViewMode.CARD) {
+            mode = ItemViewMode.LIST;
+        }
+        return mode;
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.kt

@@ -1,36 +0,0 @@
-package org.schabi.newpipe.fragments.list.videos
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.fragment.compose.content
-import org.schabi.newpipe.extractor.stream.StreamInfo
-import org.schabi.newpipe.ktx.serializable
-import org.schabi.newpipe.ui.components.video.RelatedItems
-import org.schabi.newpipe.ui.theme.AppTheme
-import org.schabi.newpipe.util.KEY_INFO
-
-class RelatedItemsFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = content {
-        AppTheme {
-            Surface(color = MaterialTheme.colorScheme.background) {
-                RelatedItems(requireArguments().serializable<StreamInfo>(KEY_INFO)!!)
-            }
-        }
-    }
-
-    companion object {
-        @JvmStatic
-        fun getInstance(info: StreamInfo) = RelatedItemsFragment().apply {
-            arguments = bundleOf(KEY_INFO to info)
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java

@@ -13,6 +13,8 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
@@ -74,16 +76,22 @@ public class InfoItemBuilder {
     private InfoItemHolder holderFromInfoType(@NonNull final ViewGroup parent,
                                               @NonNull final InfoItem.InfoType infoType,
                                               final boolean useMiniVariant) {
-        return switch (infoType) {
-            case STREAM -> useMiniVariant ? new StreamMiniInfoItemHolder(this, parent)
-                    : new StreamInfoItemHolder(this, parent);
-            case CHANNEL -> useMiniVariant ? new ChannelMiniInfoItemHolder(this, parent)
-                    : new ChannelInfoItemHolder(this, parent);
-            case PLAYLIST -> useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent)
-                    : new PlaylistInfoItemHolder(this, parent);
-            case COMMENT ->
-                    throw new IllegalArgumentException("Comments should be rendered using Compose");
-        };
+        switch (infoType) {
+            case STREAM:
+                return useMiniVariant ? new StreamMiniInfoItemHolder(this, parent)
+                        : new StreamInfoItemHolder(this, parent);
+            case CHANNEL:
+                return useMiniVariant ? new ChannelMiniInfoItemHolder(this, parent)
+                        : new ChannelInfoItemHolder(this, parent);
+            case PLAYLIST:
+                return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent)
+                        : new PlaylistInfoItemHolder(this, parent);
+            case COMMENT:
+                return useMiniVariant ? new CommentsMiniInfoItemHolder(this, parent)
+                        : new CommentsInfoItemHolder(this, parent);
+            default:
+                throw new RuntimeException("InfoType not expected = " + infoType.name());
+        }
     }
 
     public Context getContext() {

app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java

@@ -21,6 +21,8 @@ import org.schabi.newpipe.info_list.holder.ChannelCardInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistCardInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
@@ -77,7 +79,8 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private static final int PLAYLIST_HOLDER_TYPE = 0x301;
     private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
     private static final int CARD_PLAYLIST_HOLDER_TYPE = 0x303;
-    private static final int COMMENT_HOLDER_TYPE = 0x400;
+    private static final int MINI_COMMENT_HOLDER_TYPE = 0x400;
+    private static final int COMMENT_HOLDER_TYPE = 0x401;
 
     private final LayoutInflater layoutInflater;
     private final InfoItemBuilder infoItemBuilder;
@@ -268,7 +271,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     return PLAYLIST_HOLDER_TYPE;
                 }
             case COMMENT:
-                return COMMENT_HOLDER_TYPE;
+                return useMiniVariant ? MINI_COMMENT_HOLDER_TYPE : COMMENT_HOLDER_TYPE;
             default:
                 return -1;
         }
@@ -282,32 +285,48 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             Log.d(TAG, "onCreateViewHolder() called with: "
                     + "parent = [" + parent + "], type = [" + type + "]");
         }
-        return switch (type) {
+        switch (type) {
             // #4475 and #3368
             // Always create a new instance otherwise the same instance
             // is sometimes reused which causes a crash
-            case HEADER_TYPE -> new HFHolder(headerSupplier.get());
-            case FOOTER_TYPE -> new HFHolder(PignateFooterBinding
-                    .inflate(layoutInflater, parent, false)
-                    .getRoot()
-            );
-            case MINI_STREAM_HOLDER_TYPE -> new StreamMiniInfoItemHolder(infoItemBuilder, parent);
-            case STREAM_HOLDER_TYPE -> new StreamInfoItemHolder(infoItemBuilder, parent);
-            case GRID_STREAM_HOLDER_TYPE -> new StreamGridInfoItemHolder(infoItemBuilder, parent);
-            case CARD_STREAM_HOLDER_TYPE -> new StreamCardInfoItemHolder(infoItemBuilder, parent);
-            case MINI_CHANNEL_HOLDER_TYPE -> new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
-            case CHANNEL_HOLDER_TYPE -> new ChannelInfoItemHolder(infoItemBuilder, parent);
-            case CARD_CHANNEL_HOLDER_TYPE -> new ChannelCardInfoItemHolder(infoItemBuilder, parent);
-            case GRID_CHANNEL_HOLDER_TYPE -> new ChannelGridInfoItemHolder(infoItemBuilder, parent);
-            case MINI_PLAYLIST_HOLDER_TYPE ->
-                    new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
-            case PLAYLIST_HOLDER_TYPE -> new PlaylistInfoItemHolder(infoItemBuilder, parent);
-            case GRID_PLAYLIST_HOLDER_TYPE ->
-                    new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
-            case CARD_PLAYLIST_HOLDER_TYPE ->
-                    new PlaylistCardInfoItemHolder(infoItemBuilder, parent);
-            default -> new FallbackViewHolder(new View(parent.getContext()));
-        };
+            case HEADER_TYPE:
+                return new HFHolder(headerSupplier.get());
+            case FOOTER_TYPE:
+                return new HFHolder(PignateFooterBinding
+                        .inflate(layoutInflater, parent, false)
+                        .getRoot()
+                );
+            case MINI_STREAM_HOLDER_TYPE:
+                return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
+            case STREAM_HOLDER_TYPE:
+                return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
+            case CARD_STREAM_HOLDER_TYPE:
+                return new StreamCardInfoItemHolder(infoItemBuilder, parent);
+            case MINI_CHANNEL_HOLDER_TYPE:
+                return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
+            case CHANNEL_HOLDER_TYPE:
+                return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case CARD_CHANNEL_HOLDER_TYPE:
+                return new ChannelCardInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
+            case MINI_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
+            case PLAYLIST_HOLDER_TYPE:
+                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
+            case CARD_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistCardInfoItemHolder(infoItemBuilder, parent);
+            case MINI_COMMENT_HOLDER_TYPE:
+                return new CommentsMiniInfoItemHolder(infoItemBuilder, parent);
+            case COMMENT_HOLDER_TYPE:
+                return new CommentsInfoItemHolder(infoItemBuilder, parent);
+            default:
+                return new FallbackViewHolder(new View(parent.getContext()));
+        }
     }
 
     @Override

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

@@ -1,18 +1,19 @@
 package org.schabi.newpipe.info_list
 
 import android.view.View
-import com.xwray.groupie.viewbinding.BindableItem
-import com.xwray.groupie.viewbinding.GroupieViewHolder
+import android.widget.ImageView
+import android.widget.TextView
+import com.xwray.groupie.GroupieViewHolder
+import com.xwray.groupie.Item
 import org.schabi.newpipe.R
-import org.schabi.newpipe.databinding.ItemStreamSegmentBinding
 import org.schabi.newpipe.extractor.stream.StreamSegment
 import org.schabi.newpipe.util.Localization
-import org.schabi.newpipe.util.image.CoilHelper
+import org.schabi.newpipe.util.PicassoHelper
 
 class StreamSegmentItem(
     private val item: StreamSegment,
     private val onClick: StreamSegmentAdapter.StreamSegmentListener
-) : BindableItem<ItemStreamSegmentBinding>() {
+) : Item<GroupieViewHolder>() {
 
     companion object {
         const val PAYLOAD_SELECT = 1
@@ -20,32 +21,31 @@ class StreamSegmentItem(
 
     var isSelected = false
 
-    override fun bind(viewBinding: ItemStreamSegmentBinding, position: Int) {
-        CoilHelper.loadThumbnail(viewBinding.previewImage, item.previewUrl)
-        viewBinding.textViewTitle.text = item.title
+    override fun bind(viewHolder: GroupieViewHolder, position: Int) {
+        item.previewUrl?.let {
+            PicassoHelper.loadThumbnail(it)
+                .into(viewHolder.root.findViewById<ImageView>(R.id.previewImage))
+        }
+        viewHolder.root.findViewById<TextView>(R.id.textViewTitle).text = item.title
         if (item.channelName == null) {
-            viewBinding.textViewChannel.visibility = View.GONE
+            viewHolder.root.findViewById<TextView>(R.id.textViewChannel).visibility = View.GONE
             // When the channel name is displayed there is less space
             // and thus the segment title needs to be only one line height.
             // But when there is no channel name displayed, the title can be two lines long.
             // The default maxLines value is set to 1 to display all elements in the AS preview,
-            viewBinding.textViewTitle.maxLines = 2
+            viewHolder.root.findViewById<TextView>(R.id.textViewTitle).maxLines = 2
         } else {
-            viewBinding.textViewChannel.text = item.channelName
-            viewBinding.textViewChannel.visibility = View.VISIBLE
+            viewHolder.root.findViewById<TextView>(R.id.textViewChannel).text = item.channelName
+            viewHolder.root.findViewById<TextView>(R.id.textViewChannel).visibility = View.VISIBLE
         }
-        viewBinding.textViewStartSeconds.text =
+        viewHolder.root.findViewById<TextView>(R.id.textViewStartSeconds).text =
             Localization.getDurationString(item.startTimeSeconds.toLong())
-        viewBinding.root.setOnClickListener { onClick.onItemClick(this, item.startTimeSeconds) }
-        viewBinding.root.setOnLongClickListener { onClick.onItemLongClick(this, item.startTimeSeconds); true }
-        viewBinding.root.isSelected = isSelected
+        viewHolder.root.setOnClickListener { onClick.onItemClick(this, item.startTimeSeconds) }
+        viewHolder.root.setOnLongClickListener { onClick.onItemLongClick(this, item.startTimeSeconds); true }
+        viewHolder.root.isSelected = isSelected
     }
 
-    override fun bind(
-        viewHolder: GroupieViewHolder<ItemStreamSegmentBinding>,
-        position: Int,
-        payloads: MutableList<Any>
-    ) {
+    override fun bind(viewHolder: GroupieViewHolder, position: Int, payloads: MutableList<Any>) {
         if (payloads.contains(PAYLOAD_SELECT)) {
             viewHolder.root.isSelected = isSelected
             return
@@ -54,6 +54,4 @@ class StreamSegmentItem(
     }
 
     override fun getLayout() = R.layout.item_stream_segment
-
-    override fun initializeViewBinding(view: View) = ItemStreamSegmentBinding.bind(view)
 }

app/src/main/java/org/schabi/newpipe/info_list/dialog/InfoItemDialog.java

@@ -346,7 +346,7 @@ public final class InfoItemDialog {
 
         public static void reportErrorDuringInitialization(final Throwable throwable,
                                                            final InfoItem item) {
-            ErrorUtil.showSnackbar(App.getInstance().getBaseContext(), new ErrorInfo(
+            ErrorUtil.showSnackbar(App.getApp().getBaseContext(), new ErrorInfo(
                     throwable,
                     UserAction.OPEN_INFO_ITEM_DIALOG,
                     "none",

app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java

@@ -41,11 +41,10 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
  * </p>
  */
 public enum StreamDialogDefaultEntry {
-    SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) -> {
-        final var activity = fragment.requireActivity();
-        fetchUploaderUrlIfSparse(activity, item.getServiceId(), item.getUrl(),
-                item.getUploaderUrl(), url -> openChannelFragment(activity, item, url));
-    }),
+    SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) ->
+            fetchUploaderUrlIfSparse(fragment.requireContext(), item.getServiceId(), item.getUrl(),
+                    item.getUploaderUrl(), url -> openChannelFragment(fragment, item, url))
+    ),
 
     /**
      * Enqueues the stream automatically to the current PlayerType.
@@ -105,7 +104,7 @@ public enum StreamDialogDefaultEntry {
 
     SHARE(R.string.share, (fragment, item) ->
             ShareUtils.shareText(fragment.requireContext(), item.getName(), item.getUrl(),
-                    item.getThumbnails())),
+                    item.getThumbnailUrl())),
 
     /**
      * Opens a {@link DownloadDialog} after fetching some stream info.

app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java

@@ -13,8 +13,8 @@ import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.utils.Utils;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.image.CoilHelper;
 
 public class ChannelMiniInfoItemHolder extends InfoItemHolder {
     private final ImageView itemThumbnailView;
@@ -56,7 +56,7 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
             itemAdditionalDetailView.setText(getDetailLine(item));
         }
 
-        CoilHelper.INSTANCE.loadAvatar(itemThumbnailView, item.getThumbnails());
+        PicassoHelper.loadAvatar(item.getThumbnailUrl()).into(itemThumbnailView);
 
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnChannelSelectedListener() != null) {

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java

@@ -0,0 +1,63 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+
+/*
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItemHolder .java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class CommentsInfoItemHolder extends CommentsMiniInfoItemHolder {
+    public final TextView itemTitleView;
+    private final ImageView itemHeartView;
+    private final ImageView itemPinnedView;
+
+    public CommentsInfoItemHolder(final InfoItemBuilder infoItemBuilder, final ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_comments_item, parent);
+
+        itemTitleView = itemView.findViewById(R.id.itemTitleView);
+        itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
+        itemPinnedView = itemView.findViewById(R.id.detail_pinned_view);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem,
+                               final HistoryRecordManager historyRecordManager) {
+        super.updateFromItem(infoItem, historyRecordManager);
+
+        if (!(infoItem instanceof CommentsInfoItem)) {
+            return;
+        }
+        final CommentsInfoItem item = (CommentsInfoItem) infoItem;
+
+        itemTitleView.setText(item.getUploaderName());
+
+        itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
+
+        itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java

@@ -0,0 +1,279 @@
+package org.schabi.newpipe.info_list.holder;
+
+import static android.text.TextUtils.isEmpty;
+
+import android.graphics.Paint;
+import android.text.Layout;
+import android.text.method.LinkMovementMethod;
+import android.text.style.URLSpan;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.text.HtmlCompat;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.error.ErrorUtil;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.stream.Description;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.DeviceUtils;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.util.text.CommentTextOnTouchListener;
+import org.schabi.newpipe.util.text.TextLinkifier;
+
+import java.util.function.Consumer;
+
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+
+public class CommentsMiniInfoItemHolder extends InfoItemHolder {
+    private static final String TAG = "CommentsMiniIIHolder";
+    private static final String ELLIPSIS = "…";
+
+    private static final int COMMENT_DEFAULT_LINES = 2;
+    private static final int COMMENT_EXPANDED_LINES = 1000;
+
+    private final int commentHorizontalPadding;
+    private final int commentVerticalPadding;
+
+    private final Paint paintAtContentSize;
+    private final float ellipsisWidthPx;
+
+    private final RelativeLayout itemRoot;
+    private final ImageView itemThumbnailView;
+    private final TextView itemContentView;
+    private final TextView itemLikesCountView;
+    private final TextView itemPublishedTime;
+
+    private final CompositeDisposable disposables = new CompositeDisposable();
+    @Nullable private Description commentText;
+    @Nullable private StreamingService streamService;
+    @Nullable private String streamUrl;
+
+    CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder, final int layoutId,
+                               final ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+
+        itemRoot = itemView.findViewById(R.id.itemRoot);
+        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+        itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
+        itemPublishedTime = itemView.findViewById(R.id.itemPublishedTime);
+        itemContentView = itemView.findViewById(R.id.itemCommentContentView);
+
+        commentHorizontalPadding = (int) infoItemBuilder.getContext()
+                .getResources().getDimension(R.dimen.comments_horizontal_padding);
+        commentVerticalPadding = (int) infoItemBuilder.getContext()
+                .getResources().getDimension(R.dimen.comments_vertical_padding);
+
+        paintAtContentSize = new Paint();
+        paintAtContentSize.setTextSize(itemContentView.getTextSize());
+        ellipsisWidthPx = paintAtContentSize.measureText(ELLIPSIS);
+    }
+
+    public CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder,
+                                      final ViewGroup parent) {
+        this(infoItemBuilder, R.layout.list_comments_mini_item, parent);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem,
+                               final HistoryRecordManager historyRecordManager) {
+        if (!(infoItem instanceof CommentsInfoItem)) {
+            return;
+        }
+        final CommentsInfoItem item = (CommentsInfoItem) infoItem;
+
+        PicassoHelper.loadAvatar(item.getUploaderAvatarUrl()).into(itemThumbnailView);
+        if (PicassoHelper.getShouldLoadImages()) {
+            itemThumbnailView.setVisibility(View.VISIBLE);
+            itemRoot.setPadding(commentVerticalPadding, commentVerticalPadding,
+                    commentVerticalPadding, commentVerticalPadding);
+        } else {
+            itemThumbnailView.setVisibility(View.GONE);
+            itemRoot.setPadding(commentHorizontalPadding, commentVerticalPadding,
+                    commentHorizontalPadding, commentVerticalPadding);
+        }
+
+
+        itemThumbnailView.setOnClickListener(view -> openCommentAuthor(item));
+
+        try {
+            streamService = NewPipe.getService(item.getServiceId());
+        } catch (final ExtractionException e) {
+            // should never happen
+            ErrorUtil.showUiErrorSnackbar(itemBuilder.getContext(), "Getting StreamingService", e);
+            Log.w(TAG, "Cannot obtain service from comment service id, defaulting to YouTube", e);
+            streamService = ServiceList.YouTube;
+        }
+        streamUrl = item.getUrl();
+        commentText = item.getCommentText();
+        ellipsize();
+
+        //noinspection ClickableViewAccessibility
+        itemContentView.setOnTouchListener(CommentTextOnTouchListener.INSTANCE);
+
+        if (item.getLikeCount() >= 0) {
+            itemLikesCountView.setText(
+                    Localization.shortCount(
+                            itemBuilder.getContext(),
+                            item.getLikeCount()));
+        } else {
+            itemLikesCountView.setText("-");
+        }
+
+        if (item.getUploadDate() != null) {
+            itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate()
+                    .offsetDateTime()));
+        } else {
+            itemPublishedTime.setText(item.getTextualUploadDate());
+        }
+
+        itemView.setOnClickListener(view -> {
+            toggleEllipsize();
+            if (itemBuilder.getOnCommentsSelectedListener() != null) {
+                itemBuilder.getOnCommentsSelectedListener().selected(item);
+            }
+        });
+
+
+        itemView.setOnLongClickListener(view -> {
+            if (DeviceUtils.isTv(itemBuilder.getContext())) {
+                openCommentAuthor(item);
+            } else {
+                final CharSequence text = itemContentView.getText();
+                if (text != null) {
+                    ShareUtils.copyToClipboard(itemBuilder.getContext(), text.toString());
+                }
+            }
+            return true;
+        });
+    }
+
+    private void openCommentAuthor(final CommentsInfoItem item) {
+        if (isEmpty(item.getUploaderUrl())) {
+            return;
+        }
+        final AppCompatActivity activity = (AppCompatActivity) itemBuilder.getContext();
+        try {
+            NavigationHelper.openChannelFragment(
+                    activity.getSupportFragmentManager(),
+                    item.getServiceId(),
+                    item.getUploaderUrl(),
+                    item.getUploaderName());
+        } catch (final Exception e) {
+            ErrorUtil.showUiErrorSnackbar(activity, "Opening channel fragment", e);
+        }
+    }
+
+    private void allowLinkFocus() {
+        itemContentView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    private void denyLinkFocus() {
+        itemContentView.setMovementMethod(null);
+    }
+
+    private boolean shouldFocusLinks() {
+        if (itemView.isInTouchMode()) {
+            return false;
+        }
+
+        final URLSpan[] urls = itemContentView.getUrls();
+
+        return urls != null && urls.length != 0;
+    }
+
+    private void determineMovementMethod() {
+        if (shouldFocusLinks()) {
+            allowLinkFocus();
+        } else {
+            denyLinkFocus();
+        }
+    }
+
+    private void ellipsize() {
+        itemContentView.setMaxLines(COMMENT_EXPANDED_LINES);
+        linkifyCommentContentView(v -> {
+            boolean hasEllipsis = false;
+
+            final CharSequence charSeqText = itemContentView.getText();
+            if (charSeqText != null && itemContentView.getLineCount() > COMMENT_DEFAULT_LINES) {
+                // Note that converting to String removes spans (i.e. links), but that's something
+                // we actually want since when the text is ellipsized we want all clicks on the
+                // comment to expand the comment, not to open links.
+                final String text = charSeqText.toString();
+
+                final Layout layout = itemContentView.getLayout();
+                final float lineWidth = layout.getLineWidth(COMMENT_DEFAULT_LINES - 1);
+                final float layoutWidth = layout.getWidth();
+                final int lineStart = layout.getLineStart(COMMENT_DEFAULT_LINES - 1);
+                final int lineEnd = layout.getLineEnd(COMMENT_DEFAULT_LINES - 1);
+
+                // remove characters up until there is enough space for the ellipsis
+                // (also summing 2 more pixels, just to be sure to avoid float rounding errors)
+                int end = lineEnd;
+                float removedCharactersWidth = 0.0f;
+                while (lineWidth - removedCharactersWidth + ellipsisWidthPx + 2.0f > layoutWidth
+                        && end >= lineStart) {
+                    end -= 1;
+                    // recalculate each time to account for ligatures or other similar things
+                    removedCharactersWidth = paintAtContentSize.measureText(
+                            text.substring(end, lineEnd));
+                }
+
+                // remove trailing spaces and newlines
+                while (end > 0 && Character.isWhitespace(text.charAt(end - 1))) {
+                    end -= 1;
+                }
+
+                final String newVal = text.substring(0, end) + ELLIPSIS;
+                itemContentView.setText(newVal);
+                hasEllipsis = true;
+            }
+
+            itemContentView.setMaxLines(COMMENT_DEFAULT_LINES);
+            if (hasEllipsis) {
+                denyLinkFocus();
+            } else {
+                determineMovementMethod();
+            }
+        });
+    }
+
+    private void toggleEllipsize() {
+        final CharSequence text = itemContentView.getText();
+        if (!isEmpty(text) && text.charAt(text.length() - 1) == ELLIPSIS.charAt(0)) {
+            expand();
+        } else if (itemContentView.getLineCount() > COMMENT_DEFAULT_LINES) {
+            ellipsize();
+        }
+    }
+
+    private void expand() {
+        itemContentView.setMaxLines(COMMENT_EXPANDED_LINES);
+        linkifyCommentContentView(v -> determineMovementMethod());
+    }
+
+    private void linkifyCommentContentView(@Nullable final Consumer<TextView> onCompletion) {
+        disposables.clear();
+        if (commentText != null) {
+            TextLinkifier.fromDescription(itemContentView, commentText,
+                    HtmlCompat.FROM_HTML_MODE_LEGACY, streamService, streamUrl, disposables,
+                    onCompletion);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java

@@ -9,8 +9,8 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.image.CoilHelper;
 
 public class PlaylistMiniInfoItemHolder extends InfoItemHolder {
     public final ImageView itemThumbnailView;
@@ -46,7 +46,7 @@ public class PlaylistMiniInfoItemHolder extends InfoItemHolder {
                 .localizeStreamCountMini(itemStreamCountView.getContext(), item.getStreamCount()));
         itemUploaderView.setText(item.getUploaderName());
 
-        CoilHelper.INSTANCE.loadPlaylistThumbnail(itemThumbnailView, item.getThumbnails());
+        PicassoHelper.loadPlaylistThumbnail(item.getThumbnailUrl()).into(itemThumbnailView);
 
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnPlaylistSelectedListener() != null) {

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java

@@ -12,6 +12,10 @@ import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.Localization;
 
+import androidx.preference.PreferenceManager;
+
+import static org.schabi.newpipe.MainActivity.DEBUG;
+
 /*
  * Created by Christian Schabesberger on 01.08.16.
  * <p>
@@ -77,9 +81,7 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
             }
         }
 
-        final String uploadDate = Localization.relativeTimeOrTextual(itemBuilder.getContext(),
-                infoItem.getUploadDate(),
-                infoItem.getTextualUploadDate());
+        final String uploadDate = getFormattedRelativeUploadDate(infoItem);
         if (!TextUtils.isEmpty(uploadDate)) {
             if (viewsAndDate.isEmpty()) {
                 return uploadDate;
@@ -90,4 +92,20 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
 
         return viewsAndDate;
     }
+
+    private String getFormattedRelativeUploadDate(final StreamInfoItem infoItem) {
+        if (infoItem.getUploadDate() != null) {
+            String formattedRelativeTime = Localization
+                    .relativeTime(infoItem.getUploadDate().offsetDateTime());
+
+            if (DEBUG && PreferenceManager.getDefaultSharedPreferences(itemBuilder.getContext())
+                    .getBoolean(itemBuilder.getContext()
+                            .getString(R.string.show_original_time_ago_key), false)) {
+                formattedRelativeTime += " (" + infoItem.getTextualUploadDate() + ")";
+            }
+            return formattedRelativeTime;
+        } else {
+            return infoItem.getTextualUploadDate();
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java

@@ -16,8 +16,8 @@ import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.DependentPreferenceHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.StreamTypeUtil;
-import org.schabi.newpipe.util.image.CoilHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.util.concurrent.TimeUnit;
@@ -64,7 +64,8 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
             StreamStateEntity state2 = null;
             if (DependentPreferenceHelper
                     .getPositionsInListsEnabled(itemProgressView.getContext())) {
-                state2 = historyRecordManager.loadStreamState(infoItem).blockingGet();
+                state2 = historyRecordManager.loadStreamState(infoItem)
+                        .blockingGet()[0];
             }
             if (state2 != null) {
                 itemProgressView.setVisibility(View.VISIBLE);
@@ -86,7 +87,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
         }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
-        CoilHelper.INSTANCE.loadThumbnail(itemThumbnailView, item.getThumbnails());
+        PicassoHelper.loadThumbnail(item.getThumbnailUrl()).into(itemThumbnailView);
 
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnStreamSelectedListener() != null) {
@@ -119,7 +120,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
         if (DependentPreferenceHelper.getPositionsInListsEnabled(itemProgressView.getContext())) {
             state = historyRecordManager
                     .loadStreamState(infoItem)
-                    .blockingGet();
+                    .blockingGet()[0];
         }
         if (state != null && item.getDuration() > 0
                 && !StreamTypeUtil.isLiveStream(item.getStreamType())) {

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

@@ -1,13 +0,0 @@
-package org.schabi.newpipe.ktx
-
-import android.graphics.Bitmap
-import android.graphics.Rect
-import androidx.core.graphics.BitmapCompat
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun Bitmap.scale(
-    width: Int,
-    height: Int,
-    srcRect: Rect? = null,
-    scaleInLinearSpace: Boolean = true,
-) = BitmapCompat.createScaledBitmap(this, width, height, srcRect, scaleInLinearSpace)

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

@@ -1,9 +0,0 @@
-package org.schabi.newpipe.ktx
-
-import android.os.Bundle
-import androidx.core.os.BundleCompat
-import java.io.Serializable
-
-inline fun <reified T : Serializable> Bundle.serializable(key: String?): T? {
-    return BundleCompat.getSerializable(this, key, T::class.java)
-}

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

@@ -1,13 +0,0 @@
-package org.schabi.newpipe.ktx
-
-import android.content.Context
-import android.content.ContextWrapper
-import androidx.fragment.app.FragmentActivity
-
-tailrec fun Context.findFragmentActivity(): FragmentActivity {
-    return when (this) {
-        is FragmentActivity -> this
-        is ContextWrapper -> baseContext.findFragmentActivity()
-        else -> throw IllegalStateException("Unable to find FragmentActivity")
-    }
-}

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -14,7 +14,6 @@ import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.info_list.ItemViewMode;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.local.holder.LocalBookmarkPlaylistItemHolder;
 import org.schabi.newpipe.local.holder.LocalItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistCardItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
@@ -25,7 +24,6 @@ import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamCardItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
-import org.schabi.newpipe.local.holder.RemoteBookmarkPlaylistItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistCardItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
@@ -75,12 +73,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private static final int LOCAL_PLAYLIST_HOLDER_TYPE = 0x2000;
     private static final int LOCAL_PLAYLIST_GRID_HOLDER_TYPE = 0x2001;
     private static final int LOCAL_PLAYLIST_CARD_HOLDER_TYPE = 0x2002;
-    private static final int LOCAL_BOOKMARK_PLAYLIST_HOLDER_TYPE = 0x2003;
 
     private static final int REMOTE_PLAYLIST_HOLDER_TYPE = 0x3000;
     private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x3001;
     private static final int REMOTE_PLAYLIST_CARD_HOLDER_TYPE = 0x3002;
-    private static final int REMOTE_BOOKMARK_PLAYLIST_HOLDER_TYPE = 0x3003;
 
     private final LocalItemBuilder localItemBuilder;
     private final ArrayList<LocalItem> localItems;
@@ -91,7 +87,6 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private View header = null;
     private View footer = null;
     private ItemViewMode itemViewMode = ItemViewMode.LIST;
-    private boolean useItemHandle = false;
 
     public LocalItemListAdapter(final Context context) {
         recordManager = new HistoryRecordManager(context);
@@ -185,10 +180,6 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         this.itemViewMode = itemViewMode;
     }
 
-    public void setUseItemHandle(final boolean useItemHandle) {
-        this.useItemHandle = useItemHandle;
-    }
-
     public void setHeader(final View header) {
         final boolean changed = header != this.header;
         this.header = header;
@@ -266,9 +257,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         final LocalItem item = localItems.get(position);
         switch (item.getLocalItemType()) {
             case PLAYLIST_LOCAL_ITEM:
-                if (useItemHandle) {
-                    return LOCAL_BOOKMARK_PLAYLIST_HOLDER_TYPE;
-                } else if (itemViewMode == ItemViewMode.CARD) {
+                if (itemViewMode == ItemViewMode.CARD) {
                     return LOCAL_PLAYLIST_CARD_HOLDER_TYPE;
                 } else if (itemViewMode == ItemViewMode.GRID) {
                     return LOCAL_PLAYLIST_GRID_HOLDER_TYPE;
@@ -276,9 +265,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                     return LOCAL_PLAYLIST_HOLDER_TYPE;
                 }
             case PLAYLIST_REMOTE_ITEM:
-                if (useItemHandle) {
-                    return REMOTE_BOOKMARK_PLAYLIST_HOLDER_TYPE;
-                } else if (itemViewMode == ItemViewMode.CARD) {
+                if (itemViewMode == ItemViewMode.CARD) {
                     return REMOTE_PLAYLIST_CARD_HOLDER_TYPE;
                 } else if (itemViewMode == ItemViewMode.GRID) {
                     return REMOTE_PLAYLIST_GRID_HOLDER_TYPE;
@@ -327,16 +314,12 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                 return new LocalPlaylistGridItemHolder(localItemBuilder, parent);
             case LOCAL_PLAYLIST_CARD_HOLDER_TYPE:
                 return new LocalPlaylistCardItemHolder(localItemBuilder, parent);
-            case LOCAL_BOOKMARK_PLAYLIST_HOLDER_TYPE:
-                return new LocalBookmarkPlaylistItemHolder(localItemBuilder, parent);
             case REMOTE_PLAYLIST_HOLDER_TYPE:
                 return new RemotePlaylistItemHolder(localItemBuilder, parent);
             case REMOTE_PLAYLIST_GRID_HOLDER_TYPE:
                 return new RemotePlaylistGridItemHolder(localItemBuilder, parent);
             case REMOTE_PLAYLIST_CARD_HOLDER_TYPE:
                 return new RemotePlaylistCardItemHolder(localItemBuilder, parent);
-            case REMOTE_BOOKMARK_PLAYLIST_HOLDER_TYPE:
-                return new RemoteBookmarkPlaylistItemHolder(localItemBuilder, parent);
             case STREAM_PLAYLIST_HOLDER_TYPE:
                 return new LocalPlaylistStreamItemHolder(localItemBuilder, parent);
             case STREAM_PLAYLIST_GRID_HOLDER_TYPE: