PlayerUIList: make UI list private

The `R.id` link from the comment cannot be resolved, so let’s not link
it for now.

We are using some exoplayer2 resources, let’s silence the warning.

.editorconfig

@@ -1,18 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-
-root = true
-
-[*.{kt,kts}]
-ktlint_code_style = android_studio
-# https://pinterest.github.io/ktlint/latest/rules/standard/#function-naming
-ktlint_function_naming_ignore_when_annotated_with = Composable
-
-ktlint_standard_class-signature = disabled
-ktlint_standard_function-expression-body = disabled
-ktlint_standard_max-line-length = disabled
-ktlint_standard_mixed-condition-operators = disabled
-ktlint_standard_package-name = disabled
-ktlint_standard_property-naming = disabled

.github/CONTRIBUTING.md

@@ -3,19 +3,6 @@
 NewPipe contribution guidelines
 ===============================
 
-## AI policy
-
-* Using generative AI to develop new features or making larger code changes is generally prohibited. Please refrain from contributions which are heavily depending on AI generated source code because they are usually lacking a fundamental understanding of the overall project structure and thus come with poor quality. However, you are allowed to use gen. AI if you
-  * are aware of the project structure,
-  * ensure that the generated code follows the project structure,
-  * fully understand the generated code, and
-  * review the generated code completely.
-* Using AI to find the root cause of bugs and generating small fixes might be acceptable. However, gen. AI often does not fix the underlying problem but is trying to fix the symptoms. If you are using AI to fix bugs, ensure that the root cause is tackled.
-* The use of AI to generate documentation is allowed. We ask you to thoroughly check the quality of generated documentation – wrong, misleading or uninformative documentation is useless and wastes the reader's time. Ensure that reasoning is documented.
-* Using generative AI to write or fill in PR or issue templates is prohibited. Those texts are often lengthy and miss critical information.
-* PRs and issues that do not follow this AI policy can be closed without further explanation.
-
-
 ## Crash reporting
 
 Report crashes through the **automated crash report system** of NewPipe.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -26,8 +26,6 @@ body:
           required: true
         - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
           required: true
-        - label: "I have read and understood the [AI policy](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md#ai-policy). The content of this bug report is not generated by AI."
-          required: true
 
   - type: input
     id: app-version

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -25,8 +25,6 @@ body:
           required: true
         - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
           required: true
-        - label: "I have read and understood the [AI policy](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md#ai-policy). The content of this request is not generated by AI."
-          required: true
 
 
   - type: textarea

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 #### What is it?
 - [ ] Bugfix (user facing)
-- [ ] Feature (user facing) ⚠️ **Your PR must target the [`refactor`](https://github.com/TeamNewPipe/NewPipe/tree/refactor) branch**
+- [ ] Feature (user facing)
 - [ ] Codebase improvement (dev facing)
 - [ ] Meta improvement to the project (dev facing)
 
@@ -32,5 +32,3 @@ The APK can be found by going to the "Checks" tab below the title. On the left p
 
 #### Due diligence
 - [ ] I read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md).
-- [ ] The proposed changes follow the [AI policy](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md#ai-policy).
-- [ ] I tested the changes using an emulator or a physical device.

.github/workflows/backport-pr.yml

@@ -1,48 +0,0 @@
-name: Backport merged pull request
-on:
-  issue_comment:
-    types: [created]
-permissions:
-  contents: write # for comment creation on original PR
-  pull-requests: write
-jobs:
-  backport:
-    name: Backport pull request
-    runs-on: ubuntu-latest
-
-    # Only run when the comment starts with the `/backport` command on a PR and
-    # the commenter has write access to the repository. We do not want to allow
-    # everybody to trigger backports and create branches in our repository.
-    if: >
-        github.event.issue.pull_request &&
-        startsWith(github.event.comment.body, '/backport ') &&
-        (
-        github.event.comment.author_association == 'OWNER' ||
-        github.event.comment.author_association == 'COLLABORATOR' ||
-        github.event.comment.author_association == 'MEMBER'
-        )
-    steps:
-      - uses: actions/checkout@v4
-      - name: Get backport metadata
-        # the target branch is the first argument after `/backport`
-        env:
-          COMMENT_BODY: ${{ github.event.comment.body }}
-        run: |
-          set -euo pipefail
-          body="$COMMENT_BODY"
-          
-          line=${body%%$'\n'*} # Get the first line
-          if [[ $line =~ ^/backport[[:space:]]+([^[:space:]]+) ]]; then
-            echo "BACKPORT_TARGET=${BASH_REMATCH[1]}" >> "$GITHUB_ENV"
-          else
-            echo "Usage: /backport <target-branch>" >&2
-            exit 1
-          fi
-
-      - name: Create backport pull request
-        uses: korthout/backport-action@v4
-        with:
-          add_labels: 'backport'
-          copy_labels_pattern: '.*'
-          label_pattern: ''
-          target_branches: ${{ env.BACKPORT_TARGET }}

.github/workflows/build-release-apk.yml

@@ -7,11 +7,11 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           ref: 'master'
 
-      - uses: actions/setup-java@v5
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -32,7 +32,7 @@ jobs:
           mv app/build/outputs/apk/release/*.apk "app/build/outputs/apk/release/NewPipe_v$VERSION_NAME.apk"
 
       - name: "Upload APK"
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: app
           path: app/build/outputs/apk/release/*.apk

.github/workflows/ci.yml

@@ -37,8 +37,8 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
-      - uses: gradle/actions/wrapper-validation@v4
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2
 
       - name: create and checkout branch
         # push events already checked out the branch
@@ -48,7 +48,7 @@ jobs:
         run: git checkout -B "$BRANCH"
 
       - name: set up JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: "temurin"
@@ -58,7 +58,7 @@ jobs:
         run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
 
       - name: Upload APK
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: app
           path: app/build/outputs/apk/debug/*.apk
@@ -69,18 +69,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - api-level: 23
+          - api-level: 21
             target: default
             arch: x86
-          - api-level: 35
-            target: default
+          - api-level: 33
+            target: google_apis # emulator API 33 only exists with Google APIs
             arch: x86_64
 
     permissions:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Enable KVM
         run: |
@@ -89,7 +89,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: set up JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: "temurin"
@@ -104,33 +104,32 @@ 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@v6
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: android-test-report-api${{ matrix.api-level }}
           path: app/build/reports/androidTests/connected/**
 
   sonar:
-    if: ${{ false }} # the key has expired and needs to be regenerated by the sonar admins
     runs-on: ubuntu-latest
 
     permissions:
       contents: read
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: "temurin"
           cache: 'gradle'
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar

.github/workflows/image-minimizer.yml

@@ -17,9 +17,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
         with:
           node-version: 16
 
@@ -27,7 +27,7 @@ jobs:
         run: npm i probe-image-size@7.2.3 --ignore-scripts
 
       - name: Minimize simple images
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
         timeout-minutes: 3
         with:
           script: |

.gitignore

@@ -7,7 +7,6 @@ captures/
 *.iml
 *~
 .weblate
-.kotlin
 *.class
 app/debug/
 app/release/
@@ -20,6 +19,3 @@ app/release/
 bin/
 .vscode/
 *.code-workspace
-
-# logs
-*.log

README.md

@@ -1,26 +1,20 @@
-<h3 align="center">We are <i>rewriting</i> large chunks of the codebase, to bring about <a href="https://newpipe.net/blog/pinned/announcement/newpipe-0.27.6-rewrite-team-states/#the-refactor">a modern and stable NewPipe</a>! You can download nightly builds <a href="https://github.com/TeamNewPipe/NewPipe-refactor-nightly/releases">here</a>.</h3>
-<h4 align="center">Please work on the <code>refactor</code> branch if you want to contribute <i>new features</i>. The current codebase is in maintenance mode and will only receive <i>bugfixes</i>.</h4>
+<h3 align="center">We are planning to <i>rewrite</i> large chunks of the codebase, to bring about <a href="https://github.com/TeamNewPipe/NewPipe/discussions/10118">a new, modern and stable NewPipe</a>!</h3>
+<h4 align="center">Please do <b>not</b> open pull requests for <i>new features</i> now, only bugfix PRs will be accepted.</h4>
 
 <p align="center"><a href="https://newpipe.net"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
 <h4 align="center">A libre lightweight streaming front-end for Android.</h4>
 
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" width=206/></a></p>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-en.svg" alt="Get it on F-Droid" height=80/></a></p>
 
 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub NewPipe releases"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
-<a href="https://github.com/TeamNewPipe/NewPipe-nightly/releases" alt="GitHub NewPipe nightly releases"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe-nightly.svg?labelColor=purple&label=dev%20nightly"></a>
-<a href="https://github.com/TeamNewPipe/NewPipe-refactor-nightly/releases" alt="GitHub NewPipe refactor nightly releases"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe-refactor-nightly.svg?labelColor=purple&label=refactor%20nightly"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
 <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
-<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/actions/workflows/ci.yml/badge.svg?branch=dev&event=push"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
 <a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
-</p>
-
-<p align="center">
 <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>
 </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>

app/build.gradle

@@ -0,0 +1,380 @@
+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
+}
+
+android {
+    compileSdk 34
+    namespace 'org.schabi.newpipe'
+
+    defaultConfig {
+        applicationId "org.schabi.newpipe"
+        resValue "string", "app_name", "NewPipe"
+        minSdk 21
+        targetSdk 33
+        if (System.properties.containsKey('versionCodeOverride')) {
+            versionCode System.getProperty('versionCodeOverride') as Integer
+        } else {
+            versionCode 1004
+        }
+        versionName "0.27.7"
+        if (System.properties.containsKey('versionNameSuffix')) {
+            versionNameSuffix System.getProperty('versionNameSuffix')
+        }
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
+    }
+
+    buildTypes {
+        debug {
+            debuggable true
+
+            // suffix the app id and the app name with git branch name
+            def workingBranch = getGitWorkingBranch()
+            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"
+                resValue "string", "app_name", "NewPipe Debug"
+            } else {
+                applicationIdSuffix ".debug." + normalizedWorkingBranch
+                resValue "string", "app_name", "NewPipe " + workingBranch
+                archivesBaseName = 'NewPipe_' + normalizedWorkingBranch
+            }
+        }
+
+        release {
+            if (System.properties.containsKey('packageSuffix')) {
+                applicationIdSuffix System.getProperty('packageSuffix')
+                resValue "string", "app_name", "NewPipe " + System.getProperty('packageSuffix')
+                archivesBaseName = 'NewPipe_' + System.getProperty('packageSuffix')
+            }
+            minifyEnabled true
+            shrinkResources false // disabled to fix F-Droid's reproducible build
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            archivesBaseName = 'app'
+        }
+    }
+
+    lint {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+        // suppress false warning ("Resource IDs will be non-final in Android Gradle Plugin version
+        // 5.0, avoid using them in switch case statements"), which affects only library projects
+        disable 'NonConstantResourceId'
+    }
+
+    compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        encoding 'utf-8'
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
+    }
+
+    sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+    }
+
+    androidResources {
+        generateLocaleConfig = true
+    }
+
+    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']
+        }
+    }
+}
+
+configurations {
+    checkstyle
+    ktlint
+}
+
+checkstyle {
+    getConfigDirectory().set(rootProject.file("checkstyle"))
+    ignoreFailures false
+    showViolations true
+    toolVersion = libs.versions.checkstyle.get()
+}
+
+tasks.register('runCheckstyle', Checkstyle) {
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
+    exclude '**/R.java'
+    exclude '**/BuildConfig.java'
+    exclude 'main/java/us/shandian/giga/**'
+
+    classpath = configurations.checkstyle
+
+    showViolations true
+
+    reports {
+        xml.getRequired().set(true)
+        html.getRequired().set(true)
+    }
+}
+
+def outputDir = "${project.buildDir}/reports/ktlint/"
+def inputFiles = project.fileTree(dir: "src", include: "**/*.kt")
+
+tasks.register('runKtlint', JavaExec) {
+    inputs.files(inputFiles)
+    outputs.dir(outputDir)
+    getMainClass().set("com.pinterest.ktlint.Main")
+    classpath = configurations.ktlint
+    args "src/**/*.kt"
+    jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
+}
+
+tasks.register('formatKtlint', JavaExec) {
+    inputs.files(inputFiles)
+    outputs.dir(outputDir)
+    getMainClass().set("com.pinterest.ktlint.Main")
+    classpath = configurations.ktlint
+    args "-F", "src/**/*.kt"
+    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, runKtlint, checkDependenciesOrder
+}
+
+sonar {
+    properties {
+        property "sonar.projectKey", "TeamNewPipe_NewPipe"
+        property "sonar.organization", "teamnewpipe"
+        property "sonar.host.url", "https://sonarcloud.io"
+    }
+}
+
+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
+
+/** NewPipe libraries **/
+    implementation libs.teamnewpipe.nanojson
+    implementation libs.teamnewpipe.newpipe.extractor
+    implementation libs.teamnewpipe.nononsense.filepicker
+
+/** Checkstyle **/
+    checkstyle libs.tools.checkstyle
+    ktlint libs.tools.ktlint
+
+/** Kotlin **/
+    implementation libs.kotlin.stdlib
+
+/** 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.webkit
+
+/** Third-party libraries **/
+    // Instance state boilerplate elimination
+    implementation libs.livefront.bridge
+    implementation libs.android.state
+    kapt libs.android.state.processor
+
+    // HTML parser
+    implementation libs.jsoup
+
+    // HTTP client
+    implementation libs.okhttp
+
+    // 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
+
+    // Metadata generator for service descriptors
+    compileOnly libs.auto.service
+    kapt libs.auto.service.kapt
+
+    // Manager for complex RecyclerView layouts
+    implementation libs.lisawray.groupie
+    implementation libs.lisawray.groupie.viewbinding
+
+    // Image loading
+    implementation libs.coil.compose
+    implementation libs.coil.network.okhttp
+
+    // Markdown library for Android
+    implementation libs.markwon.core
+    implementation libs.markwon.linkify
+
+    // Crash reporting
+    implementation libs.acra.core
+
+    // Properly restarting
+    implementation libs.process.phoenix
+
+    // Reactive extensions for Java VM
+    implementation libs.rxjava3.rxjava
+    implementation libs.rxjava3.rxandroid
+    // RxJava binding APIs for Android UI widgets
+    implementation libs.rxbinding4.rxbinding
+
+    // 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
+
+/** Debugging **/
+    // Memory leak detection
+    debugImplementation libs.leakcanary.object.watcher
+    debugImplementation libs.leakcanary.plumber.android
+    debugImplementation libs.leakcanary.android.core
+    // Debug bridge for Android
+    debugImplementation libs.stetho
+    debugImplementation libs.stetho.okhttp3
+
+    // Jetpack Compose
+    debugImplementation libs.androidx.compose.ui.tooling
+
+/** Testing **/
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
+
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.runner
+    androidTestImplementation libs.androidx.room.testing
+    androidTestImplementation libs.assertj.core
+}
+
+static String getGitWorkingBranch() {
+    try {
+        def gitProcess = "git rev-parse --abbrev-ref HEAD".execute()
+        gitProcess.waitFor()
+        if (gitProcess.exitValue() == 0) {
+            return gitProcess.text.trim()
+        } else {
+            // not a git repository
+            return ""
+        }
+    } catch (IOException ignored) {
+        // git was not found
+        return ""
+    }
+}
+
+// fix reproducible builds
+project.afterEvaluate {
+    tasks.compileReleaseArtProfile.doLast {
+        outputs.files.each { file ->
+            if (file.toString().endsWith(".profm")) {
+                println("Sorting ${file} ...")
+                def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
+                def profile = ArtProfileKt.ArtProfile(file)
+                def keys = new ArrayList(profile.profileData.keySet())
+                def sortedData = new LinkedHashMap()
+                Collections.sort keys, new DexFile.Companion()
+                keys.each { key -> sortedData[key] = profile.profileData[key] }
+                new FileOutputStream(file).with {
+                    write(version.magicBytes$profgen)
+                    write(version.versionBytes$profgen)
+                    version.write$profgen(it, sortedData, "")
+                }
+            }
+        }
+    }
+}

app/build.gradle.kts

@@ -1,366 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode
-
-plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
-    alias(libs.plugins.jetbrains.kotlin.compose)
-    alias(libs.plugins.jetbrains.kotlin.kapt)
-    alias(libs.plugins.jetbrains.kotlin.parcelize)
-    alias(libs.plugins.jetbrains.kotlinx.serialization)
-    alias(libs.plugins.google.ksp)
-    alias(libs.plugins.sonarqube)
-    alias(libs.plugins.hilt)
-    alias(libs.plugins.about.libraries)
-    checkstyle
-}
-
-val gitWorkingBranch = providers.exec {
-    commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
-}.standardOutput.asText.map { it.trim() }
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
-kotlin {
-    compilerOptions {
-        // TODO: Drop annotation default target when it is stable
-        freeCompilerArgs.addAll(
-            "-Xannotation-default-target=param-property"
-        )
-    }
-}
-
-android {
-    compileSdk = 36
-    namespace = "org.schabi.newpipe"
-
-    defaultConfig {
-        applicationId = "org.schabi.newpipe"
-        resValue("string", "app_name", "NewPipe")
-        minSdk = 23
-        targetSdk = 35
-
-        versionCode = System.getProperty("versionCodeOverride")?.toInt() ?: 1007
-
-        versionName = "0.28.2"
-        System.getProperty("versionNameSuffix")?.let { versionNameSuffix = it }
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        debug {
-            isDebuggable = true
-
-            // suffix the app id and the app name with git branch name
-            val defaultBranches = listOf("master", "dev")
-            val workingBranch = gitWorkingBranch.getOrElse("")
-            val normalizedWorkingBranch = workingBranch
-                .replaceFirst("^[^A-Za-z]+".toRegex(), "")
-                .replace("[^0-9A-Za-z]+".toRegex(), "")
-
-            if (normalizedWorkingBranch.isEmpty() || workingBranch in defaultBranches) {
-                // default values when branch name could not be determined or is master or dev
-                applicationIdSuffix = ".debug"
-                resValue("string", "app_name", "NewPipe Debug")
-            } else {
-                applicationIdSuffix = ".debug.$normalizedWorkingBranch"
-                resValue("string", "app_name", "NewPipe $workingBranch")
-            }
-        }
-
-        release {
-            System.getProperty("packageSuffix")?.let { suffix ->
-                applicationIdSuffix = suffix
-                resValue("string", "app_name", "NewPipe $suffix")
-            }
-            isMinifyEnabled = true
-            isShrinkResources = false // disabled to fix F-Droid"s reproducible build
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-        }
-    }
-
-    lint {
-        checkReleaseBuilds = false
-        // Or, if you prefer, you can continue to check for errors in release builds,
-        // but continue the build even when errors are found:
-        abortOnError = false
-        // suppress false warning ("Resource IDs will be non-final in Android Gradle Plugin version
-        // 5.0, avoid using them in switch case statements"), which affects only library projects
-        disable += "NonConstantResourceId"
-    }
-
-    compileOptions {
-        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled = true
-        encoding = "utf-8"
-    }
-
-    sourceSets {
-        getByName("androidTest") {
-            assets.srcDir("$projectDir/schemas")
-        }
-    }
-
-    androidResources {
-        generateLocaleConfig = true
-    }
-
-    buildFeatures {
-        viewBinding = true
-        compose = true
-        buildConfig = true
-    }
-
-    packaging {
-        resources {
-            // remove two files which belong to jsoup
-            // no idea how they ended up in the META-INF dir...
-            excludes += setOf(
-                "META-INF/README.md",
-                "META-INF/CHANGES",
-                "META-INF/COPYRIGHT" // "COPYRIGHT" belongs to RxJava...
-            )
-        }
-    }
-}
-
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
-}
-
-
-// Custom dependency configuration for ktlint
-val ktlint by configurations.creating
-
-// https://checkstyle.org/#JRE_and_JDK
-tasks.withType<Checkstyle>().configureEach {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
-}
-
-checkstyle {
-    configDirectory = rootProject.file("checkstyle")
-    isIgnoreFailures = false
-    isShowViolations = true
-    toolVersion = libs.versions.checkstyle.get()
-}
-
-tasks.register<Checkstyle>("runCheckstyle") {
-    source("src")
-    include("**/*.java")
-    exclude("**/gen/**")
-    exclude("**/R.java")
-    exclude("**/BuildConfig.java")
-    exclude("main/java/us/shandian/giga/**")
-
-    classpath = configurations.getByName("checkstyle")
-
-    isShowViolations = true
-
-    reports {
-        xml.required = true
-        html.required = true
-    }
-}
-
-val outputDir = project.layout.buildDirectory.dir("reports/ktlint/")
-val inputFiles = fileTree("src") { include("**/*.kt") }
-
-tasks.register<JavaExec>("runKtlint") {
-    inputs.files(inputFiles)
-    outputs.dir(outputDir)
-    mainClass.set("com.pinterest.ktlint.Main")
-    classpath = configurations.getByName("ktlint")
-    args = listOf("--editorconfig=../.editorconfig", "src/**/*.kt")
-    jvmArgs = listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED")
-}
-
-tasks.register<JavaExec>("formatKtlint") {
-    inputs.files(inputFiles)
-    outputs.dir(outputDir)
-    mainClass.set("com.pinterest.ktlint.Main")
-    classpath = configurations.getByName("ktlint")
-    args = listOf("--editorconfig=../.editorconfig", "-F", "src/**/*.kt")
-    jvmArgs = listOf("--add-opens", "java.base/java.lang=ALL-UNNAMED")
-}
-
-tasks.register<CheckDependenciesOrder>("checkDependenciesOrder") {
-    tomlFile = layout.projectDirectory.file("../gradle/libs.versions.toml")
-}
-
-afterEvaluate {
-    tasks.named("preDebugBuild").configure {
-        if (!System.getProperties().containsKey("skipFormatKtlint")) {
-            dependsOn("formatKtlint")
-        }
-        dependsOn("runCheckstyle", "runKtlint", "checkDependenciesOrder")
-    }
-}
-
-sonar {
-    properties {
-        property("sonar.projectKey", "TeamNewPipe_NewPipe")
-        property("sonar.organization", "teamnewpipe")
-        property("sonar.host.url", "https://sonarcloud.io")
-    }
-}
-
-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.android.desugar)
-
-    /** NewPipe libraries **/
-    implementation(libs.newpipe.nanojson)
-    implementation(libs.newpipe.extractor)
-    implementation(libs.newpipe.filepicker)
-
-    /** Checkstyle **/
-    checkstyle(libs.puppycrawl.checkstyle)
-    ktlint(libs.pinterest.ktlint)
-
-    /** Kotlin **/
-    implementation(libs.kotlin.stdlib)
-
-    /** 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.ktx)
-    implementation(libs.androidx.media)
-    implementation(libs.androidx.preference)
-    implementation(libs.androidx.recyclerview)
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.rxjava3)
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.swiperefreshlayout)
-    implementation(libs.androidx.work.runtime.ktx)
-    implementation(libs.androidx.work.rxjava3)
-    implementation(libs.google.android.material)
-    implementation(libs.androidx.webkit)
-
-    /** Compose & other modern patterns **/
-    // 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.about.libraries.compose.m3)
-
-    // Hilt
-    implementation(libs.hilt.android)
-    ksp(libs.hilt.compiler)
-
-    // Scroll
-    implementation(libs.lazy.column.scrollbar)
-
-    // Kotlinx Serialization
-    implementation(libs.kotlinx.serialization.json)
-
-    /** Third-party libraries **/
-    // Instance state boilerplate elimination
-    implementation(libs.livefront.bridge)
-    implementation(libs.evernote.statesaver.core)
-    kapt(libs.evernote.statesaver.compiler)
-
-    // HTML parser
-    implementation(libs.jsoup)
-
-    // HTTP client
-    implementation(libs.squareup.okhttp)
-
-    // Media player
-    implementation(libs.google.exoplayer.core)
-    implementation(libs.google.exoplayer.dash)
-    implementation(libs.google.exoplayer.database)
-    implementation(libs.google.exoplayer.datasource)
-    implementation(libs.google.exoplayer.hls)
-    implementation(libs.google.exoplayer.mediasession)
-    implementation(libs.google.exoplayer.smoothstreaming)
-    implementation(libs.google.exoplayer.ui)
-
-    // Manager for complex RecyclerView layouts
-    implementation(libs.lisawray.groupie.core)
-    implementation(libs.lisawray.groupie.viewbinding)
-
-    // Image loading
-    implementation(libs.coil.compose)
-    implementation(libs.coil.network.okhttp)
-
-    // Markdown library for Android
-    implementation(libs.noties.markwon.core)
-    implementation(libs.noties.markwon.linkify)
-
-    // Crash reporting
-    implementation(libs.acra.core)
-    compileOnly(libs.google.autoservice.annotations)
-    ksp(libs.zacsweers.autoservice.compiler)
-
-    // Properly restarting
-    implementation(libs.jakewharton.phoenix)
-
-    // Reactive extensions for Java VM
-    implementation(libs.reactivex.rxjava)
-    implementation(libs.reactivex.rxandroid)
-    // RxJava binding APIs for Android UI widgets
-    implementation(libs.jakewharton.rxbinding)
-
-    // Date and time formatting
-    implementation(libs.ocpsoft.prettytime)
-
-    /** Debugging **/
-    // Memory leak detection
-    debugImplementation(libs.squareup.leakcanary.watcher)
-    debugImplementation(libs.squareup.leakcanary.plumber)
-    debugImplementation(libs.squareup.leakcanary.core)
-    // Debug bridge for Android
-    debugImplementation(libs.facebook.stetho.core)
-    debugImplementation(libs.facebook.stetho.okhttp3)
-
-    // Jetpack Compose
-    debugImplementation(libs.androidx.compose.ui.tooling)
-
-    /** Testing **/
-    testImplementation(libs.junit)
-    testImplementation(libs.mockito.core)
-
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.runner)
-    androidTestImplementation(libs.androidx.room.testing)
-    androidTestImplementation(libs.assertj.core)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
-}

app/proguard-rules.pro

@@ -16,11 +16,6 @@
 -dontwarn javax.script.**
 -keep class jdk.dynalink.** { *; }
 -dontwarn jdk.dynalink.**
-# Rules for jsoup
-# Ignore intended-to-be-optional re2j classes - only needed if using re2j for jsoup regex
-# jsoup safely falls back to JDK regex if re2j not on classpath, but has concrete re2j refs
-# See https://github.com/jhy/jsoup/issues/2459 - may be resolved in future, then this may be removed
--dontwarn com.google.re2j.**
 
 ## Rules for ExoPlayer
 -keep class com.google.android.exoplayer2.** { *; }
@@ -39,18 +34,3 @@
 
 ## For some reason NotificationModeConfigFragment wasn't kept (only referenced in a preference xml)
 -keep class org.schabi.newpipe.settings.notifications.** { *; }
-
-## Keep Kotlinx Serialization classes
--keepclassmembers class kotlinx.serialization.json.** {
-    *** Companion;
-}
--keepclasseswithmembers class kotlinx.serialization.json.** {
-    kotlinx.serialization.KSerializer serializer(...);
-}
--keep,includedescriptorclasses class org.schabi.newpipe.**$$serializer { *; }
--keepclassmembers class org.schabi.newpipe.** {
-    *** Companion;
-}
--keepclasseswithmembers class org.schabi.newpipe.** {
-    kotlinx.serialization.KSerializer serializer(...);
-}

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

@@ -458,7 +458,7 @@
             "notNull": true
           },
           {
-            "fieldPath": "orderingName",
+            "fieldPath": "name",
             "columnName": "name",
             "affinity": "TEXT",
             "notNull": false

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

@@ -129,7 +129,7 @@ class DatabaseMigrationTest {
         )
 
         val migratedDatabaseV3 = getMigratedDatabase()
-        val listFromDB = migratedDatabaseV3.streamDAO().getAll().blockingFirst()
+        val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst()
 
         // Only expect 2, the one with the null url will be ignored
         assertEquals(2, listFromDB.size)
@@ -176,32 +176,28 @@ class DatabaseMigrationTest {
 
         databaseInV7.run {
             insert(
-                "search_history",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", serviceId)
                     put("search", defaultSearch1)
                 }
             )
             insert(
-                "search_history",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", serviceId)
                     put("search", defaultSearch2)
                 }
             )
             insert(
-                "search_history",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", otherServiceId)
                     put("search", defaultSearch1)
                 }
             )
             insert(
-                "search_history",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "search_history", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", otherServiceId)
                     put("search", defaultSearch2)
@@ -211,21 +207,17 @@ class DatabaseMigrationTest {
         }
 
         testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME,
-            Migrations.DB_VER_8,
-            true,
-            Migrations.MIGRATION_7_8
+            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
+            AppDatabase.DATABASE_NAME, Migrations.DB_VER_9,
+            true, Migrations.MIGRATION_8_9
         )
 
         val migratedDatabaseV8 = getMigratedDatabase()
-        val listFromDB = migratedDatabaseV8.searchHistoryDAO().getAll().blockingFirst()
+        val listFromDB = migratedDatabaseV8.searchHistoryDAO().all.blockingFirst()
 
         assertEquals(2, listFromDB.size)
         assertEquals("abc", listFromDB[0].search)
@@ -243,8 +235,7 @@ class DatabaseMigrationTest {
         val remoteUid2: Long
         databaseInV8.run {
             localUid1 = insert(
-                "playlists",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "playlists", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("name", DEFAULT_NAME + "1")
                     put("is_thumbnail_permanent", false)
@@ -252,8 +243,7 @@ class DatabaseMigrationTest {
                 }
             )
             localUid2 = insert(
-                "playlists",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "playlists", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("name", DEFAULT_NAME + "2")
                     put("is_thumbnail_permanent", false)
@@ -261,29 +251,25 @@ class DatabaseMigrationTest {
                 }
             )
             delete(
-                "playlists",
-                "uid = ?",
+                "playlists", "uid = ?",
                 Array(1) { localUid1 }
             )
             remoteUid1 = insert(
-                "remote_playlists",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "remote_playlists", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", DEFAULT_SERVICE_ID)
                     put("url", DEFAULT_URL)
                 }
             )
             remoteUid2 = insert(
-                "remote_playlists",
-                SQLiteDatabase.CONFLICT_FAIL,
+                "remote_playlists", SQLiteDatabase.CONFLICT_FAIL,
                 ContentValues().apply {
                     put("service_id", DEFAULT_SECOND_SERVICE_ID)
                     put("url", DEFAULT_SECOND_URL)
                 }
             )
             delete(
-                "remote_playlists",
-                "uid = ?",
+                "remote_playlists", "uid = ?",
                 Array(1) { remoteUid2 }
             )
             close()
@@ -297,8 +283,8 @@ class DatabaseMigrationTest {
         )
 
         val migratedDatabaseV9 = getMigratedDatabase()
-        var localListFromDB = migratedDatabaseV9.playlistDAO().getAll().blockingFirst()
-        var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().getAll().blockingFirst()
+        var localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
+        var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
 
         assertEquals(1, localListFromDB.size)
         assertEquals(localUid2, localListFromDB[0].uid)
@@ -308,27 +294,17 @@ class DatabaseMigrationTest {
         assertEquals(-1, remoteListFromDB[0].displayIndex)
 
         val localUid3 = migratedDatabaseV9.playlistDAO().insert(
-            PlaylistEntity(
-                name = "${DEFAULT_NAME}3",
-                isThumbnailPermanent = false,
-                thumbnailStreamId = -1,
-                displayIndex = -1
-            )
+            PlaylistEntity(DEFAULT_NAME + "3", false, -1, -1)
         )
         val remoteUid3 = migratedDatabaseV9.playlistRemoteDAO().insert(
             PlaylistRemoteEntity(
-                serviceId = DEFAULT_THIRD_SERVICE_ID,
-                orderingName = DEFAULT_NAME,
-                url = DEFAULT_THIRD_URL,
-                thumbnailUrl = DEFAULT_THUMBNAIL,
-                uploader = DEFAULT_UPLOADER_NAME,
-                displayIndex = -1,
-                streamCount = 10
+                DEFAULT_THIRD_SERVICE_ID, DEFAULT_NAME, DEFAULT_THIRD_URL,
+                DEFAULT_THUMBNAIL, DEFAULT_UPLOADER_NAME, -1, 10
             )
         )
 
-        localListFromDB = migratedDatabaseV9.playlistDAO().getAll().blockingFirst()
-        remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().getAll().blockingFirst()
+        localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
+        remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
         assertEquals(2, localListFromDB.size)
         assertEquals(localUid3, localListFromDB[1].uid)
         assertEquals(-1, localListFromDB[1].displayIndex)

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

@@ -4,8 +4,6 @@ import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import io.reactivex.rxjava3.core.Single
-import java.io.IOException
-import java.time.OffsetDateTime
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -22,6 +20,9 @@ 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
@@ -40,21 +41,14 @@ class FeedDAOTest {
     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
+        stream1, stream2, stream3, stream4, stream5, stream6, stream7
     )
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         db = Room.inMemoryDatabaseBuilder(
-            context,
-            AppDatabase::class.java
+            context, AppDatabase::class.java
         ).build()
         feedDAO = db.feedDAO()
         streamDAO = db.streamDAO()
@@ -71,10 +65,7 @@ class FeedDAOTest {
     fun testUnlinkStreamsOlderThan_KeepOne() {
         setupUnlinkDelete("2023-08-15T00:00:00Z")
         val streams = feedDAO.getStreams(
-            FeedGroupEntity.GROUP_ALL_ID,
-            includePlayed = true,
-            includePartiallyPlayed = true,
-            null
+            FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null
         )
             .blockingGet()
         val allowedStreams = listOf(stream3, stream5, stream6, stream7)
@@ -85,10 +76,7 @@ class FeedDAOTest {
     fun testUnlinkStreamsOlderThan_KeepMultiple() {
         setupUnlinkDelete("2023-08-01T00:00:00Z")
         val streams = feedDAO.getStreams(
-            FeedGroupEntity.GROUP_ALL_ID,
-            includePlayed = true,
-            includePartiallyPlayed = true,
-            null
+            FeedGroupEntity.GROUP_ALL_ID, includePlayed = true, includePartiallyPlayed = true, null
         )
             .blockingGet()
         val allowedStreams = listOf(stream3, stream4, stream5, stream6, stream7)
@@ -124,7 +112,7 @@ class FeedDAOTest {
                 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"))
+                SubscriptionEntity.from(ChannelInfo(serviceId, "4", "https://youtube.com/channel/4", "https://youtube.com/channel/4", "channel-4")),
             )
         )
         feedDAO.insertAll(
@@ -135,7 +123,7 @@ class FeedDAOTest {
                 FeedEntity(4, 2),
                 FeedEntity(5, 2),
                 FeedEntity(6, 3),
-                FeedEntity(7, 4)
+                FeedEntity(7, 4),
             )
         )
     }

app/src/androidTest/java/org/schabi/newpipe/error/ErrorInfoTest.java

@@ -0,0 +1,46 @@
+package org.schabi.newpipe.error;
+
+import android.os.Parcel;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Instrumented tests for {@link ErrorInfo}.
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ErrorInfoTest {
+
+    @Test
+    public void errorInfoTestParcelable() {
+        final ErrorInfo info = new ErrorInfo(new ParsingException("Hello"),
+                UserAction.USER_REPORT, "request", ServiceList.YouTube.getServiceId());
+        // Obtain a Parcel object and write the parcelable object to it:
+        final Parcel parcel = Parcel.obtain();
+        info.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        final ErrorInfo infoFromParcel = (ErrorInfo) ErrorInfo.CREATOR.createFromParcel(parcel);
+
+        assertTrue(Arrays.toString(infoFromParcel.getStackTraces())
+                .contains(ErrorInfoTest.class.getSimpleName()));
+        assertEquals(UserAction.USER_REPORT, infoFromParcel.getUserAction());
+        assertEquals(ServiceList.YouTube.getServiceInfo().getName(),
+                infoFromParcel.getServiceName());
+        assertEquals("request", infoFromParcel.getRequest());
+        assertEquals(R.string.parsing_error, infoFromParcel.getMessageStringId());
+
+        parcel.recycle();
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/error/ErrorInfoTest.kt

@@ -1,127 +0,0 @@
-package org.schabi.newpipe.error
-
-import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import java.io.IOException
-import java.net.SocketTimeoutException
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.schabi.newpipe.R
-import org.schabi.newpipe.extractor.ServiceList
-import org.schabi.newpipe.extractor.exceptions.ParsingException
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
-
-/**
- * Instrumented tests for {@link ErrorInfo}.
- */
-@RunWith(AndroidJUnit4::class)
-@LargeTest
-class ErrorInfoTest {
-    private val context: Context by lazy { ApplicationProvider.getApplicationContext() }
-
-    /**
-     * @param errorInfo the error info to access
-     * @return the private field errorInfo.message.stringRes using reflection
-     */
-    @Throws(NoSuchFieldException::class, IllegalAccessException::class)
-    private fun getMessageFromErrorInfo(errorInfo: ErrorInfo): Int {
-        val message = ErrorInfo::class.java.getDeclaredField("message")
-        message.isAccessible = true
-        val messageValue = message.get(errorInfo) as ErrorInfo.Companion.ErrorMessage
-
-        val stringRes = ErrorInfo.Companion.ErrorMessage::class.java.getDeclaredField("stringRes")
-        stringRes.isAccessible = true
-        return stringRes.get(messageValue) as Int
-    }
-
-    @Test
-    @Throws(NoSuchFieldException::class, IllegalAccessException::class)
-    fun errorInfoTestParcelable() {
-        val info = ErrorInfo(
-            ParsingException("Hello"),
-            UserAction.USER_REPORT,
-            "request",
-            ServiceList.YouTube.serviceId
-        )
-        // Obtain a Parcel object and write the parcelable object to it:
-        val parcel = Parcel.obtain()
-        info.writeToParcel(parcel, 0)
-        parcel.setDataPosition(0)
-        val creatorField = ErrorInfo::class.java.getDeclaredField("CREATOR")
-        val creator = creatorField.get(null)
-        check(creator is Parcelable.Creator<*>)
-        val infoFromParcel = requireNotNull(
-            creator.createFromParcel(parcel) as? ErrorInfo
-        )
-        assertTrue(
-            infoFromParcel.stackTraces.contentToString()
-                .contains(ErrorInfoTest::class.java.simpleName)
-        )
-        assertEquals(UserAction.USER_REPORT, infoFromParcel.userAction)
-        assertEquals(
-            ServiceList.YouTube.serviceInfo.name,
-            infoFromParcel.getServiceName()
-        )
-        assertEquals("request", infoFromParcel.request)
-        assertEquals(R.string.parsing_error, getMessageFromErrorInfo(infoFromParcel))
-
-        parcel.recycle()
-    }
-
-    /**
-     * Test: Network error on initial load (Resource.Error)
-     */
-
-    @Test
-    fun testInitialCommentNetworkError() {
-        val errorInfo = ErrorInfo(
-            throwable = SocketTimeoutException("Connection timeout"),
-            userAction = UserAction.REQUESTED_COMMENTS,
-            request = "comments"
-        )
-        assertEquals(context.getString(R.string.network_error), errorInfo.getMessage(context))
-        assertTrue(errorInfo.isReportable)
-        assertTrue(errorInfo.isRetryable)
-        assertNull(errorInfo.recaptchaUrl)
-    }
-
-    /**
-     * Test: Network error on paging (LoadState.Error)
-     */
-    @Test
-    fun testPagingNetworkError() {
-        val errorInfo = ErrorInfo(
-            throwable = IOException("Paging failed"),
-            userAction = UserAction.REQUESTED_COMMENTS,
-            request = "comments"
-        )
-        assertEquals(context.getString(R.string.network_error), errorInfo.getMessage(context))
-        assertTrue(errorInfo.isReportable)
-        assertTrue(errorInfo.isRetryable)
-        assertNull(errorInfo.recaptchaUrl)
-    }
-
-    /**
-     * Test: ReCaptcha during comments load
-     */
-    @Test
-    fun testReCaptchaDuringComments() {
-        val url = "https://www.google.com/recaptcha/api/fallback?k=test"
-        val errorInfo = ErrorInfo(
-            throwable = ReCaptchaException("ReCaptcha needed", url),
-            userAction = UserAction.REQUESTED_COMMENTS,
-            request = "comments"
-        )
-        assertEquals(context.getString(R.string.recaptcha_request_toast), errorInfo.getMessage(context))
-        assertEquals(url, errorInfo.recaptchaUrl)
-        assertTrue(errorInfo.isReportable)
-        assertTrue(errorInfo.isRetryable)
-    }
-}

app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt

@@ -1,9 +1,6 @@
 package org.schabi.newpipe.local.history
 
 import androidx.test.core.app.ApplicationProvider
-import java.time.LocalDateTime
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Assert.assertEquals
@@ -14,6 +11,9 @@ import org.schabi.newpipe.database.AppDatabase
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry
 import org.schabi.newpipe.testUtil.TestDatabase
 import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
 
 class HistoryRecordManagerTest {
 
@@ -41,7 +41,7 @@ class HistoryRecordManagerTest {
         // For some reason the Flowable returned by getAll() never completes, so we can't assert
         // that the number of Lists it returns is exactly 1, we can only check if the first List is
         // correct. Why on earth has a Flowable been used instead of a Single for getAll()?!?
-        val entities = database.searchHistoryDAO().getAll().blockingFirst()
+        val entities = database.searchHistoryDAO().all.blockingFirst()
         assertThat(entities).hasSize(1)
         assertThat(entities[0].id).isEqualTo(1)
         assertThat(entities[0].serviceId).isEqualTo(0)
@@ -51,53 +51,54 @@ class HistoryRecordManagerTest {
     @Test
     fun deleteSearchHistory() {
         val entries = listOf(
-            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 0, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 2, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 1, search = "B"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 0, search = "B")
+            SearchHistoryEntry(time.minusSeconds(1), 0, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 2, "A"),
+            SearchHistoryEntry(time.minusSeconds(3), 1, "B"),
+            SearchHistoryEntry(time.minusSeconds(4), 0, "B"),
         )
 
         // make sure all 4 were inserted
         database.searchHistoryDAO().insertAll(entries)
-        assertThat(database.searchHistoryDAO().getAll().blockingFirst()).hasSameSizeAs(entries)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries)
 
         // try to delete only "A" entries, "B" entries should be untouched
         manager.deleteSearchHistory("A").test().await().assertValue(2)
-        val entities = database.searchHistoryDAO().getAll().blockingFirst()
+        val entities = database.searchHistoryDAO().all.blockingFirst()
         assertThat(entities).hasSize(2)
         assertThat(entities).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
             .containsExactly(*entries.subList(2, 4).toTypedArray())
 
         // assert that nothing happens if we delete a search query that does exist in the db
         manager.deleteSearchHistory("A").test().await().assertValue(0)
-        val entities2 = database.searchHistoryDAO().getAll().blockingFirst()
+        val entities2 = database.searchHistoryDAO().all.blockingFirst()
         assertThat(entities2).hasSize(2)
         assertThat(entities2).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
             .containsExactly(*entries.subList(2, 4).toTypedArray())
 
         // delete all remaining entries
         manager.deleteSearchHistory("B").test().await().assertValue(2)
-        assertThat(database.searchHistoryDAO().getAll().blockingFirst()).isEmpty()
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
     }
 
     @Test
     fun deleteCompleteSearchHistory() {
         val entries = listOf(
-            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 2, search = "B"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 0, search = "C")
+            SearchHistoryEntry(time.minusSeconds(1), 1, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 2, "B"),
+            SearchHistoryEntry(time.minusSeconds(3), 0, "C"),
         )
 
         // make sure all 3 were inserted
         database.searchHistoryDAO().insertAll(entries)
-        assertThat(database.searchHistoryDAO().getAll().blockingFirst()).hasSameSizeAs(entries)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries)
 
         // should remove everything
         manager.deleteCompleteSearchHistory().test().await().assertValue(entries.size)
-        assertThat(database.searchHistoryDAO().getAll().blockingFirst()).isEmpty()
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
     }
 
     private fun insertShuffledRelatedSearches(relatedSearches: Collection<SearchHistoryEntry>) {
+
         // shuffle to make sure the order of items returned by queries depends only on
         // SearchHistoryEntry.creationDate, not on the actual insertion time, so that we can
         // verify that the `ORDER BY` clause does its job
@@ -106,7 +107,7 @@ class HistoryRecordManagerTest {
         // make sure all entries were inserted
         assertEquals(
             relatedSearches.size,
-            database.searchHistoryDAO().getAll().blockingFirst().size
+            database.searchHistoryDAO().all.blockingFirst().size
         )
     }
 
@@ -120,24 +121,25 @@ class HistoryRecordManagerTest {
             RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
             RELATED_SEARCHES_ENTRIES[4].search, // B
             RELATED_SEARCHES_ENTRIES[5].search, // AA
-            RELATED_SEARCHES_ENTRIES[2].search // BA
+            RELATED_SEARCHES_ENTRIES[2].search, // BA
         )
     }
 
     @Test
     fun getRelatedSearches_emptyQuery_manyDuplicates() {
-        val relatedSearches = listOf(
-            SearchHistoryEntry(creationDate = time.minusSeconds(9), serviceId = 3, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(8), serviceId = 3, search = "AB"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(7), serviceId = 3, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(6), serviceId = 3, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(5), serviceId = 3, search = "BA"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 3, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 3, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 0, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 2, search = "AA")
+        insertShuffledRelatedSearches(
+            listOf(
+                SearchHistoryEntry(time.minusSeconds(9), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(8), 3, "AB"),
+                SearchHistoryEntry(time.minusSeconds(7), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(6), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(5), 3, "BA"),
+                SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(3), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(2), 0, "A"),
+                SearchHistoryEntry(time.minusSeconds(1), 2, "AA"),
+            )
         )
-        insertShuffledRelatedSearches(relatedSearches)
 
         val searches = manager.getRelatedSearches("", 9, 3).blockingFirst()
         assertThat(searches).containsExactly("AA", "A", "BA")
@@ -152,7 +154,7 @@ class HistoryRecordManagerTest {
         assertThat(searches).containsExactly(
             RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
             RELATED_SEARCHES_ENTRIES[5].search, // AA
-            RELATED_SEARCHES_ENTRIES[1].search // BA
+            RELATED_SEARCHES_ENTRIES[1].search, // BA
         )
 
         // also make sure that the string comparison is case insensitive
@@ -164,13 +166,13 @@ class HistoryRecordManagerTest {
         private val time = OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 1, 1), ZoneOffset.UTC)
 
         private val RELATED_SEARCHES_ENTRIES = listOf(
-            SearchHistoryEntry(creationDate = time.minusSeconds(7), serviceId = 2, search = "AC"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(6), serviceId = 0, search = "ABC"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(5), serviceId = 1, search = "BA"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(4), serviceId = 3, search = "A"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(2), serviceId = 0, search = "B"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(3), serviceId = 2, search = "AA"),
-            SearchHistoryEntry(creationDate = time.minusSeconds(1), serviceId = 1, search = "A")
+            SearchHistoryEntry(time.minusSeconds(7), 2, "AC"),
+            SearchHistoryEntry(time.minusSeconds(6), 0, "ABC"),
+            SearchHistoryEntry(time.minusSeconds(5), 1, "BA"),
+            SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 0, "B"),
+            SearchHistoryEntry(time.minusSeconds(3), 2, "AA"),
+            SearchHistoryEntry(time.minusSeconds(1), 1, "A"),
         )
     }
 }

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

@@ -33,12 +33,8 @@ class LocalPlaylistManagerTest {
     fun createPlaylist() {
         val NEWPIPE_URL = "https://newpipe.net/"
         val stream = StreamEntity(
-            serviceId = 1,
-            url = NEWPIPE_URL,
-            title = "title",
-            streamType = StreamType.VIDEO_STREAM,
-            duration = 1,
-            uploader = "uploader",
+            serviceId = 1, url = NEWPIPE_URL, title = "title",
+            streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
             uploaderUrl = NEWPIPE_URL
         )
 
@@ -62,28 +58,20 @@ class LocalPlaylistManagerTest {
     @Test()
     fun createPlaylist_nonExistentStreamsAreUpserted() {
         val stream = StreamEntity(
-            serviceId = 1,
-            url = "https://newpipe.net/",
-            title = "title",
-            streamType = StreamType.VIDEO_STREAM,
-            duration = 1,
-            uploader = "uploader",
+            serviceId = 1, url = "https://newpipe.net/", title = "title",
+            streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
             uploaderUrl = "https://newpipe.net/"
         )
         database.streamDAO().insert(stream)
         val upserted = StreamEntity(
-            serviceId = 1,
-            url = "https://newpipe.net/2",
-            title = "title2",
-            streamType = StreamType.VIDEO_STREAM,
-            duration = 1,
-            uploader = "uploader",
+            serviceId = 1, url = "https://newpipe.net/2", title = "title2",
+            streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
             uploaderUrl = "https://newpipe.net/"
         )
 
         val result = manager.createPlaylist("name", listOf(stream, upserted))
 
         result.test().await().assertComplete()
-        database.streamDAO().getAll().test().awaitCount(1).assertValue(listOf(stream, upserted))
+        database.streamDAO().all.test().awaitCount(1).assertValue(listOf(stream, upserted))
     }
 }

app/src/androidTest/java/org/schabi/newpipe/testUtil/TrampolineSchedulerRule.kt

@@ -17,20 +17,21 @@ class TrampolineSchedulerRule : TestRule {
 
     private val scheduler = Schedulers.trampoline()
 
-    override fun apply(base: Statement, description: Description): Statement = object : Statement() {
-        override fun evaluate() {
-            try {
-                RxJavaPlugins.setComputationSchedulerHandler { scheduler }
-                RxJavaPlugins.setIoSchedulerHandler { scheduler }
-                RxJavaPlugins.setNewThreadSchedulerHandler { scheduler }
-                RxJavaPlugins.setSingleSchedulerHandler { scheduler }
-                RxAndroidPlugins.setInitMainThreadSchedulerHandler { scheduler }
+    override fun apply(base: Statement, description: Description): Statement =
+        object : Statement() {
+            override fun evaluate() {
+                try {
+                    RxJavaPlugins.setComputationSchedulerHandler { scheduler }
+                    RxJavaPlugins.setIoSchedulerHandler { scheduler }
+                    RxJavaPlugins.setNewThreadSchedulerHandler { scheduler }
+                    RxJavaPlugins.setSingleSchedulerHandler { scheduler }
+                    RxAndroidPlugins.setInitMainThreadSchedulerHandler { scheduler }
 
-                base.evaluate()
-            } finally {
-                RxJavaPlugins.reset()
-                RxAndroidPlugins.reset()
+                    base.evaluate()
+                } finally {
+                    RxJavaPlugins.reset()
+                    RxAndroidPlugins.reset()
+                }
             }
         }
-    }
 }

app/src/androidTest/java/org/schabi/newpipe/ui/components/common/ErrorPanelTest.kt

@@ -1,126 +0,0 @@
-package org.schabi.newpipe.ui.components.common
-
-import androidx.activity.ComponentActivity
-import androidx.annotation.StringRes
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import java.net.UnknownHostException
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.schabi.newpipe.R
-import org.schabi.newpipe.error.ErrorInfo
-import org.schabi.newpipe.error.UserAction
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
-import org.schabi.newpipe.extractor.exceptions.UnsupportedContentInCountryException
-import org.schabi.newpipe.ui.theme.AppTheme
-
-@RunWith(AndroidJUnit4::class)
-class ErrorPanelTest {
-    @get:Rule
-    val composeRule = createAndroidComposeRule<ComponentActivity>()
-
-    private fun setErrorPanel(errorInfo: ErrorInfo, onRetry: (() -> Unit)? = null) {
-        composeRule.setContent {
-            AppTheme {
-                ErrorPanel(errorInfo = errorInfo, onRetry = onRetry)
-            }
-        }
-    }
-    private fun text(@StringRes id: Int) = composeRule.activity.getString(id)
-
-    /**
-     * Test Network Error
-     */
-    @Test
-    fun testNetworkErrorShowsRetryWithoutReportButton() {
-        val networkErrorInfo = ErrorInfo(
-            throwable = UnknownHostException("offline"),
-            userAction = UserAction.REQUESTED_STREAM,
-            request = "https://example.com/watch?v=foo"
-        )
-
-        setErrorPanel(networkErrorInfo, onRetry = {})
-        composeRule.onNodeWithText(text(R.string.network_error)).assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.retry), ignoreCase = true).assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.error_snackbar_action), ignoreCase = true)
-            .assertDoesNotExist()
-        composeRule.onNodeWithText(text(R.string.recaptcha_solve), ignoreCase = true)
-            .assertDoesNotExist()
-    }
-
-    /**
-     * Test Unexpected Error, Shows Report and Retry buttons
-     */
-    @Test
-    fun unexpectedErrorShowsReportAndRetryButtons() {
-        val unexpectedErrorInfo = ErrorInfo(
-            throwable = RuntimeException("Unexpected error"),
-            userAction = UserAction.REQUESTED_STREAM,
-            request = "https://example.com/watch?v=bar"
-        )
-
-        setErrorPanel(unexpectedErrorInfo, onRetry = {})
-        composeRule.onNodeWithText(text(R.string.error_snackbar_message)).assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.retry), ignoreCase = true).assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.error_snackbar_action), ignoreCase = true)
-            .assertIsDisplayed()
-    }
-
-    /**
-     * Test Recaptcha Error shows all buttons: solve, retry, open in browser, report
-     */
-    @Test
-    fun recaptchaErrorShowsAllButtons() {
-        var retryClicked = false
-        val recaptchaErrorInfo = ErrorInfo(
-            throwable = ReCaptchaException(
-                "Recaptcha required",
-                "https://example.com/captcha"
-            ),
-            userAction = UserAction.REQUESTED_STREAM,
-            request = "https://example.com/watch?v=baz",
-            openInBrowserUrl = "https://example.com/watch?v=baz"
-        )
-
-        setErrorPanel(
-            errorInfo = recaptchaErrorInfo,
-            onRetry = { retryClicked = true }
-
-        )
-        composeRule.onNodeWithText(text(R.string.recaptcha_solve), ignoreCase = true)
-            .assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.retry), ignoreCase = true)
-            .assertIsDisplayed()
-            .performClick()
-        composeRule.onNodeWithText(text(R.string.open_in_browser), ignoreCase = true)
-            .assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.error_snackbar_action), ignoreCase = true)
-            .assertIsDisplayed()
-        assert(retryClicked) { "onRetry callback should have been invoked" }
-    }
-
-    /**
-     * Test Content Not Available Error hides retry button
-     */
-    @Test
-    fun testNonRetryableErrorHidesRetryAndReportButtons() {
-        val contentNotAvailable = ErrorInfo(
-            throwable = UnsupportedContentInCountryException("Not available here"),
-            userAction = UserAction.REQUESTED_STREAM,
-            request = "https://example.com/watch?v=qux"
-        )
-
-        setErrorPanel(contentNotAvailable)
-
-        composeRule.onNodeWithText(text(R.string.unsupported_content_in_country))
-            .assertIsDisplayed()
-        composeRule.onNodeWithText(text(R.string.retry), ignoreCase = true)
-            .assertDoesNotExist()
-        composeRule.onNodeWithText(text(R.string.error_snackbar_action), ignoreCase = true)
-            .assertDoesNotExist()
-    }
-}

app/src/androidTest/java/org/schabi/newpipe/ui/components/video/comment/CommentSectionInstrumentedTest.kt

@@ -1,364 +0,0 @@
-package org.schabi.newpipe.ui.components.video.comment
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.pluralStringResource
-import androidx.compose.ui.test.ExperimentalTestApi
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.hasClickAction
-import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performScrollTo
-import androidx.compose.ui.test.performScrollToNode
-import androidx.compose.ui.unit.dp
-import androidx.paging.LoadState
-import androidx.paging.LoadStates
-import androidx.paging.PagingData
-import androidx.paging.compose.collectAsLazyPagingItems
-import java.net.UnknownHostException
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.schabi.newpipe.R
-import org.schabi.newpipe.error.ErrorInfo
-import org.schabi.newpipe.error.UserAction
-import org.schabi.newpipe.extractor.Page
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
-import org.schabi.newpipe.extractor.stream.Description
-import org.schabi.newpipe.ui.components.common.ErrorPanel
-import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar
-import org.schabi.newpipe.ui.components.common.LoadingIndicator
-import org.schabi.newpipe.ui.emptystate.EmptyStateComposable
-import org.schabi.newpipe.ui.emptystate.EmptyStateSpec
-import org.schabi.newpipe.ui.theme.AppTheme
-import org.schabi.newpipe.viewmodels.util.Resource
-
-class CommentSectionInstrumentedTest {
-
-    @get:Rule
-    val composeRule = createAndroidComposeRule<androidx.activity.ComponentActivity>()
-
-    private val uiStateFlow = MutableStateFlow<Resource<CommentInfo>>(Resource.Loading)
-    private val pagingFlow = MutableStateFlow(PagingData.empty<CommentsInfoItem>())
-    private fun string(@StringRes resId: Int) = composeRule.activity.getString(resId)
-
-    @Before
-    fun setUp() {
-        composeRule.setContent {
-            AppTheme {
-                TestCommentSection(uiStateFlow = uiStateFlow, commentsFlow = pagingFlow)
-            }
-        }
-    }
-
-    private fun successState(commentCount: Int) = Resource.Success(
-        CommentInfo(
-            serviceId = 0,
-            url = "",
-            comments = emptyList(),
-            nextPage = null,
-            commentCount = commentCount,
-            isCommentsDisabled = false
-        )
-    )
-
-    @Test
-    fun commentListLoadsAndScrolls() {
-        val comments = (1..25).map { index ->
-            CommentsInfoItem(
-                commentText = Description("Comment $index", Description.PLAIN_TEXT),
-                uploaderName = "Uploader $index",
-                replies = Page(""),
-                replyCount = 0
-            )
-        }
-        uiStateFlow.value = successState(comments.size)
-        pagingFlow.value = PagingData.from(comments)
-        composeRule.waitForIdle()
-        composeRule.onNodeWithText("Comment 1").assertIsDisplayed()
-        composeRule.onNodeWithTag("comment_list")
-            .performScrollToNode(hasText("Comment 25"))
-        composeRule.onNodeWithText("Comment 25").assertIsDisplayed()
-    }
-
-    @OptIn(ExperimentalTestApi::class)
-    @Test
-    fun pagingErrorShowsErrorPanelAndAllowsRetry() {
-        uiStateFlow.value = successState(10)
-        pagingFlow.value = PagingData.from(
-            data = emptyList(),
-            sourceLoadStates = LoadStates(
-                refresh = LoadState.Error(ReCaptchaException("captcha required", "https://example.com")),
-                prepend = LoadState.NotLoading(true),
-                append = LoadState.NotLoading(true)
-            )
-        )
-        composeRule.waitForIdle()
-
-        val solveMatcher = hasText(string(R.string.recaptcha_solve), ignoreCase = true)
-            .and(hasClickAction())
-        val retryMatcher = hasText(string(R.string.retry), ignoreCase = true)
-            .and(hasClickAction())
-
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(solveMatcher).fetchSemanticsNodes().isNotEmpty()
-        }
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(retryMatcher).fetchSemanticsNodes().isNotEmpty()
-        }
-
-        composeRule.onNode(retryMatcher)
-            .performScrollTo()
-            .performClick()
-
-        val recoveredComment = CommentsInfoItem(
-            commentText = Description("Recovered comment", Description.PLAIN_TEXT),
-            uploaderName = "Uploader",
-            replies = Page(""),
-            replyCount = 0
-        )
-
-        uiStateFlow.value = successState(1)
-        pagingFlow.value = PagingData.from(
-            data = listOf(recoveredComment),
-            sourceLoadStates = LoadStates(
-                refresh = LoadState.NotLoading(false),
-                prepend = LoadState.NotLoading(true),
-                append = LoadState.NotLoading(true)
-            )
-        )
-        composeRule.waitForIdle()
-
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(hasText("Recovered comment"))
-                .fetchSemanticsNodes()
-                .isNotEmpty()
-        }
-        composeRule.onNodeWithText("Recovered comment").assertIsDisplayed()
-
-        composeRule.onNode(solveMatcher).assertDoesNotExist()
-        composeRule.onNode(retryMatcher).assertDoesNotExist()
-    }
-
-    @OptIn(ExperimentalTestApi::class)
-    @Test
-    fun resourceErrorShowsErrorPanelAndRetry() {
-        uiStateFlow.value = Resource.Error(UnknownHostException("offline"))
-        composeRule.waitForIdle()
-
-        composeRule.onNodeWithText(string(R.string.network_error)).assertIsDisplayed()
-        val retryMatcher = hasText(string(R.string.retry), ignoreCase = true)
-            .and(hasClickAction())
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(retryMatcher).fetchSemanticsNodes().isNotEmpty()
-        }
-
-        composeRule.onNode(retryMatcher)
-            .performScrollTo()
-            .performClick()
-
-        val recoveredComment = CommentsInfoItem(
-            commentText = Description("Recovered comment", Description.PLAIN_TEXT),
-            uploaderName = "Uploader",
-            replies = Page(""),
-            replyCount = 0
-        )
-
-        uiStateFlow.value = successState(1)
-        pagingFlow.value = PagingData.from(
-            data = listOf(recoveredComment),
-            sourceLoadStates = LoadStates(
-                refresh = LoadState.NotLoading(false),
-                prepend = LoadState.NotLoading(true),
-                append = LoadState.NotLoading(true)
-            )
-        )
-        composeRule.waitForIdle()
-
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(hasText("Recovered comment"))
-                .fetchSemanticsNodes()
-                .isNotEmpty()
-        }
-        composeRule.onNodeWithText("Recovered comment").assertIsDisplayed()
-
-        composeRule.onNodeWithText(string(R.string.network_error))
-            .assertDoesNotExist()
-        composeRule.onNode(retryMatcher).assertDoesNotExist()
-    }
-
-    @OptIn(ExperimentalTestApi::class)
-    @Test
-    fun retryAfterErrorRecoversList() {
-        uiStateFlow.value = Resource.Error(RuntimeException("boom"))
-        composeRule.waitForIdle()
-
-        val retryMatcher = hasText(string(R.string.retry), ignoreCase = true)
-            .and(hasClickAction())
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(retryMatcher).fetchSemanticsNodes().isNotEmpty()
-        }
-        composeRule.onNode(retryMatcher)
-            .performScrollTo()
-            .performClick()
-
-        val firstComment = CommentsInfoItem(
-            commentText = Description("First comment", Description.PLAIN_TEXT),
-            uploaderName = "Uploader",
-            replies = Page(""),
-            replyCount = 0
-        )
-
-        uiStateFlow.value = successState(1)
-        pagingFlow.value = PagingData.from(
-            data = listOf(firstComment),
-            sourceLoadStates = LoadStates(
-                refresh = LoadState.NotLoading(false),
-                prepend = LoadState.NotLoading(true),
-                append = LoadState.NotLoading(true)
-            )
-        )
-        composeRule.waitForIdle()
-        composeRule.waitUntil(timeoutMillis = 5_000) {
-            composeRule.onAllNodes(hasText("First comment"))
-                .fetchSemanticsNodes()
-                .isNotEmpty()
-        }
-        composeRule.onNodeWithText("First comment").assertIsDisplayed()
-
-        composeRule.onNodeWithText(string(R.string.network_error))
-            .assertDoesNotExist()
-        composeRule.onNode(retryMatcher).assertDoesNotExist()
-    }
-}
-
-@Composable
-private fun TestCommentSection(
-    uiStateFlow: StateFlow<Resource<CommentInfo>>,
-    commentsFlow: Flow<PagingData<CommentsInfoItem>>
-) {
-    val uiState by uiStateFlow.collectAsState()
-    val comments = commentsFlow.collectAsLazyPagingItems()
-    val nestedScrollInterop = rememberNestedScrollInteropConnection()
-    val listState = rememberLazyListState()
-    val COMMENT_LIST_TAG = "comment_list"
-
-    LazyColumnThemedScrollbar(state = listState) {
-        LazyColumn(
-            modifier = Modifier
-                .testTag(COMMENT_LIST_TAG)
-                .nestedScroll(nestedScrollInterop),
-            state = listState
-        ) {
-            when (uiState) {
-                is Resource.Loading -> item {
-                    LoadingIndicator(modifier = Modifier.padding(top = 8.dp))
-                }
-
-                is Resource.Success -> {
-                    val commentInfo = (uiState as Resource.Success<CommentInfo>).data
-                    val count = commentInfo.commentCount
-
-                    when {
-                        commentInfo.isCommentsDisabled -> item {
-                            EmptyStateComposable(
-                                spec = EmptyStateSpec.DisabledComments,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .heightIn(min = 128.dp)
-                            )
-                        }
-
-                        count == 0 -> item {
-                            EmptyStateComposable(
-                                spec = EmptyStateSpec.NoComments,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .heightIn(min = 128.dp)
-                            )
-                        }
-
-                        else -> {
-                            if (count >= 0) {
-                                item {
-                                    Text(
-                                        modifier = Modifier
-                                            .padding(start = 12.dp, end = 12.dp, bottom = 4.dp),
-                                        text = pluralStringResource(R.plurals.comments, count, count),
-                                        maxLines = 1,
-                                        style = MaterialTheme.typography.titleMedium
-                                    )
-                                }
-                            }
-                            when (val refresh = comments.loadState.refresh) {
-                                is LoadState.Loading -> item {
-                                    LoadingIndicator(modifier = Modifier.padding(top = 8.dp))
-                                }
-
-                                is LoadState.Error -> item {
-                                    Box(
-                                        modifier = Modifier.fillMaxWidth()
-                                    ) {
-                                        ErrorPanel(
-                                            errorInfo = ErrorInfo(
-                                                throwable = refresh.error,
-                                                userAction = UserAction.REQUESTED_COMMENTS,
-                                                request = "comments"
-                                            ),
-                                            onRetry = { comments.retry() },
-                                            modifier = Modifier.align(Alignment.Center)
-                                        )
-                                    }
-                                }
-
-                                else -> items(comments.itemCount) { index ->
-                                    Comment(comment = comments[index]!!) {}
-                                }
-                            }
-                        }
-                    }
-                }
-
-                is Resource.Error -> item {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        ErrorPanel(
-                            errorInfo = ErrorInfo(
-                                throwable = (uiState as Resource.Error).throwable,
-                                userAction = UserAction.REQUESTED_COMMENTS,
-                                request = "comments"
-                            ),
-                            onRetry = { comments.retry() },
-                            modifier = Modifier.align(Alignment.Center)
-                        )
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -156,51 +156,41 @@ class StreamItemAdapterTest {
 
         helper.assertInvalidResponse(getResponse(mapOf(Pair("content-length", "mp3"))), 0)
         helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "filename=\"train.png\""))),
-            1
+            getResponse(mapOf(Pair("Content-Disposition", "filename=\"train.png\""))), 1
         )
         helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"data.csv\""))),
-            2
+            getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"data.csv\""))), 2
         )
         helper.assertInvalidResponse(
-            getResponse(mapOf(Pair("Content-Disposition", "form-data; filename=\"data.csv\""))),
-            3
+            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
+            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
+            5, MediaFormat.OGG
         )
         helper.assertValidResponse(
             getResponse(mapOf(Pair("Content-Disposition", "some-form-data; filename=\"audio.flac\""))),
-            6,
-            MediaFormat.FLAC
+            6, MediaFormat.FLAC
         )
         helper.assertValidResponse(
             getResponse(mapOf(Pair("Content-Disposition", "form-data; name=\"audio.aiff\"; filename=\"audio.aiff\""))),
-            7,
-            MediaFormat.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
+            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
+            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
+            10, MediaFormat.OPUS
         )
     }
 
@@ -223,24 +213,16 @@ class StreamItemAdapterTest {
         helper.assertInvalidResponse(getResponse(mapOf()), 7)
 
         helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/flac"))),
-            8,
-            MediaFormat.FLAC
+            getResponse(mapOf(Pair("Content-Type", "audio/flac"))), 8, MediaFormat.FLAC
         )
         helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/wav"))),
-            9,
-            MediaFormat.WAV
+            getResponse(mapOf(Pair("Content-Type", "audio/wav"))), 9, MediaFormat.WAV
         )
         helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/opus"))),
-            10,
-            MediaFormat.OPUS
+            getResponse(mapOf(Pair("Content-Type", "audio/opus"))), 10, MediaFormat.OPUS
         )
         helper.assertValidResponse(
-            getResponse(mapOf(Pair("Content-Type", "audio/aiff"))),
-            11,
-            MediaFormat.AIFF
+            getResponse(mapOf(Pair("Content-Type", "audio/aiff"))), 11, MediaFormat.AIFF
         )
     }
 
@@ -248,37 +230,39 @@ class StreamItemAdapterTest {
      * @return a list of video streams, in which their video only property mirrors the provided
      * [videoOnly] vararg.
      */
-    private fun getVideoStreams(vararg videoOnly: Boolean) = StreamInfoWrapper(
-        videoOnly.map {
-            VideoStream.Builder()
-                .setId(Stream.ID_UNKNOWN)
-                .setContent("https://example.com", true)
-                .setMediaFormat(MediaFormat.MPEG_4)
-                .setResolution("720p")
-                .setIsVideoOnly(it)
-                .build()
-        },
-        context
-    )
+    private fun getVideoStreams(vararg videoOnly: Boolean) =
+        StreamItemAdapter.StreamInfoWrapper(
+            videoOnly.map {
+                VideoStream.Builder()
+                    .setId(Stream.ID_UNKNOWN)
+                    .setContent("https://example.com", true)
+                    .setMediaFormat(MediaFormat.MPEG_4)
+                    .setResolution("720p")
+                    .setIsVideoOnly(it)
+                    .build()
+            },
+            context
+        )
 
     /**
      * @return a list of audio streams, containing valid and null elements mirroring the provided
      * [shouldBeValid] vararg.
      */
-    private fun getAudioStreams(vararg shouldBeValid: Boolean) = getSecondaryStreamsFromList(
-        shouldBeValid.map {
-            if (it) {
-                AudioStream.Builder()
-                    .setId(Stream.ID_UNKNOWN)
-                    .setContent("https://example.com", true)
-                    .setMediaFormat(MediaFormat.OPUS)
-                    .setAverageBitrate(192)
-                    .build()
-            } else {
-                null
+    private fun getAudioStreams(vararg shouldBeValid: Boolean) =
+        getSecondaryStreamsFromList(
+            shouldBeValid.map {
+                if (it) {
+                    AudioStream.Builder()
+                        .setId(Stream.ID_UNKNOWN)
+                        .setContent("https://example.com", true)
+                        .setMediaFormat(MediaFormat.OPUS)
+                        .setAverageBitrate(192)
+                        .build()
+                } else {
+                    null
+                }
             }
-        }
-    )
+        )
 
     private fun getIncompleteAudioStreams(size: Int): List<AudioStream> {
         val list = ArrayList<AudioStream>(size)
@@ -308,7 +292,7 @@ class StreamItemAdapterTest {
             Assert.assertEquals(
                 "normal visibility (pos=[$position]) is not correct",
                 findViewById<View>(R.id.wo_sound_icon).visibility,
-                normalVisibility
+                normalVisibility,
             )
         }
         spinner.adapter.getDropDownView(position, null, spinner).run {
@@ -323,17 +307,18 @@ class StreamItemAdapterTest {
     /**
      * Helper function that builds a secondary stream list.
      */
-    private fun <T : Stream> getSecondaryStreamsFromList(streams: List<T?>) = SparseArrayCompat<SecondaryStreamHelper<T>?>(streams.size).apply {
-        streams.forEachIndexed { index, stream ->
-            val secondaryStreamHelper: SecondaryStreamHelper<T>? = stream?.let {
-                SecondaryStreamHelper(
-                    StreamItemAdapter.StreamInfoWrapper(streams, context),
-                    it
-                )
+    private fun <T : Stream> getSecondaryStreamsFromList(streams: List<T?>) =
+        SparseArrayCompat<SecondaryStreamHelper<T>?>(streams.size).apply {
+            streams.forEachIndexed { index, stream ->
+                val secondaryStreamHelper: SecondaryStreamHelper<T>? = stream?.let {
+                    SecondaryStreamHelper(
+                        StreamItemAdapter.StreamInfoWrapper(streams, context),
+                        it
+                    )
+                }
+                put(index, secondaryStreamHelper)
             }
-            put(index, secondaryStreamHelper)
         }
-    }
 
     private fun getResponse(headers: Map<String, String>): Response {
         val listHeaders = HashMap<String, List<String>>()
@@ -360,8 +345,7 @@ class StreamItemAdapterTest {
             index: Int
         ) {
             assertFalse(
-                "invalid header returns valid value",
-                retrieveMediaFormat(streams[index], response)
+                "invalid header returns valid value", retrieveMediaFormat(streams[index], response)
             )
             assertNull("Media format extracted although stated otherwise", wrapper.getFormat(index))
         }
@@ -375,8 +359,7 @@ class StreamItemAdapterTest {
             format: MediaFormat
         ) {
             assertTrue(
-                "header was not recognized",
-                retrieveMediaFormat(streams[index], response)
+                "header was not recognized", retrieveMediaFormat(streams[index], response)
             )
             assertEquals("Wrong media format extracted", format, wrapper.getFormat(index))
         }

app/src/main/AndroidManifest.xml

@@ -9,8 +9,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <!-- We need to be able to open links in the browser on API 30+ -->
@@ -59,15 +57,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
-
         <service
             android:name=".player.PlayerService"
             android:exported="true"
@@ -101,14 +90,9 @@
             android:exported="false"
             android:label="@string/title_activity_about" />
 
-        <service
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="dataSync"
-            tools:node="merge" />
-
-        <service
-            android:name=".local.feed.service.FeedLoadService"
-            android:foregroundServiceType="dataSync" />
+        <service android:name=".local.subscription.services.SubscriptionsImportService" />
+        <service android:name=".local.subscription.services.SubscriptionsExportService" />
+        <service android:name=".local.feed.service.FeedLoadService" />
 
         <activity
             android:name=".PanicResponderActivity"
@@ -140,9 +124,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask" />
 
-        <service
-            android:name="us.shandian.giga.service.DownloadManagerService"
-            android:foregroundServiceType="dataSync" />
+        <service android:name="us.shandian.giga.service.DownloadManagerService" />
 
         <activity
             android:name=".util.FilePickerActivityHelper"
@@ -338,7 +320,6 @@
                 <data android:scheme="https" />
                 <data android:host="soundcloud.com" />
                 <data android:host="m.soundcloud.com" />
-                <data android:host="on.soundcloud.com" />
                 <data android:host="www.soundcloud.com" />
                 <data android:pathPrefix="/" />
             </intent-filter>
@@ -383,7 +364,6 @@
 
                 <data android:host="eduvid.org" />
                 <data android:host="framatube.org" />
-                <data android:host="indymotion.fr" />
                 <data android:host="media.assassinate-you.net" />
                 <data android:host="media.fsfe.org" />
                 <data android:host="peertube.co.uk" />
@@ -437,7 +417,6 @@
         </activity>
         <service
             android:name=".RouterActivity$FetcherService"
-            android:foregroundServiceType="dataSync"
             android:exported="false" />
 
         <!-- opting out of sending metrics to Google in Android System WebView -->

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

@@ -22,9 +22,6 @@ 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 java.io.IOException
-import java.io.InterruptedIOException
-import java.net.SocketException
 import org.acra.ACRA.init
 import org.acra.ACRA.isACRASenderServiceProcess
 import org.acra.config.CoreConfigurationBuilder
@@ -41,6 +38,9 @@ import org.schabi.newpipe.util.StateSaver
 import org.schabi.newpipe.util.image.ImageStrategy
 import org.schabi.newpipe.util.image.PreferredImageQuality
 import org.schabi.newpipe.util.potoken.PoTokenProviderImpl
+import java.io.IOException
+import java.io.InterruptedIOException
+import java.net.SocketException
 
 /*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
@@ -65,12 +65,6 @@ open class App :
     SingletonImageLoader.Factory {
     var isFirstRun = false
         private set
-    var notificationsRequested = false
-        private set
-
-    fun setNotificationsRequested() {
-        notificationsRequested = true
-    }
 
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
@@ -101,9 +95,9 @@ open class App :
         NewPipe.init(
             getDownloader(),
             Localization.getPreferredLocalization(this),
-            Localization.getPreferredContentCountry(this)
+            Localization.getPreferredContentCountry(this),
         )
-        Localization.initPrettyTime(Localization.resolvePrettyTime())
+        Localization.initPrettyTime(Localization.resolvePrettyTime(this))
 
         BridgeStateSaverInitializer.init(this)
         StateSaver.init(this)
@@ -118,9 +112,9 @@ open class App :
                 this,
                 prefs.getString(
                     getString(R.string.image_quality_key),
-                    getString(R.string.image_quality_default)
-                )
-            )
+                    getString(R.string.image_quality_default),
+                ),
+            ),
         )
 
         configureRxJavaErrorHandler()
@@ -128,14 +122,15 @@ open class App :
         YoutubeStreamExtractor.setPoTokenProvider(PoTokenProviderImpl)
     }
 
-    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()
+    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)
@@ -189,7 +184,7 @@ open class App :
                             IOException::class.java,
                             SocketException::class.java, // blocking code disposed
                             InterruptedException::class.java,
-                            InterruptedIOException::class.java
+                            InterruptedIOException::class.java,
                         )
                 }
 
@@ -203,7 +198,7 @@ open class App :
                             OnErrorNotImplementedException::class.java,
                             MissingBackpressureException::class.java,
                             // bug in operator
-                            IllegalStateException::class.java
+                            IllegalStateException::class.java,
                         )
                 }
 
@@ -214,7 +209,7 @@ open class App :
                         .uncaughtExceptionHandler
                         .uncaughtException(Thread.currentThread(), throwable)
                 }
-            }
+            },
         )
     }
 
@@ -240,7 +235,7 @@ open class App :
             NotificationChannelCompat
                 .Builder(
                     getString(R.string.notification_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_LOW
+                    NotificationManagerCompat.IMPORTANCE_LOW,
                 ).setName(getString(R.string.notification_channel_name))
                 .setDescription(getString(R.string.notification_channel_description))
                 .build()
@@ -248,7 +243,7 @@ open class App :
             NotificationChannelCompat
                 .Builder(
                     getString(R.string.app_update_notification_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_LOW
+                    NotificationManagerCompat.IMPORTANCE_LOW,
                 ).setName(getString(R.string.app_update_notification_channel_name))
                 .setDescription(getString(R.string.app_update_notification_channel_description))
                 .build()
@@ -256,7 +251,7 @@ open class App :
             NotificationChannelCompat
                 .Builder(
                     getString(R.string.hash_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_HIGH
+                    NotificationManagerCompat.IMPORTANCE_HIGH,
                 ).setName(getString(R.string.hash_channel_name))
                 .setDescription(getString(R.string.hash_channel_description))
                 .build()
@@ -264,7 +259,7 @@ open class App :
             NotificationChannelCompat
                 .Builder(
                     getString(R.string.error_report_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_LOW
+                    NotificationManagerCompat.IMPORTANCE_LOW,
                 ).setName(getString(R.string.error_report_channel_name))
                 .setDescription(getString(R.string.error_report_channel_description))
                 .build()
@@ -272,7 +267,7 @@ open class App :
             NotificationChannelCompat
                 .Builder(
                     getString(R.string.streams_notification_channel_id),
-                    NotificationManagerCompat.IMPORTANCE_DEFAULT
+                    NotificationManagerCompat.IMPORTANCE_DEFAULT,
                 ).setName(getString(R.string.streams_notification_channel_name))
                 .setDescription(getString(R.string.streams_notification_channel_description))
                 .build()

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

@@ -29,7 +29,7 @@ import okhttp3.ResponseBody;
 
 public final class DownloaderImpl extends Downloader {
     public static final String USER_AGENT =
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:140.0) Gecko/20100101 Firefox/140.0";
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0";
     public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY =
             "youtube_restricted_mode_key";
     public static final String YOUTUBE_RESTRICTED_MODE_COOKIE = "PREF=f2=8000000";
@@ -166,7 +166,9 @@ public final class DownloaderImpl extends Downloader {
 
             String responseBodyToReturn = null;
             try (ResponseBody body = response.body()) {
-                responseBodyToReturn = body.string();
+                if (body != null) {
+                    responseBodyToReturn = body.string();
+                }
             }
 
             final String latestUrl = response.request().url().toString();

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

@@ -20,6 +20,8 @@
 
 package org.schabi.newpipe;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -47,7 +49,6 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
@@ -76,7 +77,6 @@ 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.settings.migration.MigrationManager;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.KioskTranslator;
@@ -122,10 +122,7 @@ public class MainActivity extends AppCompatActivity {
     private static final int ITEM_ID_ABOUT = 2;
 
     private static final int ORDER = 0;
-    public static final String KEY_IS_IN_BACKGROUND = "is_in_background";
 
-    private SharedPreferences sharedPreferences;
-    private SharedPreferences.Editor sharedPrefEditor;
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -137,7 +134,6 @@ public class MainActivity extends AppCompatActivity {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
 
-        Localization.migrateAppLanguageSettingIfNecessary(getApplicationContext());
         ThemeHelper.setDayNightMode(this);
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
@@ -154,9 +150,8 @@ public class MainActivity extends AppCompatActivity {
             }
         }
 
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        sharedPrefEditor = sharedPreferences.edit();
 
         mainBinding = ActivityMainBinding.inflate(getLayoutInflater());
         drawerLayoutBinding = mainBinding.drawerLayout;
@@ -192,7 +187,7 @@ public class MainActivity extends AppCompatActivity {
             UpdateSettingsFragment.askForConsentToUpdateChecks(this);
         }
 
-        MigrationManager.showUserInfoIfPresent(this);
+        Localization.migrateAppLanguageSettingIfNecessary(getApplicationContext());
     }
 
     @Override
@@ -200,29 +195,16 @@ public class MainActivity extends AppCompatActivity {
         super.onPostCreate(savedInstanceState);
 
         final App app = App.getInstance();
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
-        if (sharedPreferences.getBoolean(app.getString(R.string.update_app_key), false)
-                && sharedPreferences
-                .getBoolean(app.getString(R.string.update_check_consent_key), false)) {
+        if (prefs.getBoolean(app.getString(R.string.update_app_key), false)
+                && prefs.getBoolean(app.getString(R.string.update_check_consent_key), false)) {
             // Start the worker which is checking all conditions
             // and eventually searching for a new version.
             NewVersionWorker.enqueueNewVersionCheckingWork(app, false);
         }
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        sharedPrefEditor.putBoolean(KEY_IS_IN_BACKGROUND, false).apply();
-        Log.d(TAG, "App moved to foreground");
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        sharedPrefEditor.putBoolean(KEY_IS_IN_BACKGROUND, true).apply();
-        Log.d(TAG, "App moved to background");
-    }
     private void setupDrawer() throws ExtractionException {
         addDrawerMenuForCurrentService();
 
@@ -260,6 +242,19 @@ public class MainActivity extends AppCompatActivity {
      */
     private void addDrawerMenuForCurrentService() throws ExtractionException {
         //Tabs
+        final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        final StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskMenuItemId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerLayoutBinding.navigation.getMenu()
+                    .add(R.id.menu_tabs_group, kioskMenuItemId, 0, KioskTranslator
+                            .getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcon(ks));
+            kioskMenuItemId++;
+        }
+
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER,
                         R.string.tab_subscriptions)
@@ -277,20 +272,6 @@ public class MainActivity extends AppCompatActivity {
                 .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
                 .setIcon(R.drawable.ic_history);
 
-        //Kiosks
-        final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
-        final StreamingService service = NewPipe.getService(currentServiceId);
-
-        int kioskMenuItemId = 0;
-
-        for (final String ks : service.getKioskList().getAvailableKiosks()) {
-            drawerLayoutBinding.navigation.getMenu()
-                    .add(R.id.menu_kiosks_group, kioskMenuItemId, 0, KioskTranslator
-                            .getTranslatedKioskName(ks, this))
-                    .setIcon(KioskTranslator.getKioskIcon(ks));
-            kioskMenuItemId++;
-        }
-
         //Settings and About
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
@@ -310,13 +291,10 @@ public class MainActivity extends AppCompatActivity {
                 changeService(item);
                 break;
             case R.id.menu_tabs_group:
-                tabSelected(item);
-                break;
-            case R.id.menu_kiosks_group:
                 try {
-                    kioskSelected(item);
+                    tabSelected(item);
                 } catch (final Exception e) {
-                    ErrorUtil.showUiErrorSnackbar(this, "Selecting drawer kiosk", e);
+                    ErrorUtil.showUiErrorSnackbar(this, "Selecting main page tab", e);
                 }
                 break;
             case R.id.menu_options_about_group:
@@ -340,7 +318,7 @@ public class MainActivity extends AppCompatActivity {
                 .setChecked(true);
     }
 
-    private void tabSelected(final MenuItem item) {
+    private void tabSelected(final MenuItem item) throws ExtractionException {
         switch (item.getItemId()) {
             case ITEM_ID_SUBSCRIPTIONS:
                 NavigationHelper.openSubscriptionFragment(getSupportFragmentManager());
@@ -357,19 +335,18 @@ public class MainActivity extends AppCompatActivity {
             case ITEM_ID_HISTORY:
                 NavigationHelper.openStatisticFragment(getSupportFragmentManager());
                 break;
-        }
-    }
-
-    private void kioskSelected(final MenuItem item) throws ExtractionException {
-        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);
+            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;
+                    }
+                    kioskMenuItemId++;
+                }
                 break;
-            }
-            kioskMenuItemId++;
         }
     }
 
@@ -410,7 +387,6 @@ public class MainActivity extends AppCompatActivity {
 
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_services_group);
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_tabs_group);
-        drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_kiosks_group);
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_options_about_group);
 
         // Show up or down arrow
@@ -504,8 +480,9 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
+        assureCorrectAppLanguage(this);
         // Change the date format to match the selected language on resume
-        Localization.initPrettyTime(Localization.resolvePrettyTime());
+        Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
         super.onResume();
 
         // Close drawer on return, and don't show animation,
@@ -527,11 +504,13 @@ public class MainActivity extends AppCompatActivity {
             ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
         }
 
+        final SharedPreferences sharedPreferences =
+                PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
             if (DEBUG) {
                 Log.d(TAG, "Theme has changed, recreating activity...");
             }
-            sharedPrefEditor.putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
+            sharedPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
             ActivityCompat.recreate(this);
         }
 
@@ -539,7 +518,7 @@ public class MainActivity extends AppCompatActivity {
             if (DEBUG) {
                 Log.d(TAG, "main page has changed, recreating main fragment...");
             }
-            sharedPrefEditor.putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
+            sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
             NavigationHelper.openMainActivity(this);
         }
 
@@ -854,7 +833,7 @@ public class MainActivity extends AppCompatActivity {
             return;
         }
 
-        if (PlayerHolder.INSTANCE.isPlayerOpen()) {
+        if (PlayerHolder.getInstance().isPlayerOpen()) {
             // if the player is already open, no need for a broadcast receiver
             openMiniPlayerIfMissing();
         } else {
@@ -864,7 +843,7 @@ public class MainActivity extends AppCompatActivity {
                 public void onReceive(final Context context, final Intent intent) {
                     if (Objects.equals(intent.getAction(),
                             VideoDetailFragment.ACTION_PLAYER_STARTED)
-                            && PlayerHolder.INSTANCE.isPlayerOpen()) {
+                            && PlayerHolder.getInstance().isPlayerOpen()) {
                         openMiniPlayerIfMissing();
                         // At this point the player is added 100%, we can unregister. Other actions
                         // are useless since the fragment will not be removed after that.
@@ -875,12 +854,11 @@ public class MainActivity extends AppCompatActivity {
             };
             final IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(VideoDetailFragment.ACTION_PLAYER_STARTED);
-            ContextCompat.registerReceiver(this, broadcastReceiver, intentFilter,
-                    ContextCompat.RECEIVER_EXPORTED);
+            registerReceiver(broadcastReceiver, intentFilter);
 
             // If the PlayerHolder is not bound yet, but the service is running, try to bind to it.
             // Once the connection is established, the ACTION_PLAYER_STARTED will be sent.
-            PlayerHolder.INSTANCE.tryBindIfNeeded(this);
+            PlayerHolder.getInstance().tryBindIfNeeded(this);
         }
     }
 

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

@@ -0,0 +1,72 @@
+package org.schabi.newpipe;
+
+import static org.schabi.newpipe.database.AppDatabase.DATABASE_NAME;
+import static org.schabi.newpipe.database.Migrations.MIGRATION_1_2;
+import static org.schabi.newpipe.database.Migrations.MIGRATION_2_3;
+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;
+
+import androidx.annotation.NonNull;
+import androidx.room.Room;
+
+import org.schabi.newpipe.database.AppDatabase;
+
+public final class NewPipeDatabase {
+    private static volatile AppDatabase databaseInstance;
+
+    private NewPipeDatabase() {
+        //no instance
+    }
+
+    private static AppDatabase getDatabase(final Context context) {
+        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)
+                .build();
+    }
+
+    @NonNull
+    public static AppDatabase getInstance(@NonNull final Context context) {
+        AppDatabase result = databaseInstance;
+        if (result == null) {
+            synchronized (NewPipeDatabase.class) {
+                result = databaseInstance;
+                if (result == null) {
+                    databaseInstance = getDatabase(context);
+                    result = databaseInstance;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    public static void checkpoint() {
+        if (databaseInstance == null) {
+            throw new IllegalStateException("database is not initialized");
+        }
+        final Cursor c = databaseInstance.query("pragma wal_checkpoint(full)", null);
+        if (c.moveToFirst() && c.getInt(0) == 1) {
+            throw new RuntimeException("Checkpoint was blocked from completing");
+        }
+    }
+
+    public static void close() {
+        if (databaseInstance != null) {
+            synchronized (NewPipeDatabase.class) {
+                if (databaseInstance != null) {
+                    databaseInstance.close();
+                    databaseInstance = null;
+                }
+            }
+        }
+    }
+}

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

@@ -1,80 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe
-
-import android.content.Context
-import androidx.room.Room.databaseBuilder
-import kotlin.concurrent.Volatile
-import org.schabi.newpipe.database.AppDatabase
-import org.schabi.newpipe.database.Migrations.MIGRATION_1_2
-import org.schabi.newpipe.database.Migrations.MIGRATION_2_3
-import org.schabi.newpipe.database.Migrations.MIGRATION_3_4
-import org.schabi.newpipe.database.Migrations.MIGRATION_4_5
-import org.schabi.newpipe.database.Migrations.MIGRATION_5_6
-import org.schabi.newpipe.database.Migrations.MIGRATION_6_7
-import org.schabi.newpipe.database.Migrations.MIGRATION_7_8
-import org.schabi.newpipe.database.Migrations.MIGRATION_8_9
-
-object NewPipeDatabase {
-
-    @Volatile
-    private var databaseInstance: AppDatabase? = null
-
-    private fun getDatabase(context: Context): AppDatabase {
-        return databaseBuilder(
-            context.applicationContext,
-            AppDatabase::class.java,
-            AppDatabase.Companion.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
-        ).build()
-    }
-
-    @JvmStatic
-    fun getInstance(context: Context): AppDatabase {
-        var result = databaseInstance
-        if (result == null) {
-            synchronized(NewPipeDatabase::class.java) {
-                result = databaseInstance
-                if (result == null) {
-                    databaseInstance = getDatabase(context)
-                    result = databaseInstance
-                }
-            }
-        }
-
-        return result!!
-    }
-
-    @JvmStatic
-    fun checkpoint() {
-        checkNotNull(databaseInstance) { "database is not initialized" }
-        val c = databaseInstance!!.query("pragma wal_checkpoint(full)", null)
-        if (c.moveToFirst() && c.getInt(0) == 1) {
-            throw RuntimeException("Checkpoint was blocked from completing")
-        }
-    }
-
-    @JvmStatic
-    fun close() {
-        if (databaseInstance != null) {
-            synchronized(NewPipeDatabase::class.java) {
-                if (databaseInstance != null) {
-                    databaseInstance!!.close()
-                    databaseInstance = null
-                }
-            }
-        }
-    }
-}

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

@@ -18,10 +18,10 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import com.grack.nanojson.JsonParser
 import com.grack.nanojson.JsonParserException
-import java.io.IOException
 import org.schabi.newpipe.extractor.downloader.Response
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
 import org.schabi.newpipe.util.ReleaseVersionUtil
+import java.io.IOException
 
 class NewVersionWorker(
     context: Context,
@@ -46,8 +46,7 @@ class NewVersionWorker(
                 // Show toast stating that the app is up-to-date if the update check was manual.
                 ContextCompat.getMainExecutor(applicationContext).execute {
                     Toast.makeText(
-                        applicationContext,
-                        R.string.app_update_unavailable_toast,
+                        applicationContext, R.string.app_update_unavailable_toast,
                         Toast.LENGTH_SHORT
                     ).show()
                 }
@@ -59,11 +58,7 @@ class NewVersionWorker(
         val intent = Intent(Intent.ACTION_VIEW, apkLocationUrl?.toUri())
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         val pendingIntent = PendingIntentCompat.getActivity(
-            applicationContext,
-            0,
-            intent,
-            0,
-            false
+            applicationContext, 0, intent, 0, false
         )
         val channelId = applicationContext.getString(R.string.app_update_notification_channel_id)
         val notificationBuilder = NotificationCompat.Builder(applicationContext, channelId)
@@ -76,8 +71,7 @@ class NewVersionWorker(
             )
             .setContentText(
                 applicationContext.getString(
-                    R.string.app_update_available_notification_text,
-                    versionName
+                    R.string.app_update_available_notification_text, versionName
                 )
             )
 

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

@@ -58,10 +58,20 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.StreamingService.LinkType;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException;
+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.exceptions.GeographicRestrictionException;
+import org.schabi.newpipe.extractor.exceptions.PaidContentException;
+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;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -74,6 +84,7 @@ import org.schabi.newpipe.util.ChannelTabHelper;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -121,6 +132,7 @@ public class RouterActivity extends AppCompatActivity {
         ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
+        Localization.assureCorrectAppLanguage(this);
 
         // Pass-through touch events to background activities
         // so that our transparent window won't lock UI in the mean time
@@ -250,8 +262,7 @@ public class RouterActivity extends AppCompatActivity {
                         showUnsupportedUrlDialog(url);
                     }
                 }, throwable -> handleError(this, new ErrorInfo(throwable,
-                        UserAction.SHARE_TO_NEWPIPE, "Getting service from url: " + url,
-                        null, url))));
+                        UserAction.SHARE_TO_NEWPIPE, "Getting service from url: " + url))));
     }
 
     /**
@@ -260,19 +271,40 @@ public class RouterActivity extends AppCompatActivity {
      * @param errorInfo the error information
      */
     private static void handleError(final Context context, final ErrorInfo errorInfo) {
-        if (errorInfo.getRecaptchaUrl() != null) {
+        if (errorInfo.getThrowable() != null) {
+            errorInfo.getThrowable().printStackTrace();
+        }
+
+        if (errorInfo.getThrowable() instanceof ReCaptchaException) {
             Toast.makeText(context, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
             // Starting ReCaptcha Challenge Activity
             final Intent intent = new Intent(context, ReCaptchaActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.putExtra(ReCaptchaActivity.RECAPTCHA_URL_EXTRA, errorInfo.getRecaptchaUrl());
             context.startActivity(intent);
-        } else if (errorInfo.isReportable()) {
-            ErrorUtil.createNotification(context, errorInfo);
+        } else if (errorInfo.getThrowable() != null
+                && ExceptionUtils.isNetworkRelated(errorInfo.getThrowable())) {
+            Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof AgeRestrictedContentException) {
+            Toast.makeText(context, R.string.restricted_video_no_stream,
+                    Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof GeographicRestrictionException) {
+            Toast.makeText(context, R.string.georestricted_content, Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof PaidContentException) {
+            Toast.makeText(context, R.string.paid_content, Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof PrivateContentException) {
+            Toast.makeText(context, R.string.private_content, Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof SoundCloudGoPlusContentException) {
+            Toast.makeText(context, R.string.soundcloud_go_plus_content,
+                    Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof YoutubeMusicPremiumContentException) {
+            Toast.makeText(context, R.string.youtube_music_premium_content,
+                    Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof ContentNotAvailableException) {
+            Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
+        } else if (errorInfo.getThrowable() instanceof ContentNotSupportedException) {
+            Toast.makeText(context, R.string.content_not_supported, Toast.LENGTH_LONG).show();
         } else {
-            // this exception does not usually indicate a problem that should be reported,
-            // so just show a toast instead of the notification
-            Toast.makeText(context, errorInfo.getMessage(context), Toast.LENGTH_LONG).show();
+            ErrorUtil.createNotification(context, errorInfo);
         }
 
         if (context instanceof RouterActivity) {
@@ -316,8 +348,7 @@ public class RouterActivity extends AppCompatActivity {
         if (choiceChecker.isAvailableAndSelected(
                 R.string.video_player_key,
                 R.string.background_player_key,
-                R.string.popup_player_key,
-                R.string.enqueue_key)) {
+                R.string.popup_player_key)) {
 
             final String selectedChoice = choiceChecker.getSelectedChoiceKey();
 
@@ -330,8 +361,6 @@ public class RouterActivity extends AppCompatActivity {
                             || selectedChoice.equals(getString(R.string.popup_player_key));
             final boolean isAudioPlayerSelected =
                     selectedChoice.equals(getString(R.string.background_player_key));
-            final boolean isEnqueueSelected =
-                    selectedChoice.equals(getString(R.string.enqueue_key));
 
             if (currentLinkType != LinkType.STREAM
                     && ((isExtAudioEnabled && isAudioPlayerSelected)
@@ -348,9 +377,7 @@ public class RouterActivity extends AppCompatActivity {
 
             // Check if the service supports the choice
             if ((isVideoPlayerSelected && capabilities.contains(VIDEO))
-                    || (isAudioPlayerSelected && capabilities.contains(AUDIO))
-                    || (isEnqueueSelected && (capabilities.contains(VIDEO)
-                    || capabilities.contains(AUDIO)))) {
+                    || (isAudioPlayerSelected && capabilities.contains(AUDIO))) {
                 handleChoice(selectedChoice);
             } else {
                 handleChoice(getString(R.string.show_info_key));
@@ -361,9 +388,15 @@ public class RouterActivity extends AppCompatActivity {
         // Default / Ask always
         final List<AdapterChoiceItem> availableChoices = choiceChecker.getAvailableChoices();
         switch (availableChoices.size()) {
-            case 1 -> handleChoice(availableChoices.get(0).key);
-            case 0 -> handleChoice(getString(R.string.show_info_key));
-            default -> showDialog(availableChoices);
+            case 1:
+                handleChoice(availableChoices.get(0).key);
+                break;
+            case 0:
+                handleChoice(getString(R.string.show_info_key));
+                break;
+            default:
+                showDialog(availableChoices);
+                break;
         }
     }
 
@@ -525,7 +558,7 @@ public class RouterActivity extends AppCompatActivity {
         final List<StreamingService.ServiceInfo.MediaCapability> capabilities =
                 service.getServiceInfo().getMediaCapabilities();
 
-        if (linkType == LinkType.STREAM || linkType == LinkType.PLAYLIST) {
+        if (linkType == LinkType.STREAM) {
             if (capabilities.contains(VIDEO)) {
                 returnedItems.add(videoPlayer);
                 returnedItems.add(popupPlayer);
@@ -533,28 +566,17 @@ public class RouterActivity extends AppCompatActivity {
             if (capabilities.contains(AUDIO)) {
                 returnedItems.add(backgroundPlayer);
             }
+            // download is redundant for linkType CHANNEL AND PLAYLIST (till playlist downloading is
+            // not supported )
+            returnedItems.add(new AdapterChoiceItem(getString(R.string.download_key),
+                    getString(R.string.download),
+                    R.drawable.ic_file_download));
 
-            // Enqueue is only shown if the current queue is not empty.
-            // However, if the playqueue or the player is cleared after this item was chosen and
-            // while the item is extracted, it will automatically fall back to background player.
-            if (PlayerHolder.INSTANCE.getQueueSize() > 0) {
-                returnedItems.add(new AdapterChoiceItem(getString(R.string.enqueue_key),
-                        getString(R.string.enqueue_stream), R.drawable.ic_add));
-            }
-
-            if (linkType == LinkType.STREAM) {
-                // download is redundant for linkType CHANNEL AND PLAYLIST
-                // (till playlist downloading is not supported )
-                returnedItems.add(new AdapterChoiceItem(getString(R.string.download_key),
-                        getString(R.string.download),
-                        R.drawable.ic_file_download));
-
-                // Add to playlist is not necessary for CHANNEL and PLAYLIST linkType
-                // since those can not be added to a playlist
-                returnedItems.add(new AdapterChoiceItem(getString(R.string.add_to_playlist_key),
-                        getString(R.string.add_to_playlist),
-                        R.drawable.ic_playlist_add));
-            }
+            // Add to playlist is not necessary for CHANNEL and PLAYLIST linkType since those can
+            // not be added to a playlist
+            returnedItems.add(new AdapterChoiceItem(getString(R.string.add_to_playlist_key),
+                    getString(R.string.add_to_playlist),
+                    R.drawable.ic_add));
         } else {
             // LinkType.NONE is never present because it's filtered out before
             // channels and playlist can be played as they contain a list of videos
@@ -645,8 +667,7 @@ public class RouterActivity extends AppCompatActivity {
                         startActivity(intent);
                         finish();
                     }, throwable -> handleError(this, new ErrorInfo(throwable,
-                            UserAction.SHARE_TO_NEWPIPE, "Starting info activity: " + currentUrl,
-                            null, currentUrl)))
+                            UserAction.SHARE_TO_NEWPIPE, "Starting info activity: " + currentUrl)))
             );
             return;
         }
@@ -680,7 +701,7 @@ public class RouterActivity extends AppCompatActivity {
         }
 
         // ...the player is not running or in normal Video-mode/type
-        final PlayerType playerType = PlayerHolder.INSTANCE.getType();
+        final PlayerType playerType = PlayerHolder.getInstance().getType();
         return playerType == null || playerType == PlayerType.MAIN;
     }
 
@@ -833,10 +854,10 @@ public class RouterActivity extends AppCompatActivity {
                                             })
                                     )),
                             throwable -> runOnVisible(ctx -> handleError(ctx, new ErrorInfo(
-                                    throwable, UserAction.REQUESTED_STREAM,
+                                    throwable,
+                                    UserAction.REQUESTED_STREAM,
                                     "Tried to add " + currentUrl + " to a playlist",
-                                    ((RouterActivity) ctx).currentService.getServiceId(),
-                                    currentUrl)
+                                    ((RouterActivity) ctx).currentService.getServiceId())
                             ))
                     )
             );
@@ -976,7 +997,7 @@ public class RouterActivity extends AppCompatActivity {
                             }
                         }, throwable -> handleError(this, new ErrorInfo(throwable, finalUserAction,
                                 choice.url + " opened with " + choice.playerChoice,
-                                choice.serviceId, choice.url)));
+                                choice.serviceId)));
             }
         }
 
@@ -1026,8 +1047,6 @@ public class RouterActivity extends AppCompatActivity {
                     NavigationHelper.playOnBackgroundPlayer(this, playQueue, true);
                 } else if (choice.playerChoice.equals(popupPlayerKey)) {
                     NavigationHelper.playOnPopupPlayer(this, playQueue, true);
-                } else if (choice.playerChoice.equals(getString(R.string.enqueue_key))) {
-                    NavigationHelper.enqueueOnPlayer(this, playQueue);
                 }
             };
         }

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

@@ -9,9 +9,11 @@ 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.util.Localization
 
 class AboutActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        Localization.assureCorrectAppLanguage(this)
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 

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

@@ -0,0 +1,65 @@
+package org.schabi.newpipe.database;
+
+import static org.schabi.newpipe.database.Migrations.DB_VER_9;
+
+import androidx.room.Database;
+import androidx.room.RoomDatabase;
+import androidx.room.TypeConverters;
+
+import org.schabi.newpipe.database.feed.dao.FeedDAO;
+import org.schabi.newpipe.database.feed.dao.FeedGroupDAO;
+import org.schabi.newpipe.database.feed.model.FeedEntity;
+import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
+import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity;
+import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity;
+import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
+import org.schabi.newpipe.database.history.dao.StreamHistoryDAO;
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
+import org.schabi.newpipe.database.playlist.dao.PlaylistDAO;
+import org.schabi.newpipe.database.playlist.dao.PlaylistRemoteDAO;
+import org.schabi.newpipe.database.playlist.dao.PlaylistStreamDAO;
+import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
+import org.schabi.newpipe.database.stream.dao.StreamDAO;
+import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.database.subscription.SubscriptionDAO;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+
+@TypeConverters({Converters.class})
+@Database(
+        entities = {
+                SubscriptionEntity.class, SearchHistoryEntry.class,
+                StreamEntity.class, StreamHistoryEntity.class, StreamStateEntity.class,
+                PlaylistEntity.class, PlaylistStreamEntity.class, PlaylistRemoteEntity.class,
+                FeedEntity.class, FeedGroupEntity.class, FeedGroupSubscriptionEntity.class,
+                FeedLastUpdatedEntity.class
+        },
+        version = DB_VER_9
+)
+public abstract class AppDatabase extends RoomDatabase {
+    public static final String DATABASE_NAME = "newpipe.db";
+
+    public abstract SearchHistoryDAO searchHistoryDAO();
+
+    public abstract StreamDAO streamDAO();
+
+    public abstract StreamHistoryDAO streamHistoryDAO();
+
+    public abstract StreamStateDAO streamStateDAO();
+
+    public abstract PlaylistDAO playlistDAO();
+
+    public abstract PlaylistStreamDAO playlistStreamDAO();
+
+    public abstract PlaylistRemoteDAO playlistRemoteDAO();
+
+    public abstract FeedDAO feedDAO();
+
+    public abstract FeedGroupDAO feedGroupDAO();
+
+    public abstract SubscriptionDAO subscriptionDAO();
+}

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

@@ -1,68 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import org.schabi.newpipe.database.feed.dao.FeedDAO
-import org.schabi.newpipe.database.feed.dao.FeedGroupDAO
-import org.schabi.newpipe.database.feed.model.FeedEntity
-import org.schabi.newpipe.database.feed.model.FeedGroupEntity
-import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity
-import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
-import org.schabi.newpipe.database.history.dao.SearchHistoryDAO
-import org.schabi.newpipe.database.history.dao.StreamHistoryDAO
-import org.schabi.newpipe.database.history.model.SearchHistoryEntry
-import org.schabi.newpipe.database.history.model.StreamHistoryEntity
-import org.schabi.newpipe.database.playlist.dao.PlaylistDAO
-import org.schabi.newpipe.database.playlist.dao.PlaylistRemoteDAO
-import org.schabi.newpipe.database.playlist.dao.PlaylistStreamDAO
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity
-import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity
-import org.schabi.newpipe.database.stream.dao.StreamDAO
-import org.schabi.newpipe.database.stream.dao.StreamStateDAO
-import org.schabi.newpipe.database.stream.model.StreamEntity
-import org.schabi.newpipe.database.stream.model.StreamStateEntity
-import org.schabi.newpipe.database.subscription.SubscriptionDAO
-import org.schabi.newpipe.database.subscription.SubscriptionEntity
-
-@TypeConverters(Converters::class)
-@Database(
-    version = Migrations.DB_VER_9,
-    entities = [
-        SubscriptionEntity::class,
-        SearchHistoryEntry::class,
-        StreamEntity::class,
-        StreamHistoryEntity::class,
-        StreamStateEntity::class,
-        PlaylistEntity::class,
-        PlaylistStreamEntity::class,
-        PlaylistRemoteEntity::class,
-        FeedEntity::class,
-        FeedGroupEntity::class,
-        FeedGroupSubscriptionEntity::class,
-        FeedLastUpdatedEntity::class
-    ]
-)
-abstract class AppDatabase : RoomDatabase() {
-    abstract fun feedDAO(): FeedDAO
-    abstract fun feedGroupDAO(): FeedGroupDAO
-    abstract fun playlistDAO(): PlaylistDAO
-    abstract fun playlistRemoteDAO(): PlaylistRemoteDAO
-    abstract fun playlistStreamDAO(): PlaylistStreamDAO
-    abstract fun searchHistoryDAO(): SearchHistoryDAO
-    abstract fun streamDAO(): StreamDAO
-    abstract fun streamHistoryDAO(): StreamHistoryDAO
-    abstract fun streamStateDAO(): StreamStateDAO
-    abstract fun subscriptionDAO(): SubscriptionDAO
-
-    companion object {
-        const val DATABASE_NAME: String = "newpipe.db"
-    }
-}

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

@@ -0,0 +1,39 @@
+package org.schabi.newpipe.database;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Update;
+
+import java.util.Collection;
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+
+@Dao
+public interface BasicDAO<Entity> {
+    /* Inserts */
+    @Insert
+    long insert(Entity entity);
+
+    @Insert
+    List<Long> insertAll(Collection<Entity> entities);
+
+    /* Searches */
+    Flowable<List<Entity>> getAll();
+
+    Flowable<List<Entity>> listByService(int serviceId);
+
+    /* Deletes */
+    @Delete
+    void delete(Entity entity);
+
+    int deleteAll();
+
+    /* Updates */
+    @Update
+    int update(Entity entity);
+
+    @Update
+    void update(Collection<Entity> entities);
+}

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

@@ -1,42 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2022 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Update
-import io.reactivex.rxjava3.core.Flowable
-
-@Dao
-interface BasicDAO<Entity> {
-
-    /* Inserts */
-    @Insert
-    fun insert(entity: Entity): Long
-
-    @Insert
-    fun insertAll(entities: Collection<Entity>): List<Long>
-
-    /* Searches */
-    fun getAll(): Flowable<List<Entity>>
-
-    fun listByService(serviceId: Int): Flowable<List<Entity>>
-
-    /* Deletes */
-    @Delete
-    fun delete(entity: Entity)
-
-    fun deleteAll(): Int
-
-    /* Updates */
-    @Update
-    fun update(entity: Entity): Int
-
-    @Update
-    fun update(entities: Collection<Entity>)
-}

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

@@ -1,11 +1,11 @@
 package org.schabi.newpipe.database
 
 import androidx.room.TypeConverter
+import org.schabi.newpipe.extractor.stream.StreamType
+import org.schabi.newpipe.local.subscription.FeedGroupIcon
 import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
-import org.schabi.newpipe.extractor.stream.StreamType
-import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
 class Converters {
     /**

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

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.database;
+
+public interface LocalItem {
+    LocalItemType getLocalItemType();
+
+    enum LocalItemType {
+        PLAYLIST_LOCAL_ITEM,
+        PLAYLIST_REMOTE_ITEM,
+
+        PLAYLIST_STREAM_ITEM,
+        STATISTIC_STREAM_ITEM,
+    }
+}

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

@@ -1,19 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2020 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database
-
-interface LocalItem {
-    val localItemType: LocalItemType
-
-    enum class LocalItemType {
-        PLAYLIST_LOCAL_ITEM,
-        PLAYLIST_REMOTE_ITEM,
-
-        PLAYLIST_STREAM_ITEM,
-        STATISTIC_STREAM_ITEM
-    }
-}

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

@@ -0,0 +1,307 @@
+package org.schabi.newpipe.database;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+
+import org.schabi.newpipe.MainActivity;
+
+public final class Migrations {
+
+    /////////////////////////////////////////////////////////////////////////////
+    //  Test new migrations manually by importing a database from daily usage  //
+    //  and checking if the migration works (Use the Database Inspector        //
+    //  https://developer.android.com/studio/inspect/database).                //
+    //  If you add a migration point it out in the pull request, so that       //
+    //  others remember to test it themselves.                                 //
+    /////////////////////////////////////////////////////////////////////////////
+
+    public static final int DB_VER_1 = 1;
+    public static final int DB_VER_2 = 2;
+    public static final int DB_VER_3 = 3;
+    public static final int DB_VER_4 = 4;
+    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;
+
+    public static final Migration MIGRATION_1_2 = new Migration(DB_VER_1, DB_VER_2) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            if (DEBUG) {
+                Log.d(TAG, "Start migrating database");
+            }
+            /*
+             * Unfortunately these queries must be hardcoded due to the possibility of
+             * schema and names changing at a later date, thus invalidating the older migration
+             * scripts if they are not hardcoded.
+             * */
+
+            // Not much we can do about this, since room doesn't create tables before migration.
+            // It's either this or blasting the entire database anew.
+            database.execSQL("CREATE  INDEX `index_search_history_search` "
+                    + "ON `search_history` (`search`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `streams` "
+                    + "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
+                    + "`service_id` INTEGER NOT NULL, `url` TEXT, `title` TEXT, "
+                    + "`stream_type` TEXT, `duration` INTEGER, `uploader` TEXT, "
+                    + "`thumbnail_url` TEXT)");
+            database.execSQL("CREATE UNIQUE INDEX `index_streams_service_id_url` "
+                    + "ON `streams` (`service_id`, `url`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `stream_history` "
+                    + "(`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 )");
+            database.execSQL("CREATE  INDEX `index_stream_history_stream_id` "
+                    + "ON `stream_history` (`stream_id`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `stream_state` "
+                    + "(`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 )");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `playlists` "
+                    + "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
+                    + "`name` TEXT, `thumbnail_url` TEXT)");
+            database.execSQL("CREATE  INDEX `index_playlists_name` ON `playlists` (`name`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `playlist_stream_join` "
+                    + "(`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)");
+            database.execSQL("CREATE UNIQUE INDEX "
+                    + "`index_playlist_stream_join_playlist_id_join_index` "
+                    + "ON `playlist_stream_join` (`playlist_id`, `join_index`)");
+            database.execSQL("CREATE  INDEX `index_playlist_stream_join_stream_id` "
+                    + "ON `playlist_stream_join` (`stream_id`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `remote_playlists` "
+                    + "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
+                    + "`service_id` INTEGER NOT NULL, `name` TEXT, `url` TEXT, "
+                    + "`thumbnail_url` TEXT, `uploader` TEXT, `stream_count` INTEGER)");
+            database.execSQL("CREATE  INDEX `index_remote_playlists_name` "
+                    + "ON `remote_playlists` (`name`)");
+            database.execSQL("CREATE UNIQUE INDEX `index_remote_playlists_service_id_url` "
+                    + "ON `remote_playlists` (`service_id`, `url`)");
+
+            // Populate streams table with existing entries in watch history
+            // Latest data first, thus ignoring older entries with the same indices
+            database.execSQL("INSERT OR IGNORE INTO streams (service_id, url, title, "
+                    + "stream_type, duration, uploader, thumbnail_url) "
+
+                    + "SELECT service_id, url, title, 'VIDEO_STREAM', duration, "
+                    + "uploader, thumbnail_url "
+
+                    + "FROM watch_history "
+                    + "ORDER BY creation_date DESC");
+
+            // Once the streams have PKs, join them with the normalized history table
+            // and populate it with the remaining data from watch history
+            database.execSQL("INSERT INTO stream_history (stream_id, access_date, repeat_count)"
+                    + "SELECT uid, creation_date, 1 "
+                    + "FROM watch_history INNER JOIN streams "
+                    + "ON watch_history.service_id == streams.service_id "
+                    + "AND watch_history.url == streams.url "
+                    + "ORDER BY creation_date DESC");
+
+            database.execSQL("DROP TABLE IF EXISTS watch_history");
+
+            if (DEBUG) {
+                Log.d(TAG, "Stop migrating database");
+            }
+        }
+    };
+
+    public static final Migration MIGRATION_2_3 = new Migration(DB_VER_2, DB_VER_3) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            // Add NOT NULLs and new fields
+            database.execSQL("CREATE TABLE IF NOT EXISTS streams_new "
+                    + "(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, thumbnail_url TEXT, view_count INTEGER, "
+                    + "textual_upload_date TEXT, upload_date INTEGER, "
+                    + "is_upload_date_approximation INTEGER)");
+
+            database.execSQL("INSERT INTO streams_new (uid, service_id, url, title, stream_type, "
+                    + "duration, uploader, thumbnail_url, view_count, textual_upload_date, "
+                    + "upload_date, is_upload_date_approximation) "
+
+                    + "SELECT uid, service_id, url, ifnull(title, ''), "
+                    + "ifnull(stream_type, 'VIDEO_STREAM'), ifnull(duration, 0), "
+                    + "ifnull(uploader, ''), ifnull(thumbnail_url, ''), NULL, NULL, NULL, NULL "
+
+                    + "FROM streams WHERE url IS NOT NULL");
+
+            database.execSQL("DROP TABLE streams");
+            database.execSQL("ALTER TABLE streams_new RENAME TO streams");
+            database.execSQL("CREATE UNIQUE INDEX index_streams_service_id_url "
+                    + "ON streams (service_id, url)");
+
+            // Tables for feed feature
+            database.execSQL("CREATE TABLE IF NOT EXISTS feed "
+                    + "(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)");
+            database.execSQL("CREATE INDEX index_feed_subscription_id ON feed (subscription_id)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS feed_group "
+                    + "(uid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, name TEXT NOT NULL, "
+                    + "icon_id INTEGER NOT NULL, sort_order INTEGER NOT NULL)");
+            database.execSQL("CREATE INDEX index_feed_group_sort_order ON feed_group (sort_order)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS feed_group_subscription_join "
+                    + "(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)");
+            database.execSQL("CREATE INDEX index_feed_group_subscription_join_subscription_id "
+                    + "ON feed_group_subscription_join (subscription_id)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS feed_last_updated "
+                    + "(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)");
+        }
+    };
+
+    public static final Migration MIGRATION_3_4 = new Migration(DB_VER_3, DB_VER_4) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            database.execSQL(
+                    "ALTER TABLE streams ADD COLUMN uploader_url TEXT"
+            );
+        }
+    };
+
+    public static final Migration MIGRATION_4_5 = new Migration(DB_VER_4, DB_VER_5) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE `subscriptions` ADD COLUMN `notification_mode` "
+                    + "INTEGER NOT NULL DEFAULT 0");
+        }
+    };
+
+    public static final Migration MIGRATION_5_6 = new Migration(DB_VER_5, DB_VER_6) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE `playlists` ADD COLUMN `is_thumbnail_permanent` "
+                    + "INTEGER NOT NULL DEFAULT 0");
+        }
+    };
+
+    public static final Migration MIGRATION_6_7 = new Migration(DB_VER_6, DB_VER_7) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            // Create a new column thumbnail_stream_id
+            database.execSQL("ALTER TABLE `playlists` ADD COLUMN `thumbnail_stream_id` "
+                    + "INTEGER NOT NULL DEFAULT -1");
+
+            // Migrate the thumbnail_url to the thumbnail_stream_id
+            database.execSQL("UPDATE playlists SET thumbnail_stream_id = ("
+                    + " SELECT CASE WHEN COUNT(*) != 0 then stream_uid ELSE -1 END"
+                    + " FROM ("
+                    + " SELECT p.uid AS playlist_uid, s.uid AS stream_uid"
+                    + " FROM playlists p"
+                    + " LEFT JOIN playlist_stream_join ps ON p.uid = ps.playlist_id"
+                    + " LEFT JOIN streams s ON s.uid = ps.stream_id"
+                    + " WHERE s.thumbnail_url = p.thumbnail_url) AS temporary_table"
+                    + " WHERE playlist_uid = playlists.uid)");
+
+            // Remove the thumbnail_url field in the playlist table
+            database.execSQL("CREATE TABLE IF NOT EXISTS `playlists_new`"
+                    + "(uid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
+                    + "name TEXT, "
+                    + "is_thumbnail_permanent INTEGER NOT NULL, "
+                    + "thumbnail_stream_id INTEGER NOT NULL)");
+
+            database.execSQL("INSERT INTO playlists_new"
+                    + " SELECT uid, name, is_thumbnail_permanent, thumbnail_stream_id "
+                    + " FROM playlists");
+
+
+            database.execSQL("DROP TABLE playlists");
+            database.execSQL("ALTER TABLE playlists_new RENAME TO playlists");
+            database.execSQL("CREATE INDEX IF NOT EXISTS "
+                    + "`index_playlists_name` ON `playlists` (`name`)");
+        }
+    };
+
+    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/Migrations.kt

@@ -1,351 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database
-
-import android.util.Log
-import androidx.room.migration.Migration
-import org.schabi.newpipe.MainActivity
-
-object Migrations {
-
-    // /////////////////////////////////////////////////////////////////////// //
-    //  Test new migrations manually by importing a database from daily usage  //
-    //  and checking if the migration works (Use the Database Inspector        //
-    //  https://developer.android.com/studio/inspect/database).                //
-    //  If you add a migration point it out in the pull request, so that       //
-    //  others remember to test it themselves.                                 //
-    // /////////////////////////////////////////////////////////////////////// //
-
-    const val DB_VER_1 = 1
-    const val DB_VER_2 = 2
-    const val DB_VER_3 = 3
-    const val DB_VER_4 = 4
-    const val DB_VER_5 = 5
-    const val DB_VER_6 = 6
-    const val DB_VER_7 = 7
-    const val DB_VER_8 = 8
-    const val DB_VER_9 = 9
-
-    private val TAG = Migrations::class.java.getName()
-    private val isDebug = MainActivity.DEBUG
-
-    val MIGRATION_1_2 = Migration(DB_VER_1, DB_VER_2) { db ->
-        if (isDebug) {
-            Log.d(TAG, "Start migrating database")
-        }
-
-        /*
-         * Unfortunately these queries must be hardcoded due to the possibility of
-         * schema and names changing at a later date, thus invalidating the older migration
-         * scripts if they are not hardcoded.
-         * */
-
-        // Not much we can do about this, since room doesn't create tables before migration.
-        // It's either this or blasting the entire database anew.
-        db.execSQL(
-            "CREATE  INDEX `index_search_history_search` " +
-                "ON `search_history` (`search`)"
-        )
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `streams` " +
-                "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
-                "`service_id` INTEGER NOT NULL, `url` TEXT, `title` TEXT, " +
-                "`stream_type` TEXT, `duration` INTEGER, `uploader` TEXT, " +
-                "`thumbnail_url` TEXT)"
-        )
-        db.execSQL(
-            "CREATE UNIQUE INDEX `index_streams_service_id_url` " +
-                "ON `streams` (`service_id`, `url`)"
-        )
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `stream_history` " +
-                "(`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 )"
-        )
-        db.execSQL(
-            "CREATE  INDEX `index_stream_history_stream_id` " +
-                "ON `stream_history` (`stream_id`)"
-        )
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `stream_state` " +
-                "(`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 )"
-        )
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `playlists` " +
-                "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
-                "`name` TEXT, `thumbnail_url` TEXT)"
-        )
-        db.execSQL("CREATE  INDEX `index_playlists_name` ON `playlists` (`name`)")
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `playlist_stream_join` " +
-                "(`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)"
-        )
-        db.execSQL(
-            "CREATE UNIQUE INDEX " +
-                "`index_playlist_stream_join_playlist_id_join_index` " +
-                "ON `playlist_stream_join` (`playlist_id`, `join_index`)"
-        )
-        db.execSQL(
-            "CREATE  INDEX `index_playlist_stream_join_stream_id` " +
-                "ON `playlist_stream_join` (`stream_id`)"
-        )
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `remote_playlists` " +
-                "(`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
-                "`service_id` INTEGER NOT NULL, `name` TEXT, `url` TEXT, " +
-                "`thumbnail_url` TEXT, `uploader` TEXT, `stream_count` INTEGER)"
-        )
-        db.execSQL(
-            "CREATE  INDEX `index_remote_playlists_name` " +
-                "ON `remote_playlists` (`name`)"
-        )
-        db.execSQL(
-            "CREATE UNIQUE INDEX `index_remote_playlists_service_id_url` " +
-                "ON `remote_playlists` (`service_id`, `url`)"
-        )
-
-        // Populate streams table with existing entries in watch history
-        // Latest data first, thus ignoring older entries with the same indices
-        db.execSQL(
-            "INSERT OR IGNORE INTO streams (service_id, url, title, " +
-                "stream_type, duration, uploader, thumbnail_url) " +
-
-                "SELECT service_id, url, title, 'VIDEO_STREAM', duration, " +
-                "uploader, thumbnail_url " +
-
-                "FROM watch_history " +
-                "ORDER BY creation_date DESC"
-        )
-
-        // Once the streams have PKs, join them with the normalized history table
-        // and populate it with the remaining data from watch history
-        db.execSQL(
-            "INSERT INTO stream_history (stream_id, access_date, repeat_count)" +
-                "SELECT uid, creation_date, 1 " +
-                "FROM watch_history INNER JOIN streams " +
-                "ON watch_history.service_id == streams.service_id " +
-                "AND watch_history.url == streams.url " +
-                "ORDER BY creation_date DESC"
-        )
-
-        db.execSQL("DROP TABLE IF EXISTS watch_history")
-
-        if (isDebug) {
-            Log.d(TAG, "Stop migrating database")
-        }
-    }
-
-    val MIGRATION_2_3 = Migration(DB_VER_2, DB_VER_3) { db ->
-        // Add NOT NULLs and new fields
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS streams_new " +
-                "(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, thumbnail_url TEXT, view_count INTEGER, " +
-                "textual_upload_date TEXT, upload_date INTEGER, " +
-                "is_upload_date_approximation INTEGER)"
-        )
-
-        db.execSQL(
-            "INSERT INTO streams_new (uid, service_id, url, title, stream_type, " +
-                "duration, uploader, thumbnail_url, view_count, textual_upload_date, " +
-                "upload_date, is_upload_date_approximation) " +
-
-                "SELECT uid, service_id, url, ifnull(title, ''), " +
-                "ifnull(stream_type, 'VIDEO_STREAM'), ifnull(duration, 0), " +
-                "ifnull(uploader, ''), ifnull(thumbnail_url, ''), NULL, NULL, NULL, NULL " +
-
-                "FROM streams WHERE url IS NOT NULL"
-        )
-
-        db.execSQL("DROP TABLE streams")
-        db.execSQL("ALTER TABLE streams_new RENAME TO streams")
-        db.execSQL(
-            "CREATE UNIQUE INDEX index_streams_service_id_url " +
-                "ON streams (service_id, url)"
-        )
-
-        // Tables for feed feature
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS feed " +
-                "(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)"
-        )
-        db.execSQL("CREATE INDEX index_feed_subscription_id ON feed (subscription_id)")
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS feed_group " +
-                "(uid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, name TEXT NOT NULL, " +
-                "icon_id INTEGER NOT NULL, sort_order INTEGER NOT NULL)"
-        )
-        db.execSQL("CREATE INDEX index_feed_group_sort_order ON feed_group (sort_order)")
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS feed_group_subscription_join " +
-                "(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)"
-        )
-        db.execSQL(
-            "CREATE INDEX index_feed_group_subscription_join_subscription_id " +
-                "ON feed_group_subscription_join (subscription_id)"
-        )
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS feed_last_updated " +
-                "(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)"
-        )
-    }
-
-    val MIGRATION_3_4 = Migration(DB_VER_3, DB_VER_4) { db ->
-        db.execSQL("ALTER TABLE streams ADD COLUMN uploader_url TEXT")
-    }
-
-    val MIGRATION_4_5 = Migration(DB_VER_4, DB_VER_5) { db ->
-        db.execSQL(
-            "ALTER TABLE `subscriptions` ADD COLUMN `notification_mode` " +
-                "INTEGER NOT NULL DEFAULT 0"
-        )
-    }
-
-    val MIGRATION_5_6 = Migration(DB_VER_5, DB_VER_6) { db ->
-        db.execSQL(
-            "ALTER TABLE `playlists` ADD COLUMN `is_thumbnail_permanent` " +
-                "INTEGER NOT NULL DEFAULT 0"
-        )
-    }
-
-    val MIGRATION_6_7 = Migration(DB_VER_6, DB_VER_7) { db ->
-        // Create a new column thumbnail_stream_id
-        db.execSQL(
-            "ALTER TABLE `playlists` ADD COLUMN `thumbnail_stream_id` " +
-                "INTEGER NOT NULL DEFAULT -1"
-        )
-
-        // Migrate the thumbnail_url to the thumbnail_stream_id
-        db.execSQL(
-            "UPDATE playlists SET thumbnail_stream_id = (" +
-                " SELECT CASE WHEN COUNT(*) != 0 then stream_uid ELSE -1 END" +
-                " FROM (" +
-                " SELECT p.uid AS playlist_uid, s.uid AS stream_uid" +
-                " FROM playlists p" +
-                " LEFT JOIN playlist_stream_join ps ON p.uid = ps.playlist_id" +
-                " LEFT JOIN streams s ON s.uid = ps.stream_id" +
-                " WHERE s.thumbnail_url = p.thumbnail_url) AS temporary_table" +
-                " WHERE playlist_uid = playlists.uid)"
-        )
-
-        // Remove the thumbnail_url field in the playlist table
-        db.execSQL(
-            "CREATE TABLE IF NOT EXISTS `playlists_new`" +
-                "(uid INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
-                "name TEXT, " +
-                "is_thumbnail_permanent INTEGER NOT NULL, " +
-                "thumbnail_stream_id INTEGER NOT NULL)"
-        )
-
-        db.execSQL(
-            "INSERT INTO playlists_new" +
-                " SELECT uid, name, is_thumbnail_permanent, thumbnail_stream_id " +
-                " FROM playlists"
-        )
-
-        db.execSQL("DROP TABLE playlists")
-        db.execSQL("ALTER TABLE playlists_new RENAME TO playlists")
-        db.execSQL(
-            "CREATE INDEX IF NOT EXISTS " +
-                "`index_playlists_name` ON `playlists` (`name`)"
-        )
-    }
-
-    val MIGRATION_7_8 = Migration(DB_VER_7, DB_VER_8) { db ->
-        db.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)"
-        )
-        db.execSQL("UPDATE search_history SET search = trim(search)")
-    }
-
-    val MIGRATION_8_9 = Migration(DB_VER_8, DB_VER_9) { db ->
-        try {
-            db.beginTransaction()
-
-            // Update playlists.
-            // Create a temp table to initialize display_index.
-            db.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)"
-            )
-            db.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.
-            db.execSQL("DROP TABLE `playlists`")
-            db.execSQL("ALTER TABLE `playlists_tmp` RENAME TO `playlists`")
-
-            // Update remote_playlists.
-            // Create a temp table to initialize display_index.
-            db.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)"
-            )
-            db.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.
-            db.execSQL("DROP TABLE `remote_playlists`")
-            db.execSQL("ALTER TABLE `remote_playlists_tmp` RENAME TO `remote_playlists`")
-
-            // Create index on the new table.
-            db.execSQL(
-                "CREATE UNIQUE INDEX `index_remote_playlists_service_id_url` " +
-                    "ON `remote_playlists` (`service_id`, `url`)"
-            )
-
-            db.setTransactionSuccessful()
-        } finally {
-            db.endTransaction()
-        }
-    }
-}

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

@@ -8,7 +8,6 @@ import androidx.room.Transaction
 import androidx.room.Update
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.feed.model.FeedEntity
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
@@ -16,6 +15,7 @@ import org.schabi.newpipe.database.stream.StreamWithState
 import org.schabi.newpipe.database.stream.model.StreamStateEntity
 import org.schabi.newpipe.database.subscription.NotificationMode
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
+import java.time.OffsetDateTime
 
 @Dao
 abstract class FeedDAO {
@@ -168,10 +168,10 @@ abstract class FeedDAO {
         ON fgs.subscription_id = lu.subscription_id AND fgs.group_id = :groupId
         """
     )
-    abstract fun oldestSubscriptionUpdate(groupId: Long): Flowable<List<OffsetDateTime?>>
+    abstract fun oldestSubscriptionUpdate(groupId: Long): Flowable<List<OffsetDateTime>>
 
     @Query("SELECT MIN(last_updated) FROM feed_last_updated")
-    abstract fun oldestSubscriptionUpdateFromAll(): Flowable<List<OffsetDateTime?>>
+    abstract fun oldestSubscriptionUpdateFromAll(): Flowable<List<OffsetDateTime>>
 
     @Query("SELECT COUNT(*) FROM feed_last_updated WHERE last_updated IS NULL")
     abstract fun notLoadedCount(): Flowable<Long>

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

@@ -19,17 +19,13 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity
             entity = StreamEntity::class,
             parentColumns = [StreamEntity.STREAM_ID],
             childColumns = [STREAM_ID],
-            onDelete = ForeignKey.CASCADE,
-            onUpdate = ForeignKey.CASCADE,
-            deferred = true
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
         ),
         ForeignKey(
             entity = SubscriptionEntity::class,
             parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
             childColumns = [SUBSCRIPTION_ID],
-            onDelete = ForeignKey.CASCADE,
-            onUpdate = ForeignKey.CASCADE,
-            deferred = true
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
         )
     ]
 )

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

@@ -18,18 +18,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 = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
         ),
 
         ForeignKey(
             entity = SubscriptionEntity::class,
             parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
             childColumns = [SUBSCRIPTION_ID],
-            onDelete = ForeignKey.CASCADE,
-            onUpdate = ForeignKey.CASCADE,
-            deferred = true
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
         )
     ]
 )

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

@@ -4,10 +4,10 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.FEED_LAST_UPDATED_TABLE
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.SUBSCRIPTION_ID
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
+import java.time.OffsetDateTime
 
 @Entity(
     tableName = FEED_LAST_UPDATED_TABLE,
@@ -16,9 +16,7 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity
             entity = SubscriptionEntity::class,
             parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
             childColumns = [SUBSCRIPTION_ID],
-            onDelete = ForeignKey.CASCADE,
-            onUpdate = ForeignKey.CASCADE,
-            deferred = true
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
         )
     ]
 )

app/src/main/java/org/schabi/newpipe/database/history/dao/HistoryDAO.java

@@ -0,0 +1,7 @@
+package org.schabi.newpipe.database.history.dao;
+
+import org.schabi.newpipe.database.BasicDAO;
+
+public interface HistoryDAO<T> extends BasicDAO<T> {
+    T getLatestEntry();
+}

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java

@@ -0,0 +1,52 @@
+package org.schabi.newpipe.database.history.dao;
+
+import androidx.annotation.Nullable;
+import androidx.room.Dao;
+import androidx.room.Query;
+
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.CREATION_DATE;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.ID;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SEARCH;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SERVICE_ID;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.TABLE_NAME;
+
+@Dao
+public interface SearchHistoryDAO extends HistoryDAO<SearchHistoryEntry> {
+    String ORDER_BY_CREATION_DATE = " ORDER BY " + CREATION_DATE + " DESC";
+    String ORDER_BY_MAX_CREATION_DATE = " ORDER BY MAX(" + CREATION_DATE + ") DESC";
+
+    @Query("SELECT * FROM " + TABLE_NAME
+            + " WHERE " + ID + " = (SELECT MAX(" + ID + ") FROM " + TABLE_NAME + ")")
+    @Nullable
+    SearchHistoryEntry getLatestEntry();
+
+    @Query("DELETE FROM " + TABLE_NAME)
+    @Override
+    int deleteAll();
+
+    @Query("DELETE FROM " + TABLE_NAME + " WHERE " + SEARCH + " = :query")
+    int deleteAllWhereQuery(String query);
+
+    @Query("SELECT * FROM " + TABLE_NAME + ORDER_BY_CREATION_DATE)
+    @Override
+    Flowable<List<SearchHistoryEntry>> getAll();
+
+    @Query("SELECT " + SEARCH + " FROM " + TABLE_NAME + " GROUP BY " + SEARCH
+            + ORDER_BY_MAX_CREATION_DATE + " LIMIT :limit")
+    Flowable<List<String>> getUniqueEntries(int limit);
+
+    @Query("SELECT * FROM " + TABLE_NAME
+            + " WHERE " + SERVICE_ID + " = :serviceId" + ORDER_BY_CREATION_DATE)
+    @Override
+    Flowable<List<SearchHistoryEntry>> listByService(int serviceId);
+
+    @Query("SELECT " + SEARCH + " FROM " + TABLE_NAME + " WHERE " + SEARCH + " LIKE :query || '%'"
+            + " GROUP BY " + SEARCH + ORDER_BY_MAX_CREATION_DATE + " LIMIT :limit")
+    Flowable<List<String>> getSimilarEntries(String query, int limit);
+}

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.kt

@@ -1,43 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2021 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.history.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.reactivex.rxjava3.core.Flowable
-import org.schabi.newpipe.database.BasicDAO
-import org.schabi.newpipe.database.history.model.SearchHistoryEntry
-
-@Dao
-interface SearchHistoryDAO : BasicDAO<SearchHistoryEntry> {
-
-    @get:Query("SELECT * FROM search_history WHERE id = (SELECT MAX(id) FROM search_history)")
-    val latestEntry: SearchHistoryEntry?
-
-    @Query("DELETE FROM search_history")
-    override fun deleteAll(): Int
-
-    @Query("DELETE FROM search_history WHERE search = :query")
-    fun deleteAllWhereQuery(query: String): Int
-
-    @Query("SELECT * FROM search_history ORDER BY creation_date DESC")
-    override fun getAll(): Flowable<List<SearchHistoryEntry>>
-
-    @Query("SELECT search FROM search_history GROUP BY search ORDER BY MAX(creation_date) DESC LIMIT :limit")
-    fun getUniqueEntries(limit: Int): Flowable<MutableList<String>>
-
-    @Query("SELECT * FROM search_history WHERE service_id = :serviceId ORDER BY creation_date DESC")
-    override fun listByService(serviceId: Int): Flowable<List<SearchHistoryEntry>>
-
-    @Query(
-        """
-        SELECT search FROM search_history WHERE search LIKE :query ||
-        '%' GROUP BY search ORDER BY MAX(creation_date) DESC LIMIT :limit
-        """
-    )
-    fun getSimilarEntries(query: String, limit: Int): Flowable<MutableList<String>>
-}

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

@@ -0,0 +1,89 @@
+package org.schabi.newpipe.database.history.dao;
+
+import androidx.annotation.Nullable;
+import androidx.room.Dao;
+import androidx.room.Query;
+import androidx.room.RewriteQueriesToDropUnusedColumns;
+
+import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
+import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
+import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_REPEAT_COUNT;
+import static org.schabi.newpipe.database.stream.StreamStatisticsEntry.STREAM_LATEST_DATE;
+import static org.schabi.newpipe.database.stream.StreamStatisticsEntry.STREAM_WATCH_COUNT;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID_ALIAS;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_PROGRESS_MILLIS;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
+
+@Dao
+public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity> {
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE
+            + " WHERE " + STREAM_ACCESS_DATE + " = "
+            + "(SELECT MAX(" + STREAM_ACCESS_DATE + ") FROM " + STREAM_HISTORY_TABLE + ")")
+    @Override
+    @Nullable
+    public abstract StreamHistoryEntity getLatestEntry();
+
+    @Override
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE)
+    public abstract Flowable<List<StreamHistoryEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + STREAM_HISTORY_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    public Flowable<List<StreamHistoryEntity>> listByService(final int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + STREAM_TABLE
+            + " INNER JOIN " + STREAM_HISTORY_TABLE
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+            + " ORDER BY " + STREAM_ACCESS_DATE + " DESC")
+    public abstract Flowable<List<StreamHistoryEntry>> getHistory();
+
+
+    @Query("SELECT * FROM " + STREAM_TABLE
+            + " INNER JOIN " + STREAM_HISTORY_TABLE
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+            + " ORDER BY " + STREAM_ID + " ASC")
+    public abstract Flowable<List<StreamHistoryEntry>> getHistorySortedById();
+
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID
+            + " = :streamId ORDER BY " + STREAM_ACCESS_DATE + " DESC LIMIT 1")
+    @Nullable
+    public abstract StreamHistoryEntity getLatestEntry(long streamId);
+
+    @Query("DELETE FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
+    public abstract int deleteStreamHistory(long streamId);
+
+    @RewriteQueriesToDropUnusedColumns
+    @Query("SELECT * FROM " + STREAM_TABLE
+
+            // Select the latest entry and watch count for each stream id on history table
+            + " INNER JOIN "
+            + "(SELECT " + JOIN_STREAM_ID + ", "
+            + "  MAX(" + STREAM_ACCESS_DATE + ") AS " + STREAM_LATEST_DATE + ", "
+            + "  SUM(" + STREAM_REPEAT_COUNT + ") AS " + STREAM_WATCH_COUNT
+            + " FROM " + STREAM_HISTORY_TABLE + " GROUP BY " + JOIN_STREAM_ID + ")"
+
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+
+            + " LEFT JOIN "
+            + "(SELECT " + JOIN_STREAM_ID + " AS " + JOIN_STREAM_ID_ALIAS + ", "
+            + STREAM_PROGRESS_MILLIS
+            + " FROM " + STREAM_STATE_TABLE + " )"
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID_ALIAS)
+    public abstract Flowable<List<StreamStatisticsEntry>> getStatistics();
+}

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.kt

@@ -1,61 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2022 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.history.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.RewriteQueriesToDropUnusedColumns
-import io.reactivex.rxjava3.core.Flowable
-import org.schabi.newpipe.database.BasicDAO
-import org.schabi.newpipe.database.history.model.StreamHistoryEntity
-import org.schabi.newpipe.database.history.model.StreamHistoryEntry
-import org.schabi.newpipe.database.stream.StreamStatisticsEntry
-
-@Dao
-abstract class StreamHistoryDAO : BasicDAO<StreamHistoryEntity> {
-
-    @Query("SELECT * FROM stream_history")
-    abstract override fun getAll(): Flowable<List<StreamHistoryEntity>>
-
-    @Query("DELETE FROM stream_history")
-    abstract override fun deleteAll(): Int
-
-    override fun listByService(serviceId: Int): Flowable<List<StreamHistoryEntity>> {
-        throw UnsupportedOperationException()
-    }
-
-    @get:Query("SELECT * FROM streams INNER JOIN stream_history ON uid = stream_id ORDER BY access_date DESC")
-    abstract val history: Flowable<MutableList<StreamHistoryEntry>>
-
-    @get:Query("SELECT * FROM streams INNER JOIN stream_history ON uid = stream_id ORDER BY uid ASC")
-    abstract val historySortedById: Flowable<MutableList<StreamHistoryEntry>>
-
-    @Query("SELECT * FROM stream_history WHERE stream_id = :streamId ORDER BY access_date DESC LIMIT 1")
-    abstract fun getLatestEntry(streamId: Long): StreamHistoryEntity?
-
-    @Query("DELETE FROM stream_history WHERE stream_id = :streamId")
-    abstract fun deleteStreamHistory(streamId: Long): Int
-
-    // Select the latest entry and watch count for each stream id on history table
-    @RewriteQueriesToDropUnusedColumns
-    @Query(
-        """
-        SELECT * FROM streams
-
-        INNER JOIN (
-            SELECT stream_id, MAX(access_date) AS latestAccess, SUM(repeat_count) AS watchCount
-            FROM stream_history
-            GROUP BY stream_id
-        )
-        ON uid = stream_id
-
-        LEFT JOIN (SELECT stream_id AS stream_id_alias, progress_time FROM stream_state )
-        ON uid = stream_id_alias
-        """
-    )
-    abstract fun getStatistics(): Flowable<MutableList<StreamStatisticsEntry>>
-}

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

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2022 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
 package org.schabi.newpipe.database.history.model
 
 import androidx.room.ColumnInfo
@@ -17,24 +11,23 @@ import java.time.OffsetDateTime
     tableName = SearchHistoryEntry.TABLE_NAME,
     indices = [Index(value = [SearchHistoryEntry.SEARCH])]
 )
-data class SearchHistoryEntry @JvmOverloads constructor(
-    @ColumnInfo(name = CREATION_DATE)
-    var creationDate: OffsetDateTime?,
-
-    @ColumnInfo(name = SERVICE_ID)
-    val serviceId: Int,
-
-    @ColumnInfo(name = SEARCH)
-    val search: String?,
-
+data class SearchHistoryEntry(
+    @field:ColumnInfo(name = CREATION_DATE) var creationDate: OffsetDateTime?,
+    @field:ColumnInfo(
+        name = SERVICE_ID
+    ) var serviceId: Int,
+    @field:ColumnInfo(name = SEARCH) var search: String?
+) {
     @ColumnInfo(name = ID)
     @PrimaryKey(autoGenerate = true)
-    val id: Long = 0
-) {
+    var id: Long = 0
 
     @Ignore
     fun hasEqualValues(otherEntry: SearchHistoryEntry): Boolean {
-        return serviceId == otherEntry.serviceId && search == otherEntry.search
+        return (
+            serviceId == otherEntry.serviceId &&
+                search == otherEntry.search
+            )
     }
 
     companion object {

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

@@ -0,0 +1,81 @@
+package org.schabi.newpipe.database.history.model;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Index;
+
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+
+import java.time.OffsetDateTime;
+
+import static androidx.room.ForeignKey.CASCADE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
+
+@Entity(tableName = STREAM_HISTORY_TABLE,
+        primaryKeys = {JOIN_STREAM_ID, STREAM_ACCESS_DATE},
+        // No need to index for timestamp as they will almost always be unique
+        indices = {@Index(value = {JOIN_STREAM_ID})},
+        foreignKeys = {
+                @ForeignKey(entity = StreamEntity.class,
+                        parentColumns = StreamEntity.STREAM_ID,
+                        childColumns = JOIN_STREAM_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE)
+        })
+public class StreamHistoryEntity {
+    public static final String STREAM_HISTORY_TABLE = "stream_history";
+    public static final String JOIN_STREAM_ID = "stream_id";
+    public static final String STREAM_ACCESS_DATE = "access_date";
+    public static final String STREAM_REPEAT_COUNT = "repeat_count";
+
+    @ColumnInfo(name = JOIN_STREAM_ID)
+    private long streamUid;
+
+    @NonNull
+    @ColumnInfo(name = STREAM_ACCESS_DATE)
+    private OffsetDateTime accessDate;
+
+    @ColumnInfo(name = STREAM_REPEAT_COUNT)
+    private long repeatCount;
+
+    /**
+     * @param streamUid the stream id this history item will refer to
+     * @param accessDate the last time the stream was accessed
+     * @param repeatCount the total number of views this stream received
+     */
+    public StreamHistoryEntity(final long streamUid,
+                               @NonNull final OffsetDateTime accessDate,
+                               final long repeatCount) {
+        this.streamUid = streamUid;
+        this.accessDate = accessDate;
+        this.repeatCount = repeatCount;
+    }
+
+    public long getStreamUid() {
+        return streamUid;
+    }
+
+    public void setStreamUid(final long streamUid) {
+        this.streamUid = streamUid;
+    }
+
+    @NonNull
+    public OffsetDateTime getAccessDate() {
+        return accessDate;
+    }
+
+    public void setAccessDate(@NonNull final OffsetDateTime accessDate) {
+        this.accessDate = accessDate;
+    }
+
+    public long getRepeatCount() {
+        return repeatCount;
+    }
+
+    public void setRepeatCount(final long repeatCount) {
+        this.repeatCount = repeatCount;
+    }
+}

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

@@ -1,56 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2022 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.history.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.ForeignKey.Companion.CASCADE
-import androidx.room.Index
-import java.time.OffsetDateTime
-import org.schabi.newpipe.database.history.model.StreamHistoryEntity.Companion.JOIN_STREAM_ID
-import org.schabi.newpipe.database.history.model.StreamHistoryEntity.Companion.STREAM_ACCESS_DATE
-import org.schabi.newpipe.database.history.model.StreamHistoryEntity.Companion.STREAM_HISTORY_TABLE
-import org.schabi.newpipe.database.stream.model.StreamEntity
-import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_ID
-
-/**
- * @param streamUid the stream id this history item will refer to
- * @param accessDate the last time the stream was accessed
- * @param repeatCount the total number of views this stream received
- */
-@Entity(
-    tableName = STREAM_HISTORY_TABLE,
-    primaryKeys = [JOIN_STREAM_ID, STREAM_ACCESS_DATE],
-    indices = [Index(value = [JOIN_STREAM_ID])],
-    foreignKeys = [
-        ForeignKey(
-            entity = StreamEntity::class,
-            parentColumns = arrayOf(STREAM_ID),
-            childColumns = arrayOf(JOIN_STREAM_ID),
-            onDelete = CASCADE,
-            onUpdate = CASCADE
-        )
-    ]
-)
-data class StreamHistoryEntity(
-    @ColumnInfo(name = JOIN_STREAM_ID)
-    val streamUid: Long,
-
-    @ColumnInfo(name = STREAM_ACCESS_DATE)
-    var accessDate: OffsetDateTime,
-
-    @ColumnInfo(name = STREAM_REPEAT_COUNT)
-    var repeatCount: Long
-) {
-    companion object {
-        const val STREAM_HISTORY_TABLE: String = "stream_history"
-        const val STREAM_ACCESS_DATE: String = "access_date"
-        const val JOIN_STREAM_ID: String = "stream_id"
-        const val STREAM_REPEAT_COUNT: String = "repeat_count"
-    }
-}

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

@@ -2,10 +2,10 @@ package org.schabi.newpipe.database.history.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.util.image.ImageStrategy
+import java.time.OffsetDateTime
 
 data class StreamHistoryEntry(
     @Embedded
@@ -30,15 +30,16 @@ data class StreamHistoryEntry(
             accessDate.isEqual(other.accessDate)
     }
 
-    fun toStreamInfoItem(): StreamInfoItem = StreamInfoItem(
-        streamEntity.serviceId,
-        streamEntity.url,
-        streamEntity.title,
-        streamEntity.streamType
-    ).apply {
-        duration = streamEntity.duration
-        uploaderName = streamEntity.uploader
-        uploaderUrl = streamEntity.uploaderUrl
-        thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
-    }
+    fun toStreamInfoItem(): StreamInfoItem =
+        StreamInfoItem(
+            streamEntity.serviceId,
+            streamEntity.url,
+            streamEntity.title,
+            streamEntity.streamType,
+        ).apply {
+            duration = streamEntity.duration
+            uploaderName = streamEntity.uploader
+            uploaderUrl = streamEntity.uploaderUrl
+            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+        }
 }

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

@@ -0,0 +1,29 @@
+package org.schabi.newpipe.database.playlist;
+
+import androidx.room.ColumnInfo;
+
+/**
+ * This class adds a field to {@link PlaylistMetadataEntry} that contains an integer representing
+ * how many times a specific stream is already contained inside a local playlist. Used to be able
+ * to grey out playlists which already contain the current stream in the playlist append dialog.
+ * @see org.schabi.newpipe.local.playlist.LocalPlaylistManager#getPlaylistDuplicates(String)
+ */
+public class PlaylistDuplicatesEntry extends PlaylistMetadataEntry {
+    public static final String PLAYLIST_TIMES_STREAM_IS_CONTAINED = "timesStreamIsContained";
+    @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);
+        this.timesStreamIsContained = timesStreamIsContained;
+    }
+}

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

@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist
-
-import androidx.room.ColumnInfo
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity
-
-/**
- * This class adds a field to [PlaylistMetadataEntry] that contains an integer representing
- * how many times a specific stream is already contained inside a local playlist. Used to be able
- * to grey out playlists which already contain the current stream in the playlist append dialog.
- * @see org.schabi.newpipe.local.playlist.LocalPlaylistManager.getPlaylistDuplicates
- */
-data class PlaylistDuplicatesEntry(
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_ID)
-    override val uid: Long,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_THUMBNAIL_URL)
-    override val thumbnailUrl: String?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_THUMBNAIL_PERMANENT)
-    override val isThumbnailPermanent: Boolean?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_THUMBNAIL_STREAM_ID)
-    override val thumbnailStreamId: Long?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_DISPLAY_INDEX)
-    override var displayIndex: Long?,
-
-    @ColumnInfo(name = PLAYLIST_STREAM_COUNT)
-    override val streamCount: Long,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_NAME)
-    override val orderingName: String?,
-
-    @ColumnInfo(name = PLAYLIST_TIMES_STREAM_IS_CONTAINED)
-    val timesStreamIsContained: Long
-) : PlaylistMetadataEntry(
-    uid = uid,
-    orderingName = orderingName,
-    thumbnailUrl = thumbnailUrl,
-    isThumbnailPermanent = isThumbnailPermanent,
-    thumbnailStreamId = thumbnailStreamId,
-    displayIndex = displayIndex,
-    streamCount = streamCount
-) {
-    companion object {
-        const val PLAYLIST_TIMES_STREAM_IS_CONTAINED: String = "timesStreamIsContained"
-    }
-}

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

@@ -0,0 +1,18 @@
+package org.schabi.newpipe.database.playlist;
+
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.database.LocalItem;
+
+public interface PlaylistLocalItem extends LocalItem {
+    String getOrderingName();
+
+    long getDisplayIndex();
+
+    long getUid();
+
+    void setDisplayIndex(long displayIndex);
+
+    @Nullable
+    String getThumbnailUrl();
+}

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

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2025 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist
-
-import org.schabi.newpipe.database.LocalItem
-
-interface PlaylistLocalItem : LocalItem {
-    val orderingName: String?
-    val displayIndex: Long?
-    val uid: Long
-    val thumbnailUrl: String?
-}

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

@@ -0,0 +1,82 @@
+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;
+
+import androidx.annotation.Nullable;
+
+public class PlaylistMetadataEntry implements PlaylistLocalItem {
+    public static final String PLAYLIST_STREAM_COUNT = "streamCount";
+
+    @ColumnInfo(name = PLAYLIST_ID)
+    private 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) {
+        this.uid = uid;
+        this.name = name;
+        this.thumbnailUrl = thumbnailUrl;
+        this.isThumbnailPermanent = isThumbnailPermanent;
+        this.thumbnailStreamId = thumbnailStreamId;
+        this.displayIndex = displayIndex;
+        this.streamCount = streamCount;
+    }
+
+    @Override
+    public LocalItemType getLocalItemType() {
+        return LocalItemType.PLAYLIST_LOCAL_ITEM;
+    }
+
+    @Override
+    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;
+    }
+
+    @Nullable
+    @Override
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
+}

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

@@ -1,42 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2025 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist
-
-import androidx.room.ColumnInfo
-import org.schabi.newpipe.database.LocalItem.LocalItemType
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity
-
-open class PlaylistMetadataEntry(
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_ID)
-    override val uid: Long,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_NAME)
-    override val orderingName: String?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_THUMBNAIL_URL)
-    override val thumbnailUrl: String?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_DISPLAY_INDEX)
-    override var displayIndex: Long?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_THUMBNAIL_PERMANENT)
-    open val isThumbnailPermanent: Boolean?,
-
-    @ColumnInfo(name = PlaylistEntity.PLAYLIST_THUMBNAIL_STREAM_ID)
-    open val thumbnailStreamId: Long?,
-
-    @ColumnInfo(name = PLAYLIST_STREAM_COUNT)
-    open val streamCount: Long
-) : PlaylistLocalItem {
-
-    override val localItemType: LocalItemType
-        get() = LocalItemType.PLAYLIST_LOCAL_ITEM
-
-    companion object {
-        const val PLAYLIST_STREAM_COUNT: String = "streamCount"
-    }
-}

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

@@ -1,9 +1,3 @@
-/*
- * SPDX-FileCopyrightText: 2020-2023 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
 package org.schabi.newpipe.database.playlist
 
 import androidx.room.ColumnInfo
@@ -29,21 +23,18 @@ data class PlaylistStreamEntry(
     val joinIndex: Int
 ) : LocalItem {
 
-    override val localItemType: LocalItem.LocalItemType
-        get() = LocalItem.LocalItemType.PLAYLIST_STREAM_ITEM
-
     @Throws(IllegalArgumentException::class)
     fun toStreamInfoItem(): StreamInfoItem {
-        return StreamInfoItem(
-            streamEntity.serviceId,
-            streamEntity.url,
-            streamEntity.title,
-            streamEntity.streamType
-        ).apply {
-            duration = streamEntity.duration
-            uploaderName = streamEntity.uploader
-            uploaderUrl = streamEntity.uploaderUrl
-            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
-        }
+        val item = StreamInfoItem(streamEntity.serviceId, streamEntity.url, streamEntity.title, streamEntity.streamType)
+        item.duration = streamEntity.duration
+        item.uploaderName = streamEntity.uploader
+        item.uploaderUrl = streamEntity.uploaderUrl
+        item.thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+
+        return item
+    }
+
+    override fun getLocalItemType(): LocalItem.LocalItemType {
+        return LocalItem.LocalItemType.PLAYLIST_STREAM_ITEM
     }
 }

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

@@ -0,0 +1,53 @@
+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;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+
+import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
+
+@Dao
+public interface PlaylistDAO extends BasicDAO<PlaylistEntity> {
+    @Override
+    @Query("SELECT * FROM " + PLAYLIST_TABLE)
+    Flowable<List<PlaylistEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + PLAYLIST_TABLE)
+    int deleteAll();
+
+    @Override
+    default Flowable<List<PlaylistEntity>> listByService(final int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + PLAYLIST_TABLE + " WHERE " + PLAYLIST_ID + " = :playlistId")
+    Flowable<List<PlaylistEntity>> getPlaylist(long playlistId);
+
+    @Query("DELETE FROM " + PLAYLIST_TABLE + " WHERE " + PLAYLIST_ID + " = :playlistId")
+    int deletePlaylist(long playlistId);
+
+    @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/PlaylistDAO.kt

@@ -1,48 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2022 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Transaction
-import io.reactivex.rxjava3.core.Flowable
-import org.schabi.newpipe.database.BasicDAO
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity
-
-@Dao
-interface PlaylistDAO : BasicDAO<PlaylistEntity> {
-
-    @Query("SELECT * FROM playlists")
-    override fun getAll(): Flowable<List<PlaylistEntity>>
-
-    @Query("DELETE FROM playlists")
-    override fun deleteAll(): Int
-
-    override fun listByService(serviceId: Int): Flowable<List<PlaylistEntity>> {
-        throw UnsupportedOperationException()
-    }
-
-    @Query("SELECT * FROM playlists WHERE uid = :playlistId")
-    fun getPlaylist(playlistId: Long): Flowable<MutableList<PlaylistEntity>>
-
-    @Query("DELETE FROM playlists WHERE uid = :playlistId")
-    fun deletePlaylist(playlistId: Long): Int
-
-    @get:Query("SELECT COUNT(*) FROM playlists")
-    val count: Flowable<Long>
-
-    @Transaction
-    fun upsertPlaylist(playlist: PlaylistEntity): Long {
-        if (playlist.uid == -1L) {
-            // This situation is probably impossible.
-            return insert(playlist)
-        } else {
-            update(playlist)
-            return playlist.uid
-        }
-    }
-}

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

@@ -0,0 +1,68 @@
+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.PlaylistRemoteEntity;
+
+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;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_URL;
+
+@Dao
+public interface PlaylistRemoteDAO extends BasicDAO<PlaylistRemoteEntity> {
+    @Override
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE)
+    Flowable<List<PlaylistRemoteEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + REMOTE_PLAYLIST_TABLE)
+    int deleteAll();
+
+    @Override
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE
+            + " WHERE " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
+    Flowable<List<PlaylistRemoteEntity>> listByService(int serviceId);
+
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
+            + REMOTE_PLAYLIST_ID + " = :playlistId")
+    Flowable<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")
+    Long getPlaylistIdInternal(long serviceId, String url);
+
+    @Transaction
+    default long upsert(final PlaylistRemoteEntity playlist) {
+        final Long playlistId = getPlaylistIdInternal(playlist.getServiceId(), playlist.getUrl());
+
+        if (playlistId == null) {
+            return insert(playlist);
+        } else {
+            playlist.setUid(playlistId);
+            update(playlist);
+            return playlistId;
+        }
+    }
+
+    @Query("DELETE FROM " + REMOTE_PLAYLIST_TABLE
+            + " WHERE " + REMOTE_PLAYLIST_ID + " = :playlistId")
+    int deletePlaylist(long playlistId);
+}

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

@@ -1,55 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2025 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Transaction
-import io.reactivex.rxjava3.core.Flowable
-import org.schabi.newpipe.database.BasicDAO
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity
-
-@Dao
-interface PlaylistRemoteDAO : BasicDAO<PlaylistRemoteEntity> {
-
-    @Query("SELECT * FROM remote_playlists")
-    override fun getAll(): Flowable<List<PlaylistRemoteEntity>>
-
-    @Query("DELETE FROM remote_playlists")
-    override fun deleteAll(): Int
-
-    @Query("SELECT * FROM remote_playlists WHERE service_id = :serviceId")
-    override fun listByService(serviceId: Int): Flowable<List<PlaylistRemoteEntity>>
-
-    @Query("SELECT * FROM remote_playlists WHERE uid = :playlistId")
-    fun getPlaylist(playlistId: Long): Flowable<PlaylistRemoteEntity>
-
-    @Query("SELECT * FROM remote_playlists WHERE url = :url AND service_id = :serviceId")
-    fun getPlaylist(serviceId: Long, url: String?): Flowable<MutableList<PlaylistRemoteEntity>>
-
-    @get:Query("SELECT * FROM remote_playlists ORDER BY display_index")
-    val playlists: Flowable<MutableList<PlaylistRemoteEntity>>
-
-    @Query("SELECT uid FROM remote_playlists WHERE url = :url AND service_id = :serviceId")
-    fun getPlaylistIdInternal(serviceId: Long, url: String?): Long?
-
-    @Transaction
-    fun upsert(playlist: PlaylistRemoteEntity): Long {
-        val playlistId = getPlaylistIdInternal(playlist.serviceId.toLong(), playlist.url)
-
-        if (playlistId == null) {
-            return insert(playlist)
-        } else {
-            playlist.uid = playlistId
-            update(playlist)
-            return playlistId
-        }
-    }
-
-    @Query("DELETE FROM remote_playlists WHERE uid = :playlistId")
-    fun deletePlaylist(playlistId: Long): Int
-}

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

@@ -0,0 +1,159 @@
+package org.schabi.newpipe.database.playlist.dao;
+
+import androidx.room.Dao;
+import androidx.room.Query;
+import androidx.room.RewriteQueriesToDropUnusedColumns;
+import androidx.room.Transaction;
+
+import org.schabi.newpipe.database.BasicDAO;
+import org.schabi.newpipe.database.playlist.PlaylistDuplicatesEntry;
+import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
+import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
+import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
+
+import java.util.List;
+
+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;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_PLAYLIST_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.PLAYLIST_STREAM_JOIN_TABLE;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_THUMBNAIL_URL;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_URL;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID_ALIAS;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_PROGRESS_MILLIS;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
+
+@Dao
+public interface PlaylistStreamDAO extends BasicDAO<PlaylistStreamEntity> {
+    @Override
+    @Query("SELECT * FROM " + PLAYLIST_STREAM_JOIN_TABLE)
+    Flowable<List<PlaylistStreamEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + PLAYLIST_STREAM_JOIN_TABLE)
+    int deleteAll();
+
+    @Override
+    default Flowable<List<PlaylistStreamEntity>> listByService(final int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("DELETE FROM " + PLAYLIST_STREAM_JOIN_TABLE
+            + " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId")
+    void deleteBatch(long playlistId);
+
+    @Query("SELECT COALESCE(MAX(" + JOIN_INDEX + "), -1)"
+            + " FROM " + PLAYLIST_STREAM_JOIN_TABLE
+            + " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId")
+    Flowable<Integer> getMaximumIndexOf(long playlistId);
+
+    @Query("SELECT CASE WHEN COUNT(*) != 0 then " + STREAM_ID
+            + " ELSE " + PlaylistEntity.DEFAULT_THUMBNAIL_ID + " END"
+            + " FROM " + STREAM_TABLE
+            + " LEFT JOIN " + PLAYLIST_STREAM_JOIN_TABLE
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+            + " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId "
+            + " LIMIT 1"
+    )
+    Flowable<Long> getAutomaticThumbnailStreamId(long playlistId);
+
+    @RewriteQueriesToDropUnusedColumns
+    @Transaction
+    @Query("SELECT * FROM " + STREAM_TABLE + " INNER JOIN "
+            // get ids of streams of the given playlist
+            + "(SELECT " + JOIN_STREAM_ID + "," + JOIN_INDEX
+            + " FROM " + PLAYLIST_STREAM_JOIN_TABLE
+            + " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId)"
+
+            // then merge with the stream metadata
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+
+            + " LEFT JOIN "
+            + "(SELECT " + JOIN_STREAM_ID + " AS " + JOIN_STREAM_ID_ALIAS + ", "
+            + STREAM_PROGRESS_MILLIS
+            + " FROM " + STREAM_STATE_TABLE + " )"
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID_ALIAS
+
+            + " ORDER BY " + JOIN_INDEX + " ASC")
+    Flowable<List<PlaylistStreamEntry>> getOrderedStreamsOf(long playlistId);
+
+    @Transaction
+    @Query("SELECT " + PLAYLIST_ID + ", " + PLAYLIST_NAME + ", "
+            + PLAYLIST_THUMBNAIL_PERMANENT + ", " + PLAYLIST_THUMBNAIL_STREAM_ID + ", "
+            + PLAYLIST_DISPLAY_INDEX + ", "
+
+            + " CASE WHEN " + PLAYLIST_THUMBNAIL_STREAM_ID + " = "
+            + PlaylistEntity.DEFAULT_THUMBNAIL_ID + " THEN " + "'" + DEFAULT_THUMBNAIL + "'"
+            + " ELSE (SELECT " + STREAM_THUMBNAIL_URL
+            + " FROM " + STREAM_TABLE
+            + " WHERE " + STREAM_TABLE + "." + STREAM_ID + " = " + PLAYLIST_THUMBNAIL_STREAM_ID
+            + " ) END AS " + PLAYLIST_THUMBNAIL_URL + ", "
+
+            + "COALESCE(COUNT(" + JOIN_PLAYLIST_ID + "), 0) AS " + PLAYLIST_STREAM_COUNT
+            + " FROM " + PLAYLIST_TABLE
+            + " LEFT JOIN " + PLAYLIST_STREAM_JOIN_TABLE
+            + " ON " + PLAYLIST_TABLE + "." + PLAYLIST_ID + " = " + JOIN_PLAYLIST_ID
+            + " GROUP BY " + PLAYLIST_ID
+            + " ORDER BY " + PLAYLIST_DISPLAY_INDEX)
+    Flowable<List<PlaylistMetadataEntry>> getPlaylistMetadata();
+
+    @RewriteQueriesToDropUnusedColumns
+    @Transaction
+    @Query("SELECT *, MIN(" + JOIN_INDEX + ")"
+            + " FROM " + STREAM_TABLE + " INNER JOIN"
+            + " (SELECT " + JOIN_STREAM_ID + "," + JOIN_INDEX
+            + " FROM " + PLAYLIST_STREAM_JOIN_TABLE
+            + " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId)"
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+            + " LEFT JOIN "
+            + "(SELECT " + JOIN_STREAM_ID + " AS " + JOIN_STREAM_ID_ALIAS + ", "
+            + STREAM_PROGRESS_MILLIS
+            + " FROM " + STREAM_STATE_TABLE + " )"
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID_ALIAS
+            + " GROUP BY " + STREAM_ID
+            + " ORDER BY MIN(" + JOIN_INDEX + ") ASC")
+    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 + ", "
+
+            + " CASE WHEN " + PLAYLIST_THUMBNAIL_STREAM_ID + " = "
+            + PlaylistEntity.DEFAULT_THUMBNAIL_ID + " THEN " + "'" + DEFAULT_THUMBNAIL + "'"
+            + " ELSE (SELECT " + STREAM_THUMBNAIL_URL
+            + " FROM " + STREAM_TABLE
+            + " WHERE " + STREAM_TABLE + "." + STREAM_ID + " = " + PLAYLIST_THUMBNAIL_STREAM_ID
+            + " ) END AS " + PLAYLIST_THUMBNAIL_URL + ", "
+
+            + "COALESCE(COUNT(" + JOIN_PLAYLIST_ID + "), 0) AS " + PLAYLIST_STREAM_COUNT + ", "
+            + "COALESCE(SUM(" + STREAM_URL + " = :streamUrl), 0) AS "
+                + PLAYLIST_TIMES_STREAM_IS_CONTAINED
+
+            + " FROM " + PLAYLIST_TABLE
+            + " LEFT JOIN " + PLAYLIST_STREAM_JOIN_TABLE
+            + " ON " + PLAYLIST_TABLE + "." + PLAYLIST_ID + " = " + JOIN_PLAYLIST_ID
+
+            + " LEFT JOIN " + STREAM_TABLE
+            + " ON " + STREAM_TABLE + "." + STREAM_ID + " = " + JOIN_STREAM_ID
+            + " AND :streamUrl = :streamUrl"
+
+            + " GROUP BY " + JOIN_PLAYLIST_ID
+            + " ORDER BY " + PLAYLIST_DISPLAY_INDEX + ", " + PLAYLIST_NAME)
+    Flowable<List<PlaylistDuplicatesEntry>> getPlaylistDuplicatesMetadata(String streamUrl);
+}

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

@@ -1,136 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.RewriteQueriesToDropUnusedColumns
-import androidx.room.Transaction
-import io.reactivex.rxjava3.core.Flowable
-import org.schabi.newpipe.database.BasicDAO
-import org.schabi.newpipe.database.playlist.PlaylistDuplicatesEntry
-import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry
-import org.schabi.newpipe.database.playlist.PlaylistStreamEntry
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity.Companion.DEFAULT_THUMBNAIL_ID
-import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity
-
-@Dao
-interface PlaylistStreamDAO : BasicDAO<PlaylistStreamEntity> {
-
-    @Query("SELECT * FROM playlist_stream_join")
-    override fun getAll(): Flowable<List<PlaylistStreamEntity>>
-
-    @Query("DELETE FROM playlist_stream_join")
-    override fun deleteAll(): Int
-
-    override fun listByService(serviceId: Int): Flowable<List<PlaylistStreamEntity>> {
-        throw UnsupportedOperationException()
-    }
-
-    @Query("DELETE FROM playlist_stream_join WHERE playlist_id = :playlistId")
-    fun deleteBatch(playlistId: Long)
-
-    @Query("SELECT COALESCE(MAX(join_index), -1) FROM playlist_stream_join WHERE playlist_id = :playlistId")
-    fun getMaximumIndexOf(playlistId: Long): Flowable<Int>
-
-    @Query(
-        """
-        SELECT CASE WHEN COUNT(*) != 0 then stream_id ELSE $DEFAULT_THUMBNAIL_ID END
-        FROM streams
-
-        LEFT JOIN playlist_stream_join
-        ON uid = stream_id
-
-        WHERE playlist_id = :playlistId LIMIT 1
-        """
-    )
-    fun getAutomaticThumbnailStreamId(playlistId: Long): Flowable<Long>
-
-    // get ids of streams of the given playlist then merge with the stream metadata
-    @RewriteQueriesToDropUnusedColumns
-    @Transaction
-    @Query(
-        """
-        SELECT * FROM streams
-
-        INNER JOIN (SELECT stream_id, join_index FROM playlist_stream_join WHERE playlist_id = :playlistId)
-        ON uid = stream_id
-
-        LEFT JOIN (SELECT stream_id AS stream_id_alias, progress_time FROM stream_state )
-        ON uid = stream_id_alias
-
-        ORDER BY join_index ASC
-        """
-    )
-    fun getOrderedStreamsOf(playlistId: Long): Flowable<MutableList<PlaylistStreamEntry>>
-
-    // If a playlist has no streams, there won’t be any rows in the **playlist_stream_join** table
-    // that have a foreign key to that playlist. Thus, the **playlist_id** will not have a
-    // corresponding value in any rows of the join table. So, if you group by the **playlist_id**,
-    // only playlists that contain videos are grouped and displayed. Look at #9642 #13055
-
-    @Transaction
-    @Query(
-        """
-        SELECT uid, name, is_thumbnail_permanent, thumbnail_stream_id, display_index,
-        (SELECT thumbnail_url FROM streams WHERE streams.uid = thumbnail_stream_id) AS thumbnail_url,
-
-        COALESCE(COUNT(playlist_id), 0) AS streamCount FROM playlists
-
-        LEFT JOIN playlist_stream_join
-        ON playlists.uid = playlist_id
-
-        GROUP BY uid
-        ORDER BY display_index
-        """
-    )
-    fun getPlaylistMetadata(): Flowable<MutableList<PlaylistMetadataEntry>>
-
-    @RewriteQueriesToDropUnusedColumns
-    @Transaction
-    @Query(
-        """
-        SELECT *, MIN(join_index) FROM streams
-
-        INNER JOIN (SELECT stream_id, join_index FROM playlist_stream_join WHERE playlist_id = :playlistId)
-        ON uid = stream_id
-
-        LEFT JOIN (SELECT stream_id AS stream_id_alias, progress_time FROM stream_state )
-        ON uid = stream_id_alias
-
-        GROUP BY uid
-        ORDER BY MIN(join_index) ASC
-        """
-    )
-    fun getStreamsWithoutDuplicates(playlistId: Long): Flowable<MutableList<PlaylistStreamEntry>>
-
-    // If a playlist has no streams, there won’t be any rows in the **playlist_stream_join** table
-    // that have a foreign key to that playlist. Thus, the **playlist_id** will not have a
-    // corresponding value in any rows of the join table. So, if you group by the **playlist_id**,
-    // only playlists that contain videos are grouped and displayed. Look at #9642 #13055
-
-    @Transaction
-    @Query(
-        """
-        SELECT playlists.uid, name, is_thumbnail_permanent, thumbnail_stream_id, display_index,
-        (SELECT thumbnail_url FROM streams WHERE streams.uid = thumbnail_stream_id) AS thumbnail_url,
-
-        COALESCE(COUNT(playlist_id), 0) AS streamCount,
-        COALESCE(SUM(url = :streamUrl), 0) AS timesStreamIsContained FROM playlists
-
-        LEFT JOIN playlist_stream_join
-        ON playlists.uid = playlist_id
-
-        LEFT JOIN streams
-        ON streams.uid = stream_id AND :streamUrl = :streamUrl
-
-        GROUP BY playlists.uid
-        ORDER BY display_index, name
-        """
-    )
-    fun getPlaylistDuplicatesMetadata(streamUrl: String): Flowable<MutableList<PlaylistDuplicatesEntry>>
-}

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

@@ -0,0 +1,100 @@
+package org.schabi.newpipe.database.playlist.model;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+
+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)
+public class PlaylistEntity {
+
+    public static final String DEFAULT_THUMBNAIL = "drawable://"
+            + R.drawable.placeholder_thumbnail_playlist;
+    public static final long DEFAULT_THUMBNAIL_ID = -1;
+
+    public static final String PLAYLIST_TABLE = "playlists";
+    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";
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = PLAYLIST_ID)
+    private long uid = 0;
+
+    @ColumnInfo(name = PLAYLIST_NAME)
+    private String name;
+
+    @ColumnInfo(name = PLAYLIST_THUMBNAIL_PERMANENT)
+    private boolean isThumbnailPermanent;
+
+    @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) {
+        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() {
+        return uid;
+    }
+
+    public void setUid(final long uid) {
+        this.uid = uid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public long getThumbnailStreamId() {
+        return thumbnailStreamId;
+    }
+
+    public void setThumbnailStreamId(final long thumbnailStreamId) {
+        this.thumbnailStreamId = thumbnailStreamId;
+    }
+
+    public boolean getIsThumbnailPermanent() {
+        return isThumbnailPermanent;
+    }
+
+    public void setIsThumbnailPermanent(final boolean isThumbnailSet) {
+        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/PlaylistEntity.kt

@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.PrimaryKey
-import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry
-
-@Entity(tableName = PlaylistEntity.Companion.PLAYLIST_TABLE)
-data class PlaylistEntity @JvmOverloads constructor(
-    @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(name = PLAYLIST_ID)
-    var uid: Long = 0,
-
-    @ColumnInfo(name = PLAYLIST_NAME)
-    var name: String?,
-
-    @ColumnInfo(name = PLAYLIST_THUMBNAIL_PERMANENT)
-    var isThumbnailPermanent: Boolean,
-
-    @ColumnInfo(name = PLAYLIST_THUMBNAIL_STREAM_ID)
-    var thumbnailStreamId: Long,
-
-    @ColumnInfo(name = PLAYLIST_DISPLAY_INDEX)
-    var displayIndex: Long
-) {
-
-    @Ignore
-    constructor(item: PlaylistMetadataEntry) : this(
-        uid = item.uid,
-        name = item.orderingName,
-        isThumbnailPermanent = item.isThumbnailPermanent!!,
-        thumbnailStreamId = item.thumbnailStreamId!!,
-        displayIndex = item.displayIndex!!
-    )
-
-    companion object {
-        const val DEFAULT_THUMBNAIL_ID = -1L
-
-        const val PLAYLIST_TABLE = "playlists"
-        const val PLAYLIST_ID = "uid"
-        const val PLAYLIST_NAME = "name"
-        const val PLAYLIST_THUMBNAIL_URL = "thumbnail_url"
-        const val PLAYLIST_DISPLAY_INDEX = "display_index"
-        const val PLAYLIST_THUMBNAIL_PERMANENT = "is_thumbnail_permanent"
-        const val PLAYLIST_THUMBNAIL_STREAM_ID = "thumbnail_stream_id"
-    }
-}

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

@@ -0,0 +1,191 @@
+package org.schabi.newpipe.database.playlist.model;
+
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+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;
+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;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_URL;
+
+@Entity(tableName = REMOTE_PLAYLIST_TABLE,
+        indices = {
+                @Index(value = {REMOTE_PLAYLIST_SERVICE_ID, REMOTE_PLAYLIST_URL}, unique = true)
+        })
+public class PlaylistRemoteEntity implements PlaylistLocalItem {
+    public static final String REMOTE_PLAYLIST_TABLE = "remote_playlists";
+    public static final String REMOTE_PLAYLIST_ID = "uid";
+    public static final String REMOTE_PLAYLIST_SERVICE_ID = "service_id";
+    public static final String REMOTE_PLAYLIST_NAME = "name";
+    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)
+    @ColumnInfo(name = REMOTE_PLAYLIST_ID)
+    private long uid = 0;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_SERVICE_ID)
+    private int serviceId = Constants.NO_SERVICE_ID;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_NAME)
+    private String name;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_URL)
+    private String url;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_THUMBNAIL_URL)
+    private String thumbnailUrl;
+
+    @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;
+
+    public PlaylistRemoteEntity(final int serviceId, final String name, final String url,
+                                final String thumbnailUrl, final String uploader,
+                                final Long streamCount) {
+        this.serviceId = serviceId;
+        this.name = name;
+        this.url = url;
+        this.thumbnailUrl = thumbnailUrl;
+        this.uploader = uploader;
+        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.getUploaderName(), info.getStreamCount());
+    }
+
+    @Ignore
+    public boolean isIdenticalTo(final PlaylistInfo info) {
+        /*
+         * Returns boolean comparing the online playlist and the local copy.
+         * (False if info changed such as playlist name or track count)
+         */
+        return getServiceId() == info.getServiceId()
+                && 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(getUploader(), info.getUploaderName());
+    }
+
+    @Override
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(final long uid) {
+        this.uid = uid;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(final int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Nullable
+    @Override
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
+
+    public void setThumbnailUrl(final String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(final String url) {
+        this.url = url;
+    }
+
+    public String getUploader() {
+        return uploader;
+    }
+
+    public void setUploader(final String uploader) {
+        this.uploader = uploader;
+    }
+
+    @Override
+    public long getDisplayIndex() {
+        return displayIndex;
+    }
+
+    @Override
+    public void setDisplayIndex(final long displayIndex) {
+        this.displayIndex = displayIndex;
+    }
+
+    public Long getStreamCount() {
+        return streamCount;
+    }
+
+    public void setStreamCount(final Long streamCount) {
+        this.streamCount = streamCount;
+    }
+
+    @Override
+    public LocalItemType getLocalItemType() {
+        return PLAYLIST_REMOTE_ITEM;
+    }
+
+    @Override
+    public String getOrderingName() {
+        return name;
+    }
+}

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

@@ -1,104 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2025 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist.model
-
-import android.text.TextUtils
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import org.schabi.newpipe.database.LocalItem.LocalItemType
-import org.schabi.newpipe.database.playlist.PlaylistLocalItem
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.Companion.REMOTE_PLAYLIST_SERVICE_ID
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.Companion.REMOTE_PLAYLIST_TABLE
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.Companion.REMOTE_PLAYLIST_URL
-import org.schabi.newpipe.extractor.playlist.PlaylistInfo
-import org.schabi.newpipe.util.NO_SERVICE_ID
-import org.schabi.newpipe.util.image.ImageStrategy
-
-@Entity(
-    tableName = REMOTE_PLAYLIST_TABLE,
-    indices = [
-        Index(
-            value = [REMOTE_PLAYLIST_SERVICE_ID, REMOTE_PLAYLIST_URL],
-            unique = true
-        )
-    ]
-)
-data class PlaylistRemoteEntity(
-    @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(name = REMOTE_PLAYLIST_ID)
-    override var uid: Long = 0,
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_SERVICE_ID)
-    val serviceId: Int = NO_SERVICE_ID,
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_NAME)
-    override val orderingName: String?,
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_URL)
-    val url: String?,
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_THUMBNAIL_URL)
-    override val thumbnailUrl: String?,
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_UPLOADER_NAME)
-    val uploader: String?,
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_DISPLAY_INDEX)
-    override var displayIndex: Long = -1, // Make sure the new item is on the top
-
-    @ColumnInfo(name = REMOTE_PLAYLIST_STREAM_COUNT)
-    val streamCount: Long?
-) : PlaylistLocalItem {
-
-    constructor(playlistInfo: PlaylistInfo) : this(
-        serviceId = playlistInfo.serviceId,
-        orderingName = playlistInfo.name,
-        url = playlistInfo.url,
-        thumbnailUrl = ImageStrategy.imageListToDbUrl(
-            if (playlistInfo.thumbnails.isEmpty()) {
-                playlistInfo.uploaderAvatars
-            } else {
-                playlistInfo.thumbnails
-            }
-        ),
-        uploader = playlistInfo.uploaderName,
-        streamCount = playlistInfo.streamCount
-    )
-
-    override val localItemType: LocalItemType
-        get() = LocalItemType.PLAYLIST_REMOTE_ITEM
-
-    /**
-     * Returns boolean comparing the online playlist and the local copy.
-     * (False if info changed such as playlist name or track count)
-     */
-    @Ignore
-    fun isIdenticalTo(info: PlaylistInfo): Boolean {
-        return this.serviceId == info.serviceId && this.streamCount == info.streamCount &&
-            TextUtils.equals(this.orderingName, info.name) &&
-            TextUtils.equals(this.url, info.url) &&
-            // 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(thumbnailUrl, ImageStrategy.imageListToDbUrl(info.thumbnails)) &&
-            TextUtils.equals(this.uploader, info.uploaderName)
-    }
-
-    companion object {
-        const val REMOTE_PLAYLIST_TABLE = "remote_playlists"
-        const val REMOTE_PLAYLIST_ID = "uid"
-        const val REMOTE_PLAYLIST_SERVICE_ID = "service_id"
-        const val REMOTE_PLAYLIST_NAME = "name"
-        const val REMOTE_PLAYLIST_URL = "url"
-        const val REMOTE_PLAYLIST_THUMBNAIL_URL = "thumbnail_url"
-        const val REMOTE_PLAYLIST_UPLOADER_NAME = "uploader"
-        const val REMOTE_PLAYLIST_DISPLAY_INDEX = "display_index"
-        const val REMOTE_PLAYLIST_STREAM_COUNT = "stream_count"
-    }
-}

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

@@ -0,0 +1,76 @@
+package org.schabi.newpipe.database.playlist.model;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Index;
+
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+
+import static androidx.room.ForeignKey.CASCADE;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_INDEX;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_PLAYLIST_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.PLAYLIST_STREAM_JOIN_TABLE;
+
+@Entity(tableName = PLAYLIST_STREAM_JOIN_TABLE,
+        primaryKeys = {JOIN_PLAYLIST_ID, JOIN_INDEX},
+        indices = {
+                @Index(value = {JOIN_PLAYLIST_ID, JOIN_INDEX}, unique = true),
+                @Index(value = {JOIN_STREAM_ID})
+        },
+        foreignKeys = {
+                @ForeignKey(entity = PlaylistEntity.class,
+                        parentColumns = PlaylistEntity.PLAYLIST_ID,
+                        childColumns = JOIN_PLAYLIST_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE, deferred = true),
+                @ForeignKey(entity = StreamEntity.class,
+                        parentColumns = StreamEntity.STREAM_ID,
+                        childColumns = JOIN_STREAM_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE, deferred = true)
+        })
+public class PlaylistStreamEntity {
+    public static final String PLAYLIST_STREAM_JOIN_TABLE = "playlist_stream_join";
+    public static final String JOIN_PLAYLIST_ID = "playlist_id";
+    public static final String JOIN_STREAM_ID = "stream_id";
+    public static final String JOIN_INDEX = "join_index";
+
+    @ColumnInfo(name = JOIN_PLAYLIST_ID)
+    private long playlistUid;
+
+    @ColumnInfo(name = JOIN_STREAM_ID)
+    private long streamUid;
+
+    @ColumnInfo(name = JOIN_INDEX)
+    private int index;
+
+    public PlaylistStreamEntity(final long playlistUid, final long streamUid, final int index) {
+        this.playlistUid = playlistUid;
+        this.streamUid = streamUid;
+        this.index = index;
+    }
+
+    public long getPlaylistUid() {
+        return playlistUid;
+    }
+
+    public void setPlaylistUid(final long playlistUid) {
+        this.playlistUid = playlistUid;
+    }
+
+    public long getStreamUid() {
+        return streamUid;
+    }
+
+    public void setStreamUid(final long streamUid) {
+        this.streamUid = streamUid;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(final int index) {
+        this.index = index;
+    }
+}

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

@@ -1,68 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2020 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.playlist.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.ForeignKey.Companion.CASCADE
-import androidx.room.Index
-import org.schabi.newpipe.database.LocalItem
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity.Companion.PLAYLIST_ID
-import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.Companion.JOIN_INDEX
-import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.Companion.JOIN_PLAYLIST_ID
-import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.Companion.JOIN_STREAM_ID
-import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.Companion.PLAYLIST_STREAM_JOIN_TABLE
-import org.schabi.newpipe.database.stream.model.StreamEntity
-
-@Entity(
-    tableName = PLAYLIST_STREAM_JOIN_TABLE,
-    primaryKeys = [JOIN_PLAYLIST_ID, JOIN_INDEX],
-    indices = [
-        Index(value = [JOIN_PLAYLIST_ID, JOIN_INDEX], unique = true),
-        Index(value = [JOIN_STREAM_ID])
-    ],
-    foreignKeys = [
-        ForeignKey(
-            entity = PlaylistEntity::class,
-            parentColumns = arrayOf(PLAYLIST_ID),
-            childColumns = arrayOf(JOIN_PLAYLIST_ID),
-            onDelete = CASCADE,
-            onUpdate = CASCADE,
-            deferred = true
-        ),
-        ForeignKey(
-            entity = StreamEntity::class,
-            parentColumns = arrayOf(StreamEntity.STREAM_ID),
-            childColumns = arrayOf(JOIN_STREAM_ID),
-            onDelete = CASCADE,
-            onUpdate = CASCADE,
-            deferred = true
-        )
-    ]
-)
-data class PlaylistStreamEntity(
-    @ColumnInfo(name = JOIN_PLAYLIST_ID)
-    val playlistUid: Long,
-
-    @ColumnInfo(name = JOIN_STREAM_ID)
-    val streamUid: Long,
-
-    @ColumnInfo(name = JOIN_INDEX)
-    val index: Int
-) : LocalItem {
-
-    override val localItemType: LocalItem.LocalItemType
-        get() = LocalItem.LocalItemType.PLAYLIST_STREAM_ITEM
-
-    companion object {
-        const val PLAYLIST_STREAM_JOIN_TABLE = "playlist_stream_join"
-        const val JOIN_PLAYLIST_ID = "playlist_id"
-        const val JOIN_STREAM_ID = "stream_id"
-        const val JOIN_INDEX = "join_index"
-    }
-}

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

@@ -1,23 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2020-2023 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
 package org.schabi.newpipe.database.stream
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
-import androidx.room.Ignore
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.LocalItem
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
-import org.schabi.newpipe.database.stream.model.StreamStateEntity.Companion.STREAM_PROGRESS_MILLIS
+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
 
-data class StreamStatisticsEntry(
+class StreamStatisticsEntry(
     @Embedded
     val streamEntity: StreamEntity,
 
@@ -33,23 +26,18 @@ data class StreamStatisticsEntry(
     @ColumnInfo(name = STREAM_WATCH_COUNT)
     val watchCount: Long
 ) : LocalItem {
-
-    override val localItemType: LocalItem.LocalItemType
-        get() = LocalItem.LocalItemType.STATISTIC_STREAM_ITEM
-
-    @Ignore
     fun toStreamInfoItem(): StreamInfoItem {
-        return StreamInfoItem(
-            streamEntity.serviceId,
-            streamEntity.url,
-            streamEntity.title,
-            streamEntity.streamType
-        ).apply {
-            duration = streamEntity.duration
-            uploaderName = streamEntity.uploader
-            uploaderUrl = streamEntity.uploaderUrl
-            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
-        }
+        val item = StreamInfoItem(streamEntity.serviceId, streamEntity.url, streamEntity.title, streamEntity.streamType)
+        item.duration = streamEntity.duration
+        item.uploaderName = streamEntity.uploader
+        item.uploaderUrl = streamEntity.uploaderUrl
+        item.thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
+
+        return item
+    }
+
+    override fun getLocalItemType(): LocalItem.LocalItemType {
+        return LocalItem.LocalItemType.STATISTIC_STREAM_ITEM
     }
 
     companion object {

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

@@ -9,12 +9,12 @@ import androidx.room.Transaction
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
-import java.time.OffsetDateTime
 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
 import org.schabi.newpipe.extractor.stream.StreamType
 import org.schabi.newpipe.util.StreamTypeUtil
+import java.time.OffsetDateTime
 
 @Dao
 abstract class StreamDAO : BasicDAO<StreamEntity> {
@@ -92,6 +92,7 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
         newerStream.uid = existentMinimalStream.uid
 
         if (!StreamTypeUtil.isLiveStream(newerStream.streamType)) {
+
             // Use the existent upload date if the newer stream does not have a better precision
             // (i.e. is an approximation). This is done to prevent unnecessary changes.
             val hasBetterPrecision =

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

@@ -0,0 +1,49 @@
+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;
+import androidx.room.Query;
+import androidx.room.Transaction;
+
+import org.schabi.newpipe.database.BasicDAO;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Maybe;
+
+@Dao
+public interface StreamStateDAO extends BasicDAO<StreamStateEntity> {
+    @Override
+    @Query("SELECT * FROM " + STREAM_STATE_TABLE)
+    Flowable<List<StreamStateEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + STREAM_STATE_TABLE)
+    int deleteAll();
+
+    @Override
+    default Flowable<List<StreamStateEntity>> listByService(final int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + STREAM_STATE_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
+    Maybe<StreamStateEntity> getState(long streamId);
+
+    @Query("DELETE FROM " + STREAM_STATE_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
+    int deleteState(long streamId);
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    void silentInsertInternal(StreamStateEntity streamState);
+
+    @Transaction
+    default long upsert(final StreamStateEntity stream) {
+        silentInsertInternal(stream);
+        return update(stream);
+    }
+}

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

@@ -1,46 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2021 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.stream.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-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.StreamStateEntity
-
-@Dao
-interface StreamStateDAO : BasicDAO<StreamStateEntity> {
-
-    @Query("SELECT * FROM " + StreamStateEntity.STREAM_STATE_TABLE)
-    override fun getAll(): Flowable<List<StreamStateEntity>>
-
-    @Query("DELETE FROM " + StreamStateEntity.STREAM_STATE_TABLE)
-    override fun deleteAll(): Int
-
-    override fun listByService(serviceId: Int): Flowable<List<StreamStateEntity>> {
-        throw UnsupportedOperationException()
-    }
-
-    @Query("SELECT * FROM " + StreamStateEntity.STREAM_STATE_TABLE + " WHERE " + StreamStateEntity.JOIN_STREAM_ID + " = :streamId")
-    fun getState(streamId: Long): Maybe<StreamStateEntity>
-
-    @Query("DELETE FROM " + StreamStateEntity.STREAM_STATE_TABLE + " WHERE " + StreamStateEntity.JOIN_STREAM_ID + " = :streamId")
-    fun deleteState(streamId: Long): Int
-
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
-    fun silentInsertInternal(streamState: StreamStateEntity)
-
-    @Transaction
-    fun upsert(stream: StreamStateEntity): Long {
-        silentInsertInternal(stream)
-        return update(stream).toLong()
-    }
-}

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

@@ -5,8 +5,6 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import java.io.Serializable
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_SERVICE_ID
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_TABLE
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_URL
@@ -16,6 +14,8 @@ 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
 
 @Entity(
     tableName = STREAM_TABLE,
@@ -86,12 +86,8 @@ data class StreamEntity(
 
     @Ignore
     constructor(item: PlayQueueItem) : this(
-        serviceId = item.serviceId,
-        url = item.url,
-        title = item.title,
-        streamType = item.streamType,
-        duration = item.duration,
-        uploader = item.uploader,
+        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)
     )

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

@@ -0,0 +1,112 @@
+package org.schabi.newpipe.database.stream.model;
+
+import androidx.annotation.Nullable;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+
+import java.util.Objects;
+
+import static androidx.room.ForeignKey.CASCADE;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
+
+@Entity(tableName = STREAM_STATE_TABLE,
+        primaryKeys = {JOIN_STREAM_ID},
+        foreignKeys = {
+                @ForeignKey(entity = StreamEntity.class,
+                        parentColumns = StreamEntity.STREAM_ID,
+                        childColumns = JOIN_STREAM_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE)
+        })
+public class StreamStateEntity {
+    public static final String STREAM_STATE_TABLE = "stream_state";
+    public static final String JOIN_STREAM_ID = "stream_id";
+    // This additional field is required for the SQL query because 'stream_id' is used
+    // for some other joins already
+    public static final String JOIN_STREAM_ID_ALIAS = "stream_id_alias";
+    public static final String STREAM_PROGRESS_MILLIS = "progress_time";
+
+    /**
+     * Playback state will not be saved, if playback time is less than this threshold (5000ms = 5s).
+     */
+    public static final long PLAYBACK_SAVE_THRESHOLD_START_MILLISECONDS = 5000;
+
+    /**
+     * Stream will be considered finished if the playback time left exceeds this threshold
+     * (60000ms = 60s).
+     * @see #isFinished(long)
+     * @see org.schabi.newpipe.database.feed.dao.FeedDAO#getLiveOrNotPlayedStreams()
+     * @see org.schabi.newpipe.database.feed.dao.FeedDAO#getLiveOrNotPlayedStreamsForGroup(long)
+     */
+    public static final long PLAYBACK_FINISHED_END_MILLISECONDS = 60000;
+
+    @ColumnInfo(name = JOIN_STREAM_ID)
+    private long streamUid;
+
+    @ColumnInfo(name = STREAM_PROGRESS_MILLIS)
+    private long progressMillis;
+
+    public StreamStateEntity(final long streamUid, final long progressMillis) {
+        this.streamUid = streamUid;
+        this.progressMillis = progressMillis;
+    }
+
+    public long getStreamUid() {
+        return streamUid;
+    }
+
+    public void setStreamUid(final long streamUid) {
+        this.streamUid = streamUid;
+    }
+
+    public long getProgressMillis() {
+        return progressMillis;
+    }
+
+    public void setProgressMillis(final long progressMillis) {
+        this.progressMillis = progressMillis;
+    }
+
+    /**
+     * The state will be considered valid, and thus be saved, if the progress is more than {@link
+     * #PLAYBACK_SAVE_THRESHOLD_START_MILLISECONDS} or at least 1/4 of the video length.
+     * @param durationInSeconds the duration of the stream connected with this state, in seconds
+     * @return whether this stream state entity should be saved or not
+     */
+    public boolean isValid(final long durationInSeconds) {
+        return progressMillis > PLAYBACK_SAVE_THRESHOLD_START_MILLISECONDS
+                || progressMillis > durationInSeconds * 1000 / 4;
+    }
+
+    /**
+     * The video will be considered as finished, if the time left is less than {@link
+     * #PLAYBACK_FINISHED_END_MILLISECONDS} and the progress is at least 3/4 of the video length.
+     * The state will be saved anyway, so that it can be shown under stream info items, but the
+     * player will not resume if a state is considered as finished. Finished streams are also the
+     * ones that can be filtered out in the feed fragment.
+     * @see org.schabi.newpipe.database.feed.dao.FeedDAO#getLiveOrNotPlayedStreams()
+     * @see org.schabi.newpipe.database.feed.dao.FeedDAO#getLiveOrNotPlayedStreamsForGroup(long)
+     * @param durationInSeconds the duration of the stream connected with this state, in seconds
+     * @return whether the stream is finished or not
+     */
+    public boolean isFinished(final long durationInSeconds) {
+        return progressMillis >= durationInSeconds * 1000 - PLAYBACK_FINISHED_END_MILLISECONDS
+                && progressMillis >= durationInSeconds * 1000 * 3 / 4;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object obj) {
+        if (obj instanceof StreamStateEntity) {
+            return ((StreamStateEntity) obj).streamUid == streamUid
+                    && ((StreamStateEntity) obj).progressMillis == progressMillis;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(streamUid, progressMillis);
+    }
+}

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

@@ -1,85 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2023 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.stream.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.ForeignKey.Companion.CASCADE
-import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_ID
-import org.schabi.newpipe.database.stream.model.StreamStateEntity.Companion.JOIN_STREAM_ID
-import org.schabi.newpipe.database.stream.model.StreamStateEntity.Companion.PLAYBACK_FINISHED_END_MILLISECONDS
-import org.schabi.newpipe.database.stream.model.StreamStateEntity.Companion.STREAM_STATE_TABLE
-
-@Entity(
-    tableName = STREAM_STATE_TABLE,
-    primaryKeys = [JOIN_STREAM_ID],
-    foreignKeys = [
-        ForeignKey(
-            entity = StreamEntity::class,
-            parentColumns = arrayOf(STREAM_ID),
-            childColumns = arrayOf(JOIN_STREAM_ID),
-            onDelete = CASCADE,
-            onUpdate = CASCADE
-        )
-    ]
-)
-data class StreamStateEntity(
-    @ColumnInfo(name = JOIN_STREAM_ID)
-    val streamUid: Long,
-
-    @ColumnInfo(name = STREAM_PROGRESS_MILLIS)
-    val progressMillis: Long
-) {
-    /**
-     * The state will be considered valid, and thus be saved, if the progress is more than
-     * [PLAYBACK_SAVE_THRESHOLD_START_MILLISECONDS] or at least 1/4 of the video length.
-     * @param durationInSeconds the duration of the stream connected with this state, in seconds
-     * @return whether this stream state entity should be saved or not
-     */
-    fun isValid(durationInSeconds: Long): Boolean {
-        return progressMillis > PLAYBACK_SAVE_THRESHOLD_START_MILLISECONDS ||
-            progressMillis > durationInSeconds * 1000 / 4
-    }
-
-    /**
-     * The video will be considered as finished, if the time left is less than
-     * [PLAYBACK_FINISHED_END_MILLISECONDS] and the progress is at least 3/4 of the video length.
-     * The state will be saved anyway, so that it can be shown under stream info items, but the
-     * player will not resume if a state is considered as finished. Finished streams are also the
-     * ones that can be filtered out in the feed fragment.
-     * @param durationInSeconds the duration of the stream connected with this state, in seconds
-     * @return whether the stream is finished or not
-     */
-    fun isFinished(durationInSeconds: Long): Boolean {
-        return progressMillis >= durationInSeconds * 1000 - PLAYBACK_FINISHED_END_MILLISECONDS &&
-            progressMillis >= durationInSeconds * 1000 * 3 / 4
-    }
-
-    companion object {
-        const val STREAM_STATE_TABLE = "stream_state"
-        const val JOIN_STREAM_ID = "stream_id"
-
-        // This additional field is required for the SQL query because 'stream_id' is used
-        // for some other joins already
-        const val JOIN_STREAM_ID_ALIAS = "stream_id_alias"
-        const val STREAM_PROGRESS_MILLIS = "progress_time"
-
-        /**
-         * Playback state will not be saved, if playback time is less than this threshold
-         * (5000ms = 5s).
-         */
-        const val PLAYBACK_SAVE_THRESHOLD_START_MILLISECONDS = 5000L
-
-        /**
-         * Stream will be considered finished if the playback time left exceeds this threshold
-         * (60000ms = 60s).
-         * @see org.schabi.newpipe.database.stream.model.StreamStateEntity.isFinished
-         */
-        const val PLAYBACK_FINISHED_END_MILLISECONDS = 60000L
-    }
-}

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

@@ -0,0 +1,14 @@
+package org.schabi.newpipe.database.subscription;
+
+import androidx.annotation.IntDef;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@IntDef({NotificationMode.DISABLED, NotificationMode.ENABLED})
+@Retention(RetentionPolicy.SOURCE)
+public @interface NotificationMode {
+
+    int DISABLED = 0;
+    int ENABLED = 1;
+    //other values reserved for the future
+}

app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.kt

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.subscription
-
-import androidx.annotation.IntDef
-
-@IntDef(NotificationMode.Companion.DISABLED, NotificationMode.Companion.ENABLED)
-@Retention(AnnotationRetention.SOURCE)
-annotation class NotificationMode {
-    companion object {
-        const val DISABLED = 0
-        const val ENABLED = 1 // other values reserved for the future
-    }
-}

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.kt

@@ -90,7 +90,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
     internal abstract fun silentInsertAllInternal(entities: List<SubscriptionEntity>): List<Long>
 
     @Transaction
-    open fun upsertAll(entities: List<SubscriptionEntity>) {
+    open fun upsertAll(entities: List<SubscriptionEntity>): List<SubscriptionEntity> {
         val insertUidList = silentInsertAllInternal(entities)
 
         insertUidList.forEachIndexed { index: Int, uidFromInsert: Long ->
@@ -99,12 +99,14 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
             if (uidFromInsert != -1L) {
                 entity.uid = uidFromInsert
             } else {
-                val subscriptionIdFromDb = getSubscriptionIdInternal(entity.serviceId, entity.url!!)
+                val subscriptionIdFromDb = getSubscriptionIdInternal(entity.serviceId, entity.url)
                     ?: throw IllegalStateException("Subscription cannot be null just after insertion.")
                 entity.uid = subscriptionIdFromDb
 
                 update(entity)
             }
         }
+
+        return entities
     }
 }

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

@@ -0,0 +1,200 @@
+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;
+import androidx.room.Index;
+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;
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_URL;
+
+@Entity(tableName = SUBSCRIPTION_TABLE,
+        indices = {@Index(value = {SUBSCRIPTION_SERVICE_ID, SUBSCRIPTION_URL}, unique = true)})
+public class SubscriptionEntity {
+    public static final String SUBSCRIPTION_UID = "uid";
+    public static final String SUBSCRIPTION_TABLE = "subscriptions";
+    public static final String SUBSCRIPTION_SERVICE_ID = "service_id";
+    public static final String SUBSCRIPTION_URL = "url";
+    public static final String SUBSCRIPTION_NAME = "name";
+    public static final String SUBSCRIPTION_AVATAR_URL = "avatar_url";
+    public static final String SUBSCRIPTION_SUBSCRIBER_COUNT = "subscriber_count";
+    public static final String SUBSCRIPTION_DESCRIPTION = "description";
+    public static final String SUBSCRIPTION_NOTIFICATION_MODE  = "notification_mode";
+
+    @PrimaryKey(autoGenerate = true)
+    private long uid = 0;
+
+    @ColumnInfo(name = SUBSCRIPTION_SERVICE_ID)
+    private int serviceId = Constants.NO_SERVICE_ID;
+
+    @ColumnInfo(name = SUBSCRIPTION_URL)
+    private String url;
+
+    @ColumnInfo(name = SUBSCRIPTION_NAME)
+    private String name;
+
+    @ColumnInfo(name = SUBSCRIPTION_AVATAR_URL)
+    private String avatarUrl;
+
+    @ColumnInfo(name = SUBSCRIPTION_SUBSCRIBER_COUNT)
+    private Long subscriberCount;
+
+    @ColumnInfo(name = SUBSCRIPTION_DESCRIPTION)
+    private String description;
+
+    @ColumnInfo(name = SUBSCRIPTION_NOTIFICATION_MODE)
+    private int notificationMode;
+
+    @Ignore
+    public static SubscriptionEntity from(@NonNull final ChannelInfo info) {
+        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());
+        return result;
+    }
+
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(final long uid) {
+        this.uid = uid;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(final int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(final String url) {
+        this.url = url;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Nullable
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public void setAvatarUrl(@Nullable final String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public Long getSubscriberCount() {
+        return subscriberCount;
+    }
+
+    public void setSubscriberCount(final Long subscriberCount) {
+        this.subscriberCount = subscriberCount;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    @NotificationMode
+    public int getNotificationMode() {
+        return notificationMode;
+    }
+
+    public void setNotificationMode(@NotificationMode final int notificationMode) {
+        this.notificationMode = notificationMode;
+    }
+
+    @Ignore
+    public void setData(final String n, final String au, final String d, final Long sc) {
+        this.setName(n);
+        this.setAvatarUrl(au);
+        this.setDescription(d);
+        this.setSubscriberCount(sc);
+    }
+
+    @Ignore
+    public ChannelInfoItem toChannelInfoItem() {
+        final ChannelInfoItem item = new ChannelInfoItem(getServiceId(), getUrl(), getName());
+        item.setThumbnails(ImageStrategy.dbUrlToImageList(getAvatarUrl()));
+        item.setSubscriberCount(getSubscriberCount());
+        item.setDescription(getDescription());
+        return item;
+    }
+
+
+    // TODO: Remove these generated methods by migrating this class to a data class from Kotlin.
+    @Override
+    @SuppressWarnings("EqualsReplaceableByObjectsCall")
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        final SubscriptionEntity that = (SubscriptionEntity) o;
+
+        if (uid != that.uid) {
+            return false;
+        }
+        if (serviceId != that.serviceId) {
+            return false;
+        }
+        if (!url.equals(that.url)) {
+            return false;
+        }
+        if (name != null ? !name.equals(that.name) : that.name != null) {
+            return false;
+        }
+        if (avatarUrl != null ? !avatarUrl.equals(that.avatarUrl) : that.avatarUrl != null) {
+            return false;
+        }
+        if (subscriberCount != null
+                ? !subscriberCount.equals(that.subscriberCount)
+                : that.subscriberCount != null) {
+            return false;
+        }
+        return description != null
+                ? description.equals(that.description)
+                : that.description == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (uid ^ (uid >>> 32));
+        result = 31 * result + serviceId;
+        result = 31 * result + url.hashCode();
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (avatarUrl != null ? avatarUrl.hashCode() : 0);
+        result = 31 * result + (subscriberCount != null ? subscriberCount.hashCode() : 0);
+        result = 31 * result + (description != null ? description.hashCode() : 0);
+        return result;
+    }
+}

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

@@ -1,87 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2024 NewPipe contributors <https://newpipe.net>
- * SPDX-FileCopyrightText: 2025 NewPipe e.V. <https://newpipe-ev.de>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.database.subscription
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Ignore
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import org.schabi.newpipe.extractor.channel.ChannelInfo
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem
-import org.schabi.newpipe.util.NO_SERVICE_ID
-import org.schabi.newpipe.util.image.ImageStrategy
-
-@Entity(
-    tableName = SubscriptionEntity.Companion.SUBSCRIPTION_TABLE,
-    indices = [
-        Index(
-            value = [SubscriptionEntity.Companion.SUBSCRIPTION_SERVICE_ID, SubscriptionEntity.Companion.SUBSCRIPTION_URL],
-            unique = true
-        )
-    ]
-)
-data class SubscriptionEntity(
-    @PrimaryKey(autoGenerate = true)
-    var uid: Long = 0,
-
-    @ColumnInfo(name = SUBSCRIPTION_SERVICE_ID)
-    var serviceId: Int = NO_SERVICE_ID,
-
-    @ColumnInfo(name = SUBSCRIPTION_URL)
-    var url: String? = null,
-
-    @ColumnInfo(name = SUBSCRIPTION_NAME)
-    var name: String? = null,
-
-    @ColumnInfo(name = SUBSCRIPTION_AVATAR_URL)
-    var avatarUrl: String? = null,
-
-    @ColumnInfo(name = SUBSCRIPTION_SUBSCRIBER_COUNT)
-    var subscriberCount: Long? = null,
-
-    @ColumnInfo(name = SUBSCRIPTION_DESCRIPTION)
-    var description: String? = null,
-
-    @get:NotificationMode
-    @ColumnInfo(name = SUBSCRIPTION_NOTIFICATION_MODE)
-    var notificationMode: Int = 0
-) {
-    @Ignore
-    fun toChannelInfoItem(): ChannelInfoItem {
-        return ChannelInfoItem(this.serviceId, this.url, this.name).apply {
-            thumbnails = ImageStrategy.dbUrlToImageList(this@SubscriptionEntity.avatarUrl)
-            subscriberCount = this@SubscriptionEntity.subscriberCount ?: -1
-            description = this@SubscriptionEntity.description
-        }
-    }
-
-    companion object {
-        const val SUBSCRIPTION_UID: String = "uid"
-        const val SUBSCRIPTION_TABLE: String = "subscriptions"
-        const val SUBSCRIPTION_SERVICE_ID: String = "service_id"
-        const val SUBSCRIPTION_URL: String = "url"
-        const val SUBSCRIPTION_NAME: String = "name"
-        const val SUBSCRIPTION_AVATAR_URL: String = "avatar_url"
-        const val SUBSCRIPTION_SUBSCRIBER_COUNT: String = "subscriber_count"
-        const val SUBSCRIPTION_DESCRIPTION: String = "description"
-        const val SUBSCRIPTION_NOTIFICATION_MODE: String = "notification_mode"
-
-        @JvmStatic
-        @Ignore
-        fun from(info: ChannelInfo): SubscriptionEntity {
-            return SubscriptionEntity(
-                serviceId = info.serviceId,
-                url = info.url,
-                name = info.name,
-                avatarUrl = ImageStrategy.imageListToDbUrl(info.avatars),
-                description = info.description,
-                subscriberCount = info.subscriberCount
-            )
-        }
-    }
-}

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

@@ -20,6 +20,8 @@ import org.schabi.newpipe.views.FocusOverlayView;
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class DownloadActivity extends AppCompatActivity {
 
     private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
@@ -31,6 +33,7 @@ public class DownloadActivity extends AppCompatActivity {
         i.setClass(this, DownloadManagerService.class);
         startService(i);
 
+        assureCorrectAppLanguage(this);
         ThemeHelper.setTheme(this);
 
         super.onCreate(savedInstanceState);

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

@@ -2,6 +2,7 @@ package org.schabi.newpipe.download;
 
 import static org.schabi.newpipe.extractor.stream.DeliveryMethod.PROGRESSIVE_HTTP;
 import static org.schabi.newpipe.util.ListHelper.getStreamsOfSpecifiedDelivery;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -389,7 +390,8 @@ public class DownloadDialog extends DialogFragment
                     }
                 }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
-                                "Downloading video stream size", currentInfo))));
+                                "Downloading video stream size",
+                                currentInfo.getServiceId()))));
         disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(getWrappedAudioStreams())
                 .subscribe(result -> {
                     if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
@@ -398,7 +400,8 @@ public class DownloadDialog extends DialogFragment
                     }
                 }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
-                                "Downloading audio stream size", currentInfo))));
+                                "Downloading audio stream size",
+                                currentInfo.getServiceId()))));
         disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(wrappedSubtitleStreams)
                 .subscribe(result -> {
                     if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
@@ -407,7 +410,8 @@ public class DownloadDialog extends DialogFragment
                     }
                 }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
-                                "Downloading subtitle stream size", currentInfo))));
+                                "Downloading subtitle stream size",
+                                currentInfo.getServiceId()))));
     }
 
     private void setupAudioTrackSpinner() {
@@ -747,6 +751,7 @@ public class DownloadDialog extends DialogFragment
     }
 
     private void showFailedDialog(@StringRes final int msg) {
+        assureCorrectAppLanguage(requireContext());
         new AlertDialog.Builder(context)
                 .setTitle(R.string.general_error)
                 .setMessage(msg)
@@ -1133,7 +1138,7 @@ public class DownloadDialog extends DialogFragment
         }
 
         DownloadManagerService.startMission(context, urls, storage, kind, threads,
-                currentInfo, psName, psArgs, nearLength, new ArrayList<>(recoveryInfo));
+                currentInfo.getUrl(), psName, psArgs, nearLength, new ArrayList<>(recoveryInfo));
 
         Toast.makeText(context, getString(R.string.download_has_started),
                 Toast.LENGTH_SHORT).show();

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

@@ -36,8 +36,8 @@ public class AcraReportSender implements ReportSender {
         ErrorUtil.openActivity(context, new ErrorInfo(
                 new String[]{report.getString(ReportField.STACK_TRACE)},
                 UserAction.UI_ERROR,
+                ErrorInfo.SERVICE_NONE,
                 "ACRA report",
-                null,
                 R.string.app_ui_crash));
     }
 }

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

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.error;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -77,6 +79,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
+        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
 
         ThemeHelper.setDayNightMode(this);
@@ -115,7 +118,7 @@ public class ErrorActivity extends AppCompatActivity {
 
         // normal bugreport
         buildInfo(errorInfo);
-        activityErrorBinding.errorMessageView.setText(errorInfo.getMessage(this));
+        activityErrorBinding.errorMessageView.setText(errorInfo.getMessageStringId());
         activityErrorBinding.errorView.setText(formErrorText(errorInfo.getStackTraces()));
 
         // print stack trace once again for debugging:
@@ -303,11 +306,12 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private String getAppLanguage() {
-        return Localization.getAppLocale().toString();
+        return Localization.getAppLocale(getApplicationContext()).toString();
     }
 
     private String getOsString() {
-        final String osBase = Build.VERSION.BASE_OS;
+        final String osBase = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                ? Build.VERSION.BASE_OS : "Android";
         return System.getProperty("os.name")
                 + " " + (osBase.isEmpty() ? "Android" : osBase)
                 + " " + Build.VERSION.RELEASE

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

@@ -1,353 +1,115 @@
 package org.schabi.newpipe.error
 
-import android.content.Context
 import android.os.Parcelable
 import androidx.annotation.StringRes
 import com.google.android.exoplayer2.ExoPlaybackException
-import com.google.android.exoplayer2.upstream.HttpDataSource
-import com.google.android.exoplayer2.upstream.Loader
-import java.net.UnknownHostException
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.Info
-import org.schabi.newpipe.extractor.ServiceList
-import org.schabi.newpipe.extractor.ServiceList.YouTube
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
-import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException
 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.exceptions.GeographicRestrictionException
-import org.schabi.newpipe.extractor.exceptions.PaidContentException
-import org.schabi.newpipe.extractor.exceptions.PrivateContentException
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
-import org.schabi.newpipe.extractor.exceptions.SignInConfirmNotBotException
-import org.schabi.newpipe.extractor.exceptions.SoundCloudGoPlusContentException
-import org.schabi.newpipe.extractor.exceptions.UnsupportedContentInCountryException
-import org.schabi.newpipe.extractor.exceptions.YoutubeMusicPremiumContentException
 import org.schabi.newpipe.ktx.isNetworkRelated
-import org.schabi.newpipe.player.mediasource.FailedMediaSource
-import org.schabi.newpipe.player.resolver.PlaybackResolver
-import org.schabi.newpipe.util.Localization
+import org.schabi.newpipe.util.ServiceHelper
 
-/**
- * An error has occurred in the app. This class contains plain old parcelable data that can be used
- * to report the error and to show it to the user along with correct action buttons.
- */
 @Parcelize
-class ErrorInfo private constructor(
+class ErrorInfo(
     val stackTraces: Array<String>,
     val userAction: UserAction,
+    val serviceName: String,
     val request: String,
-    val serviceId: Int?,
-    private val message: ErrorMessage,
-    /**
-     * If `true`, a report button will be shown for this error. Otherwise the error is not something
-     * that can really be reported (e.g. a network issue, or content not being available at all).
-     */
-    val isReportable: Boolean,
-    /**
-     * If `true`, the process causing this error can be retried, otherwise not.
-     */
-    val isRetryable: Boolean,
-    /**
-     * If present, indicates that the exception was a ReCaptchaException, and this is the URL
-     * provided by the service that can be used to solve the ReCaptcha challenge.
-     */
-    val recaptchaUrl: String?,
-    /**
-     * If present, this resource can alternatively be opened in browser (useful if NewPipe is
-     * badly broken).
-     */
-    val openInBrowserUrl: String?
+    val messageStringId: Int
 ) : Parcelable {
 
-    @JvmOverloads
-    constructor(
+    // no need to store throwable, all data for report is in other variables
+    // also, the throwable might not be serializable, see TeamNewPipe/NewPipe#7302
+    @IgnoredOnParcel
+    var throwable: Throwable? = null
+
+    private constructor(
         throwable: Throwable,
         userAction: UserAction,
-        request: String,
-        serviceId: Int? = null,
-        openInBrowserUrl: String? = null
+        serviceName: String,
+        request: String
     ) : this(
         throwableToStringList(throwable),
         userAction,
+        serviceName,
         request,
-        serviceId,
-        getMessage(throwable, userAction, serviceId),
-        isReportable(throwable),
-        isRetryable(throwable),
-        (throwable as? ReCaptchaException)?.url,
-        openInBrowserUrl
-    )
+        getMessageStringId(throwable, userAction)
+    ) {
+        this.throwable = throwable
+    }
 
-    @JvmOverloads
-    constructor(
-        throwables: List<Throwable>,
+    private constructor(
+        throwable: List<Throwable>,
         userAction: UserAction,
-        request: String,
-        serviceId: Int? = null,
-        openInBrowserUrl: String? = null
+        serviceName: String,
+        request: String
     ) : this(
-        throwableListToStringList(throwables),
+        throwableListToStringList(throwable),
         userAction,
+        serviceName,
         request,
-        serviceId,
-        getMessage(throwables.firstOrNull(), userAction, serviceId),
-        throwables.any(::isReportable),
-        throwables.isEmpty() || throwables.any(::isRetryable),
-        throwables.firstNotNullOfOrNull { it as? ReCaptchaException }?.url,
-        openInBrowserUrl
-    )
-
-    // constructor to manually build ErrorInfo when no throwable is available
-    constructor(
-        stackTraces: Array<String>,
-        userAction: UserAction,
-        request: String,
-        serviceId: Int?,
-        @StringRes message: Int
-    ) :
-        this(
-            stackTraces, userAction, request, serviceId, ErrorMessage(message),
-            true, false, null, null
-        )
-
-    // constructor with only one throwable to extract service id and openInBrowserUrl from an Info
-    constructor(
-        throwable: Throwable,
-        userAction: UserAction,
-        request: String,
-        info: Info?
-    ) :
-        this(throwable, userAction, request, info?.serviceId, info?.url)
-
-    // constructor with multiple throwables to extract service id and openInBrowserUrl from an Info
-    constructor(
-        throwables: List<Throwable>,
-        userAction: UserAction,
-        request: String,
-        info: Info?
-    ) :
-        this(throwables, userAction, request, info?.serviceId, info?.url)
-
-    fun getServiceName(): String {
-        return getServiceName(serviceId)
+        getMessageStringId(throwable.firstOrNull(), userAction)
+    ) {
+        this.throwable = throwable.firstOrNull()
     }
 
-    fun getMessage(context: Context): String {
-        return message.getString(context)
-    }
+    // constructors with single throwable
+    constructor(throwable: Throwable, userAction: UserAction, request: String) :
+        this(throwable, userAction, SERVICE_NONE, request)
+    constructor(throwable: Throwable, userAction: UserAction, request: String, serviceId: Int) :
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
+    constructor(throwable: Throwable, userAction: UserAction, request: String, info: Info?) :
+        this(throwable, userAction, getInfoServiceName(info), request)
+
+    // constructors with list of throwables
+    constructor(throwable: List<Throwable>, userAction: UserAction, request: String) :
+        this(throwable, userAction, SERVICE_NONE, request)
+    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, serviceId: Int) :
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
+    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, info: Info?) :
+        this(throwable, userAction, getInfoServiceName(info), request)
 
     companion object {
-        @Parcelize
-        class ErrorMessage(
-            @StringRes
-            private val stringRes: Int,
-            private vararg val formatArgs: String
-        ) : Parcelable {
-            fun getString(context: Context): String {
-                // use Localization.compatGetString() just in case context is not AppCompatActivity
-                return if (formatArgs.isEmpty()) {
-                    Localization.compatGetString(context, stringRes)
-                } else {
-                    Localization.compatGetString(context, stringRes, *formatArgs)
-                }
-            }
-        }
-
-        const val SERVICE_NONE = "<unknown_service>"
-
-        private fun getServiceName(serviceId: Int?) = // not using getNameOfServiceById since we want to accept a nullable serviceId and we
-            // want to default to SERVICE_NONE
-            ServiceList.all()?.firstOrNull { it.serviceId == serviceId }?.serviceInfo?.name
-                ?: SERVICE_NONE
+        const val SERVICE_NONE = "none"
 
         fun throwableToStringList(throwable: Throwable) = arrayOf(throwable.stackTraceToString())
 
-        fun throwableListToStringList(throwableList: List<Throwable>) = throwableList.map { it.stackTraceToString() }.toTypedArray()
+        fun throwableListToStringList(throwableList: List<Throwable>) =
+            throwableList.map { it.stackTraceToString() }.toTypedArray()
 
-        fun getMessage(
+        private fun getInfoServiceName(info: Info?) =
+            if (info == null) SERVICE_NONE else ServiceHelper.getNameOfServiceById(info.serviceId)
+
+        @StringRes
+        private fun getMessageStringId(
             throwable: Throwable?,
-            action: UserAction?,
-            serviceId: Int?
-        ): ErrorMessage {
+            action: UserAction
+        ): Int {
             return when {
-                // player exceptions
-                // some may be IOException, so do these checks before isNetworkRelated!
+                throwable is AccountTerminatedException -> R.string.account_terminated
+                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 ExtractionException -> R.string.parsing_error
                 throwable is ExoPlaybackException -> {
-                    val cause = throwable.cause
-                    when {
-                        cause is HttpDataSource.InvalidResponseCodeException -> {
-                            if (cause.responseCode == 403) {
-                                if (serviceId == YouTube.serviceId) {
-                                    ErrorMessage(R.string.youtube_player_http_403)
-                                } else {
-                                    ErrorMessage(R.string.player_http_403)
-                                }
-                            } else {
-                                ErrorMessage(R.string.player_http_invalid_status, cause.responseCode.toString())
-                            }
-                        }
-
-                        cause is Loader.UnexpectedLoaderException && cause.cause is ExtractionException ->
-                            getMessage(throwable, action, serviceId)
-
-                        throwable.type == ExoPlaybackException.TYPE_SOURCE ->
-                            ErrorMessage(R.string.player_stream_failure)
-
-                        throwable.type == ExoPlaybackException.TYPE_UNEXPECTED ->
-                            ErrorMessage(R.string.player_recoverable_failure)
-
-                        else ->
-                            ErrorMessage(R.string.player_unrecoverable_failure)
+                    when (throwable.type) {
+                        ExoPlaybackException.TYPE_SOURCE -> R.string.player_stream_failure
+                        ExoPlaybackException.TYPE_UNEXPECTED -> R.string.player_recoverable_failure
+                        else -> R.string.player_unrecoverable_failure
                     }
                 }
-
-                throwable is FailedMediaSource.FailedMediaSourceException ->
-                    getMessage(throwable.cause, action, serviceId)
-
-                throwable is PlaybackResolver.ResolverException ->
-                    ErrorMessage(R.string.player_stream_failure)
-
-                // content not available exceptions
-                throwable is AccountTerminatedException ->
-                    throwable.message
-                        ?.takeIf { reason -> !reason.isEmpty() }
-                        ?.let { reason ->
-                            ErrorMessage(
-                                R.string.account_terminated_service_provides_reason,
-                                getServiceName(serviceId),
-                                reason
-                            )
-                        }
-                        ?: ErrorMessage(R.string.account_terminated)
-
-                throwable is AgeRestrictedContentException ->
-                    ErrorMessage(R.string.restricted_video_no_stream)
-
-                throwable is GeographicRestrictionException ->
-                    ErrorMessage(R.string.georestricted_content)
-
-                throwable is PaidContentException ->
-                    ErrorMessage(R.string.paid_content)
-
-                throwable is PrivateContentException ->
-                    ErrorMessage(R.string.private_content)
-
-                throwable is SoundCloudGoPlusContentException ->
-                    ErrorMessage(R.string.soundcloud_go_plus_content)
-
-                throwable is UnsupportedContentInCountryException ->
-                    ErrorMessage(R.string.unsupported_content_in_country)
-
-                throwable is YoutubeMusicPremiumContentException ->
-                    ErrorMessage(R.string.youtube_music_premium_content)
-
-                throwable is SignInConfirmNotBotException ->
-                    ErrorMessage(R.string.sign_in_confirm_not_bot_error, getServiceName(serviceId))
-
-                throwable is ContentNotAvailableException ->
-                    ErrorMessage(R.string.content_not_available)
-
-                // other extractor exceptions
-                throwable is ContentNotSupportedException ->
-                    ErrorMessage(R.string.content_not_supported)
-
-                // ReCaptchas will be handled in a special way anyway
-                throwable is ReCaptchaException ->
-                    ErrorMessage(R.string.recaptcha_request_toast)
-
-                // test this at the end as many exceptions could be a subclass of IOException
-                throwable != null && throwable.isNetworkRelated ->
-                    ErrorMessage(R.string.network_error)
-
-                // an extraction exception unrelated to the network
-                // is likely an issue with parsing the website
-                throwable is ExtractionException ->
-                    ErrorMessage(R.string.parsing_error)
-
-                // user actions (in case the exception is null or unrecognizable)
-                action == UserAction.UI_ERROR ->
-                    ErrorMessage(R.string.app_ui_crash)
-
-                action == UserAction.REQUESTED_COMMENTS ->
-                    ErrorMessage(R.string.error_unable_to_load_comments)
-
-                action == UserAction.SUBSCRIPTION_CHANGE ->
-                    ErrorMessage(R.string.subscription_change_failed)
-
-                action == UserAction.SUBSCRIPTION_UPDATE ->
-                    ErrorMessage(R.string.subscription_update_failed)
-
-                action == UserAction.LOAD_IMAGE ->
-                    ErrorMessage(R.string.could_not_load_thumbnails)
-
-                action == UserAction.DOWNLOAD_OPEN_DIALOG ->
-                    ErrorMessage(R.string.could_not_setup_download_menu)
-
-                else ->
-                    ErrorMessage(R.string.error_snackbar_message)
-            }
-        }
-
-        fun isReportable(throwable: Throwable?): Boolean {
-            return when (throwable) {
-                // we don't have an exception, so this is a manually built error, which likely
-                // indicates that it's important and is thus reportable
-                null -> true
-
-                // if the service explicitly said that content is not available (e.g. age
-                // restrictions, video deleted, etc.), there is no use in letting users report it
-                is ContentNotAvailableException -> !isContentSurelyNotAvailable(throwable)
-
-                // we know the content is not supported, no need to let the user report it
-                is ContentNotSupportedException -> false
-
-                // happens often when there is no internet connection; we don't use
-                // `throwable.isNetworkRelated` since any `IOException` would make that function
-                // return true, but not all `IOException`s are network related
-                is UnknownHostException -> false
-
-                // by default, this is an unexpected exception, which the user could report
-                else -> true
-            }
-        }
-
-        fun isRetryable(throwable: Throwable?): Boolean {
-            return when (throwable) {
-                // if we know the content is surely not available, retrying won't help
-                is ContentNotAvailableException -> !isContentSurelyNotAvailable(throwable)
-
-                // we know the content is not supported, retrying won't help
-                is ContentNotSupportedException -> false
-
-                // by default (including if throwable is null), enable retrying (though the retry
-                // button will be shown only if a way to perform the retry is implemented)
-                else -> true
-            }
-        }
-
-        /**
-         * Unfortunately sometimes [ContentNotAvailableException] may not indicate that the content
-         * is blocked/deleted/paid, but may just indicate that we could not extract it. This is an
-         * inconsistency in the exceptions thrown by the extractor, but until it is fixed, this
-         * function will distinguish between the two types.
-         * @return `true` if the content is not available because of a limitation imposed by the
-         * service or the owner, `false` if the extractor could not extract info about it
-         */
-        fun isContentSurelyNotAvailable(e: ContentNotAvailableException): Boolean {
-            return when (e) {
-                is AccountTerminatedException,
-                is AgeRestrictedContentException,
-                is GeographicRestrictionException,
-                is PaidContentException,
-                is PrivateContentException,
-                is SoundCloudGoPlusContentException,
-                is UnsupportedContentInCountryException,
-                is YoutubeMusicPremiumContentException -> true
-
-                else -> false
+                action == UserAction.UI_ERROR -> R.string.app_ui_crash
+                action == UserAction.REQUESTED_COMMENTS -> R.string.error_unable_to_load_comments
+                action == UserAction.SUBSCRIPTION_CHANGE -> R.string.subscription_change_failed
+                action == UserAction.SUBSCRIPTION_UPDATE -> R.string.subscription_update_failed
+                action == UserAction.LOAD_IMAGE -> R.string.could_not_load_thumbnails
+                action == UserAction.DOWNLOAD_OPEN_DIALOG -> R.string.could_not_setup_download_menu
+                else -> R.string.general_error
             }
         }
     }

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

@@ -2,6 +2,7 @@ package org.schabi.newpipe.error
 
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.TextView
@@ -11,16 +12,30 @@ import androidx.fragment.app.Fragment
 import com.jakewharton.rxbinding4.view.clicks
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.Disposable
-import java.util.concurrent.TimeUnit
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
+import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
+import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException
+import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
+import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
+import org.schabi.newpipe.extractor.exceptions.GeographicRestrictionException
+import org.schabi.newpipe.extractor.exceptions.PaidContentException
+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.utils.Utils.isNullOrEmpty
 import org.schabi.newpipe.ktx.animate
+import org.schabi.newpipe.ktx.isInterruptedCaused
+import org.schabi.newpipe.ktx.isNetworkRelated
+import org.schabi.newpipe.util.ServiceHelper
 import org.schabi.newpipe.util.external_communication.ShareUtils
+import java.util.concurrent.TimeUnit
 
 class ErrorPanelHelper(
     private val fragment: Fragment,
     rootView: View,
-    onRetry: Runnable?
+    onRetry: Runnable
 ) {
     private val context: Context = rootView.context!!
 
@@ -41,15 +56,12 @@ class ErrorPanelHelper(
         errorPanelRoot.findViewById(R.id.error_open_in_browser)
 
     private var errorDisposable: Disposable? = null
-    private var retryShouldBeShown: Boolean = (onRetry != null)
 
     init {
-        if (onRetry != null) {
-            errorDisposable = errorRetryButton.clicks()
-                .debounce(300, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe { onRetry.run() }
-        }
+        errorDisposable = errorRetryButton.clicks()
+            .debounce(300, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { onRetry.run() }
     }
 
     private fun ensureDefaultVisibility() {
@@ -63,32 +75,64 @@ class ErrorPanelHelper(
     }
 
     fun showError(errorInfo: ErrorInfo) {
-        ensureDefaultVisibility()
-        errorTextView.text = errorInfo.getMessage(context)
 
-        if (errorInfo.recaptchaUrl != null) {
-            showAndSetErrorButtonAction(R.string.recaptcha_solve) {
+        if (errorInfo.throwable != null && errorInfo.throwable!!.isInterruptedCaused) {
+            if (DEBUG) {
+                Log.w(TAG, "onError() isInterruptedCaused! = [$errorInfo.throwable]")
+            }
+            return
+        }
+
+        ensureDefaultVisibility()
+
+        if (errorInfo.throwable is ReCaptchaException) {
+            errorTextView.setText(R.string.recaptcha_request_toast)
+
+            showAndSetErrorButtonAction(
+                R.string.recaptcha_solve
+            ) {
                 // Starting ReCaptcha Challenge Activity
                 val intent = Intent(context, ReCaptchaActivity::class.java)
-                intent.putExtra(ReCaptchaActivity.RECAPTCHA_URL_EXTRA, errorInfo.recaptchaUrl)
+                intent.putExtra(
+                    ReCaptchaActivity.RECAPTCHA_URL_EXTRA,
+                    (errorInfo.throwable as ReCaptchaException).url
+                )
                 fragment.startActivityForResult(intent, ReCaptchaActivity.RECAPTCHA_REQUEST)
                 errorActionButton.setOnClickListener(null)
             }
-        } else if (errorInfo.isReportable) {
-            showAndSetErrorButtonAction(R.string.error_snackbar_action) {
+
+            errorRetryButton.isVisible = true
+            showAndSetOpenInBrowserButtonAction(errorInfo)
+        } else if (errorInfo.throwable is AccountTerminatedException) {
+            errorTextView.setText(R.string.account_terminated)
+
+            if (!isNullOrEmpty((errorInfo.throwable as AccountTerminatedException).message)) {
+                errorServiceInfoTextView.text = context.resources.getString(
+                    R.string.service_provides_reason,
+                    ServiceHelper.getSelectedService(context)?.serviceInfo?.name ?: "<unknown>"
+                )
+                errorServiceInfoTextView.isVisible = true
+
+                errorServiceExplanationTextView.text =
+                    (errorInfo.throwable as AccountTerminatedException).message
+                errorServiceExplanationTextView.isVisible = true
+            }
+        } else {
+            showAndSetErrorButtonAction(
+                R.string.error_snackbar_action
+            ) {
                 ErrorUtil.openActivity(context, errorInfo)
             }
-        }
 
-        if (errorInfo.isRetryable) {
-            errorRetryButton.isVisible = retryShouldBeShown
-        }
+            errorTextView.setText(getExceptionDescription(errorInfo.throwable))
 
-        if (errorInfo.openInBrowserUrl != null) {
-            errorOpenInBrowserButton.isVisible = true
-            errorOpenInBrowserButton.setOnClickListener {
-                ShareUtils.openUrlInBrowser(context, errorInfo.openInBrowserUrl)
+            if (errorInfo.throwable !is ContentNotAvailableException &&
+                errorInfo.throwable !is ContentNotSupportedException
+            ) {
+                // show retry button only for content which is not unavailable or unsupported
+                errorRetryButton.isVisible = true
             }
+            showAndSetOpenInBrowserButtonAction(errorInfo)
         }
 
         setRootVisible()
@@ -106,6 +150,15 @@ class ErrorPanelHelper(
         errorActionButton.setOnClickListener(listener)
     }
 
+    fun showAndSetOpenInBrowserButtonAction(
+        errorInfo: ErrorInfo
+    ) {
+        errorOpenInBrowserButton.isVisible = true
+        errorOpenInBrowserButton.setOnClickListener {
+            ShareUtils.openUrlInBrowser(context, errorInfo.request)
+        }
+    }
+
     fun showTextError(errorString: String) {
         ensureDefaultVisibility()
 
@@ -136,5 +189,27 @@ class ErrorPanelHelper(
     companion object {
         val TAG: String = ErrorPanelHelper::class.simpleName!!
         val DEBUG: Boolean = MainActivity.DEBUG
+
+        @StringRes
+        fun getExceptionDescription(throwable: Throwable?): Int {
+            return when (throwable) {
+                is AgeRestrictedContentException -> R.string.restricted_video_no_stream
+                is GeographicRestrictionException -> R.string.georestricted_content
+                is PaidContentException -> R.string.paid_content
+                is PrivateContentException -> R.string.private_content
+                is SoundCloudGoPlusContentException -> R.string.soundcloud_go_plus_content
+                is YoutubeMusicPremiumContentException -> R.string.youtube_music_premium_content
+                is ContentNotAvailableException -> R.string.content_not_available
+                is ContentNotSupportedException -> R.string.content_not_supported
+                else -> {
+                    // show retry button only for content which is not unavailable or unsupported
+                    if (throwable != null && throwable.isNetworkRelated) {
+                        R.string.network_error
+                    } else {
+                        R.string.error_snackbar_message
+                    }
+                }
+            }
+        }
     }
 }

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

@@ -10,11 +10,8 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
-import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
 
 /**
@@ -38,20 +35,12 @@ class ErrorUtil {
          * activity (since the workflow would be interrupted anyway in that case). So never use this
          * for background services.
          *
-         * If the crashed occurred while the app was in the background open a notification instead
-         *
          * @param context the context to use to start the new activity
          * @param errorInfo the error info to be reported
          */
         @JvmStatic
         fun openActivity(context: Context, errorInfo: ErrorInfo) {
-            if (PreferenceManager.getDefaultSharedPreferences(context)
-                    .getBoolean(MainActivity.KEY_IS_IN_BACKGROUND, true)
-            ) {
-                createNotification(context, errorInfo)
-            } else {
-                context.startActivity(getErrorActivityIntent(context, errorInfo))
-            }
+            context.startActivity(getErrorActivityIntent(context, errorInfo))
         }
 
         /**
@@ -122,7 +111,7 @@ class ErrorUtil {
                 )
                     .setSmallIcon(R.drawable.ic_bug_report)
                     .setContentTitle(context.getString(R.string.error_report_notification_title))
-                    .setContentText(errorInfo.getMessage(context))
+                    .setContentText(context.getString(errorInfo.messageStringId))
                     .setAutoCancel(true)
                     .setContentIntent(
                         PendingIntentCompat.getActivity(
@@ -137,11 +126,9 @@ class ErrorUtil {
             NotificationManagerCompat.from(context)
                 .notify(ERROR_REPORT_NOTIFICATION_ID, notificationBuilder.build())
 
-            ContextCompat.getMainExecutor(context).execute {
-                // since the notification is silent, also show a toast, otherwise the user is confused
-                Toast.makeText(context, R.string.error_report_notification_toast, Toast.LENGTH_SHORT)
-                    .show()
-            }
+            // since the notification is silent, also show a toast, otherwise the user is confused
+            Toast.makeText(context, R.string.error_report_notification_toast, Toast.LENGTH_SHORT)
+                .show()
         }
 
         private fun getErrorActivityIntent(context: Context, errorInfo: ErrorInfo): Intent {
@@ -156,10 +143,10 @@ class ErrorUtil {
                 // fallback to showing a notification if no root view is available
                 createNotification(context, errorInfo)
             } else {
-                Snackbar.make(rootView, errorInfo.getMessage(context), Snackbar.LENGTH_LONG)
+                Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
                     .setActionTextColor(Color.YELLOW)
                     .setAction(context.getString(R.string.error_snackbar_action).uppercase()) {
-                        context.startActivity(getErrorActivityIntent(context, errorInfo))
+                        openActivity(context, errorInfo)
                     }.show()
             }
         }

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

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-package org.schabi.newpipe.error
+package org.schabi.newpipe.error;
 
 /**
  * The user actions that can cause an error.
  */
-enum class UserAction(val message: String) {
+public enum UserAction {
     USER_REPORT("user report"),
     UI_ERROR("ui error"),
     DATABASE_IMPORT_EXPORT("database import or export"),
@@ -37,8 +32,15 @@ enum class UserAction(val message: String) {
     PREFERENCES_MIGRATION("migration of preferences"),
     SHARE_TO_NEWPIPE("share to newpipe"),
     CHECK_FOR_NEW_APP_VERSION("check for new app version"),
-    OPEN_INFO_ITEM_DIALOG("open info item dialog"),
-    GETTING_MAIN_SCREEN_TAB("getting main screen tab"),
-    PLAY_ON_POPUP("play on popup"),
-    SUBSCRIPTIONS("loading subscriptions")
+    OPEN_INFO_ITEM_DIALOG("open info item dialog");
+
+    private final String message;
+
+    UserAction(final String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
 }

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

@@ -7,57 +7,16 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorInfo;
-import org.schabi.newpipe.error.ErrorPanelHelper;
 
 public class BlankFragment extends BaseFragment {
-
-    @State
-    @Nullable
-    ErrorInfo errorInfo;
-    @Nullable
-    ErrorPanelHelper errorPanel = null;
-
-    /**
-     * Builds a blank fragment that just says the app name and suggests clicking on search.
-     */
-    public BlankFragment() {
-        this(null);
-    }
-
-    /**
-     * @param errorInfo if null acts like {@link BlankFragment}, else shows an error panel.
-     */
-    public BlankFragment(@Nullable final ErrorInfo errorInfo) {
-        this.errorInfo = errorInfo;
-    }
-
     @Nullable
     @Override
     public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGroup container,
                              final Bundle savedInstanceState) {
         setTitle("NewPipe");
-        final View view = inflater.inflate(R.layout.fragment_blank, container, false);
-        if (errorInfo != null) {
-            errorPanel = new ErrorPanelHelper(this, view, null);
-            errorPanel.showError(errorInfo);
-            view.findViewById(R.id.blank_page_content).setVisibility(View.GONE);
-        }
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        if (errorPanel != null) {
-            errorPanel.dispose();
-            errorPanel = null;
-        }
+        return inflater.inflate(R.layout.fragment_blank, container, false);
     }
 
     @Override

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

@@ -36,9 +36,8 @@ import com.google.android.material.tabs.TabLayout;
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.FragmentMainBinding;
-import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
-import org.schabi.newpipe.error.UserAction;
+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;
@@ -304,9 +303,9 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
             final Fragment fragment;
             try {
                 fragment = tab.getFragment(context);
-            } catch (final Throwable t) {
-                return new BlankFragment(new ErrorInfo(t, UserAction.GETTING_MAIN_SCREEN_TAB,
-                        "Tab " + tab.getClass().getSimpleName() + ":" + tab.getTabName(context)));
+            } catch (final ExtractionException e) {
+                ErrorUtil.showUiErrorSnackbar(context, "Getting fragment item", e);
+                return new BlankFragment();
             }
 
             if (fragment instanceof BaseFragment) {

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

@@ -93,7 +93,7 @@ public class DescriptionFragment extends BaseDescriptionFragment {
 
         if (streamInfo.getLanguageInfo() != null) {
             addMetadataItem(inflater, layout, false, R.string.metadata_language,
-                    streamInfo.getLanguageInfo().getDisplayLanguage(getAppLocale()));
+                    streamInfo.getLanguageInfo().getDisplayLanguage(getAppLocale(getContext())));
         }
 
         addMetadataItem(inflater, layout, true, R.string.metadata_support,