Merge pull request #9290 from TeamNewPipe/release/0.24.1

Release v0.24.1

.github/CONTRIBUTING.md

@@ -22,6 +22,7 @@ You'll see *exactly* what is sent, be able to add **your comments**, and then se
 
 * NewPipe is translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). Log in there with your GitHub account, or register.
 * Add the language you want to translate if it is not there already: see [How to add a new language](https://github.com/TeamNewPipe/NewPipe/wiki/How-to-add-a-new-language-to-NewPipe) in the wiki.
+* NewPipe uses the [PrettyTime](https://github.com/ocpsoft/prettytime) library to display localized versions of dates and times. It needs to be translated, too. Read [these instructions to add a new language](https://www.ocpsoft.org/prettytime/#section-14) and [this issue](https://github.com/TeamNewPipe/NewPipe/issues/9134) for more info.
 
 ## Code contribution
 
@@ -68,7 +69,7 @@ The [checkStyle](https://github.com/checkstyle/checkstyle) plugin verifies that
 - Go to `File -> Settings -> Plugins`, search for `checkstyle` and install `CheckStyle-IDEA`.
 - Go to `File -> Settings -> Tools -> Checkstyle`.
 - Add NewPipe's configuration file by clicking the `+` in the right toolbar of the "Configuration File" list.
-- Under the "Use a local Checkstyle file" bullet, click on `Browse` and pick the file named `checkstyle.xml` in the project's root folder.
+- Under the "Use a local Checkstyle file" bullet, click on `Browse` and, enter `checkstyle` folder under the project's root path and pick the file named `checkstyle.xml`.
 - Enable "Store relative to project location" so that moving the directory around does not create issues.
 - Insert a description in the top bar, then click `Next` and then `Finish`.
 - Activate the configuration file you just added by enabling the checkbox on the left.

.github/FUNDING.yml

@@ -1 +1,2 @@
 liberapay: TeamNewPipe
+custom: 'https://newpipe.net/donate/'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,65 +0,0 @@
----
-name: Bug report
-about: Create a bug report to help us improve
-labels: bug
-assignees: ''
-
----
-
-<!--
-Oh no, a bug! It happens. Thanks for reporting an issue with NewPipe. To make it easier for us to help you please enter detailed information in the template we have provided below. If a section isn't relevant, just delete it, though it would be helpful to still provide as much detail as possible.
--->
-
-<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you feel tired/lazy right now, open your issue some other time. We'll wait. -->
-
-<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
-
-### Checklist
-<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
-
-- [x] I am using the latest version - x.xx.x <!-- Check https://github.com/TeamNewPipe/NewPipe/releases -->
-- [ ] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O -->
-- [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.
-- [ ] This issue contains only one bug. I will open one issue for every bug report I want to file.
-
-### Steps to reproduce the bug
-<!--
-1. Go to '...'
-2. Press on '....'
-3. Swipe down to '....'
--->
-
-<!-- If you can't cause the bug to show up again reliably (and hence don't have a proper set of steps to give us), please still try to give as many details as possible on how you think you encountered the bug. -->
-
-
-
-### Actual behavior
-<!-- Tell us what happens with the steps given above. -->
-
-
-
-### Expected behavior
-<!-- Tell us what you expect to happen. -->
-
-
-
-### Screenshots/Screen recordings
-<!-- If applicable, add screenshots or a screen recording to help explain your problem. GitHub supports uploading them directly in the issue text box. If your file is too big for Github to accept, feel free to paste a link from an image/video hoster here instead. -->
-
-<!-- DON'T POST SCREENSHOTS OF THE ERROR PAGE. Use the buttons given on the error page to paste the error as text in the Logs section below. -->
-
-
-
-### Logs
-<!-- If your bug includes a crash (where you're shown the Error Report page with a bunch of info), tap on "Copy formatted report" at the bottom and paste it here: -->
-
-<!-- That's right, here! -->
-
-
-
-<!-- Please fill this section if you did not provide a log generated by NewPipe -->
-
-### Device info
-
- - Android version/Custom ROM version:
- - Device model:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,115 @@
+name: Bug report
+description: Create a bug report to help us improve
+labels: [bug, needs triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for helping to make NewPipe better by reporting a bug. :hugs:
+
+        Please fill in as much information as possible about your bug so that we don't have to play "information ping-pong" and can help you immediately.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      options:
+        - label: "I am able to reproduce the bug with the [latest version](https://github.com/TeamNewPipe/NewPipe/releases/latest)."
+          required: true
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+          required: true
+        - label: "I have read the [FAQ](https://newpipe.net/FAQ/) and my problem isn't listed."
+          required: true
+        - label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
+          required: true
+        - label: "This issue contains only one bug."
+          required: true
+        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
+          required: true
+
+  - type: input
+    id: app-version
+    attributes:
+     label: Affected version
+     description: "In which NewPipe version did you encounter the bug?"
+     placeholder: "x.xx.x - Can be seen in the app from the 'About' section in the sidebar"
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce the bug
+      description: |
+        What did you do for the bug to show up?
+
+        If you can't cause the bug to show up again reliably (and hence don't have a proper set of steps to give us), please still try to give as many details as possible on how you think you encountered the bug.
+      placeholder: |
+        1. Go to '...'
+        2. Press on '....'
+        3. Swipe down to '....'
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: |
+        Tell us what you expect to happen.
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: |
+        Tell us what happens with the steps given above.
+
+  - type: textarea
+    id: screen-media
+    attributes:
+      label: Screenshots/Screen recordings
+      description: |
+        A picture or video is worth a thousand words.
+
+        If applicable, add screenshots or a screen recording to help explain your problem.
+        GitHub supports uploading them directly in the text box.
+        If your file is too big for Github to accept, try to compress it (ZIP-file) or feel free to paste a link to an image/video hoster here instead.
+
+        :heavy_exclamation_mark: DON'T POST SCREENSHOTS OF THE ERROR PAGE.
+        Instead, follow the instructions in the "Logs" section below.
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: |
+        If your bug includes a crash (where you're shown the Error Report page with a bunch of info), tap on "Copy formatted report" at the bottom and paste it here.
+
+  - type: input
+    id: device-os-info
+    attributes:
+     label: Affected Android/Custom ROM version
+     description: |
+      With what operating system (+ version) did you encounter the bug?
+     placeholder: "Example: Android 12 / LineageOS 18.1"
+
+  - type: input
+    id: device-model-info
+    attributes:
+     label: Affected device model
+     description: |
+      On what device did you encounter the bug?
+     placeholder: "Example: Huawei P20 lite (ANE-LX1) / Samsung Galaxy S20"
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: |
+        Any other information you'd like to include, for instance that 
+        * the affected device is foldable or a TV
+        * you have disabled all animations on your device
+        * your cat disabled your network connection
+        * ...
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: enhancement
-assignees: ''
-
----
-<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you are currently unable to do so for any reason, open your issue some other time. We'll wait. -->
-
-<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview tab). -->
-
-### Checklist
-<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
-
-- [x] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O -->
-- [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.
-- [ ] This issue contains only one feature request. I will open one issue for every feature I want to request.
-
-#### What feature do you want?
-<!-- Explain how you want the app's look or behavior to change to suit your needs. -->
-
-
-#### Why do you want this feature?
-<!-- Describe any problem or limitation you come across while using the app which would be solved by this feature. -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,52 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: [feature request, needs triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for helping to make NewPipe better by suggesting a feature. :hugs:
+
+        Your ideas are highly welcome! The app is made for you, the users, after all.
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      options:
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+          required: true
+        - label: "I have read the [FAQ](https://newpipe.net/FAQ/) and my problem isn't listed."
+          required: true
+        - label: "I'm aware that this is a request for NewPipe itself and that requests for adding a new service need to be made at [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor/issues)."
+          required: true
+        - label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
+          required: true
+        - label: "This issue contains only one feature request."
+          required: true
+        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
+          required: true
+
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Feature description
+      description: |
+        Explain how you want the app's look or behavior to change to suit your needs.
+    validations:
+      required: true
+
+  - type: textarea
+    id: why-is-the-feature-requested
+    attributes:
+      label: Why do you want this feature?
+      description: |
+        Describe any problem or limitation you come across while using the app which would be solved by this feature.
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Any other information you'd like to include, for instance sketches, mockups, pictures of cats, etc.

.github/ISSUE_TEMPLATE/question.md

@@ -1,24 +0,0 @@
----
-name: Question
-about: Ask about anything NewPipe-related
-labels: question
-assignees: ''
-
----
-
-<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you feel tired/lazy right now, open your issue some other time. We'll wait. -->
-
-<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
-
-### Checklist
-<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
-
-- [x] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O (If there's already an issue but you'd like to see if something changed, just make a comment on the issue instead of opening a new one.) -->
-- [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.
-
-#### What's your question(s)?
-
-
-#### Additional context
-<!-- Add any other context, like screenshots or links, about the question here.
-Example: *Here's a photo of my cat!* -->

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,37 @@
+name: Question
+description: Ask about anything NewPipe-related
+labels: [question, needs triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this issue! :hugs:
+
+        Note that you can also ask questions on our [IRC channel](https://web.libera.chat/#newpipe).
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      options:
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+          required: true
+        - label: "I have read the [FAQ](https://newpipe.net/FAQ/) and my question isn't listed."
+          required: true
+        - label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
+          required: true
+        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
+          required: true
+
+  - type: textarea
+    id: what-is-the-question
+    attributes:
+      label: What is/are your question(s)?
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Any other information you'd like to include, for instance sketches, mockups, pictures of cats, etc.

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,7 +25,7 @@
 <!-- Delete this if it doesn't apply to your PR. -->
 - 
 
-#### APK testing 
+#### APK testing
 <!-- Use a new, meaningfully named branch. The name is used as a suffix for the app ID to allow installing and testing multiple versions of NewPipe, e.g. "commentfix", if your PR implements a bugfix for comments. (No names like "patch-0" and "feature-1".)  -->
 <!-- Remove the following line if you directly link the APK created by the CI pipeline. Directly linking is preferred if you need to let users test.-->
 The APK can be found by going to the "Checks" tab below the title. On the left pane, click on "CI", scroll down to "artifacts" and click "app" to download the zip file which contains the debug APK of this PR.

.github/workflows/ci.yml

@@ -6,26 +6,37 @@ on:
     branches:
       - dev
       - master
+      - release**
     paths-ignore:
-      - 'README*.md'
+      - 'README.md'
+      - 'doc/**'
       - 'fastlane/**'
       - 'assets/**'
       - '.github/**/*.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
   push:
     branches:
       - dev
       - master
     paths-ignore:
-      - 'README*.md'
+      - 'README.md'
+      - 'doc/**'
       - 'fastlane/**'
       - 'assets/**'
       - '.github/**/*.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
 
 jobs:
   build-and-test-jvm:
     runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
 
       - name: create and checkout branch
@@ -34,17 +45,17 @@ jobs:
         run: git checkout -B ${{ github.head_ref }}
 
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: "temurin"
           cache: 'gradle'
-          
+
       - name: Build debug APK and run jvm tests
         run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: app
           path: app/build/outputs/apk/debug/*.apk
@@ -52,15 +63,20 @@ jobs:
   test-android:
     # macos has hardware acceleration. See android-emulator-runner action
     runs-on: macos-latest
+    timeout-minutes: 20
     strategy:
       matrix:
-        # api-level 19 is min sdk, but throws errors related to desugaring 
+        # api-level 19 is min sdk, but throws errors related to desugaring
         api-level: [ 21, 29 ]
+
+    permissions:
+      contents: read
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: "temurin"
@@ -72,31 +88,42 @@ jobs:
           api-level: ${{ matrix.api-level }}
           # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
           emulator-build: 7425822
-          script: ./gradlew connectedCheck
+          script: ./gradlew connectedCheck --stacktrace
 
-#   sonar:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@v2
-#         with:
-#           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: android-test-report-api${{ matrix.api-level }}
+          path: app/build/reports/androidTests/connected/**
 
-#       - name: Set up JDK 11
-#         uses: actions/setup-java@v2
-#         with:
-#           java-version: 11 # Sonar requires JDK 11
-#           distribution: "temurin"
-#           cache: 'gradle'
+  sonar:
+    runs-on: ubuntu-latest
 
-#       - name: Cache SonarCloud packages
-#         uses: actions/cache@v2
-#         with:
-#           path: ~/.sonar/cache
-#           key: ${{ runner.os }}-sonar
-#           restore-keys: ${{ runner.os }}-sonar
+    permissions:
+      contents: read
 
-#       - name: Build and analyze
-#         env:
-#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-#           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#         run: ./gradlew build sonarqube --info
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11 # Sonar requires JDK 11
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew build sonarqube --info

.github/workflows/image-minimizer.js

@@ -0,0 +1,130 @@
+/*
+ * Script for minimizing big images (jpg,gif,png) when they are uploaded to GitHub and not edited otherwise
+ */
+module.exports = async ({github, context}) => {
+    const IGNORE_KEY = '<!-- IGNORE IMAGE MINIFY -->';
+    const IGNORE_ALT_NAME_END = 'ignoreImageMinify';
+    // Targeted maximum height
+    const IMG_MAX_HEIGHT_PX = 600;
+    // maximum width of GitHub issues/comments
+    const IMG_MAX_WIDTH_PX = 800;
+    // all images that have a lower aspect ratio (-> have a smaller width) than this will be minimized
+    const MIN_ASPECT_RATIO = IMG_MAX_WIDTH_PX / IMG_MAX_HEIGHT_PX
+
+    // Get the body of the image
+    let initialBody = null;
+    if (context.eventName == 'issue_comment') {
+        initialBody = context.payload.comment.body;
+    } else if (context.eventName == 'issues') {
+        initialBody = context.payload.issue.body;
+    } else {
+        console.log('Aborting: No body found');
+        return;
+    }
+    console.log(`Found body: \n${initialBody}\n`);
+
+    // Check if we should ignore the currently processing element
+    if (initialBody.includes(IGNORE_KEY)) {
+        console.log('Ignoring: Body contains IGNORE_KEY');
+        return;
+    }
+
+    // Regex for finding images (simple variant) ![ALT_TEXT](https://*.githubusercontent.com/<number>/<variousHexStringsAnd->.<fileExtension>)
+    const REGEX_IMAGE_LOOKUP = /\!\[(.*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
+
+    // Check if we found something
+    let foundSimpleImages = REGEX_IMAGE_LOOKUP.test(initialBody);
+    if (!foundSimpleImages) {
+        console.log('Found no simple images to process');
+        return;
+    }
+
+    console.log('Found at least one simple image to process');
+
+    // Require the probe lib for getting the image dimensions
+    const probe = require('probe-image-size');
+    
+    var wasMatchModified = false;
+
+    // Try to find and replace the images with minimized ones
+    let newBody = await replaceAsync(initialBody, REGEX_IMAGE_LOOKUP, async (match, g1, g2) => {
+        console.log(`Found match '${match}'`);
+        
+        if (g1.endsWith(IGNORE_ALT_NAME_END)) {
+            console.log(`Ignoring match '${match}': IGNORE_ALT_NAME_END`);
+            return match;
+        }
+        
+        let shouldModify = false;
+        try {
+            console.log(`Probing ${g2}`);
+            let probeResult = await probe(g2);
+            if (probeResult == null) {
+                throw 'No probeResult';
+            }
+            if (probeResult.hUnits != 'px') {
+                throw `Unexpected probeResult.hUnits (expected px but got ${probeResult.hUnits})`;
+            }
+            if (probeResult.height <= 0) {
+                throw `Unexpected probeResult.height (height is invalid: ${probeResult.height})`;
+            }
+            if (probeResult.wUnits != 'px') {
+                throw `Unexpected probeResult.wUnits (expected px but got ${probeResult.wUnits})`;
+            }
+            if (probeResult.width <= 0) {
+                throw `Unexpected probeResult.width (width is invalid: ${probeResult.width})`;
+            }
+            console.log(`Probing resulted in ${probeResult.width}x${probeResult.height}px`);
+            
+            shouldModify = probeResult.height > IMG_MAX_HEIGHT_PX && (probeResult.width / probeResult.height) < MIN_ASPECT_RATIO;
+        } catch(e) {
+            console.log('Probing failed:', e);
+            // Immediately abort
+            return match;
+        }
+        
+        if (shouldModify) {
+            wasMatchModified = true;
+            console.log(`Modifying match '${match}'`);
+            return `<img alt="${g1}" src="${g2}" height=${IMG_MAX_HEIGHT_PX} />`;
+        }
+        
+        console.log(`Match '${match}' is ok/will not be modified`);
+        return match;
+    });
+    
+    if (!wasMatchModified) {
+        console.log('Nothing was modified. Skipping update');
+        return;
+    }
+
+    // Update the corresponding element
+    if (context.eventName == 'issue_comment') {
+        console.log('Updating comment with id', context.payload.comment.id);
+        await github.rest.issues.updateComment({
+            comment_id: context.payload.comment.id,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: newBody
+        })
+    } else if (context.eventName == 'issues') {
+        console.log('Updating issue', context.payload.issue.number);
+        await github.rest.issues.update({
+            issue_number: context.payload.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: newBody
+        });
+    }
+
+    // Asnyc replace function from https://stackoverflow.com/a/48032528
+    async function replaceAsync(str, regex, asyncFn) {
+        const promises = [];
+        str.replace(regex, (match, ...args) => {
+            const promise = asyncFn(match, ...args);
+            promises.push(promise);
+        });
+        const data = await Promise.all(promises);
+        return str.replace(regex, () => data.shift());
+    }
+}

.github/workflows/image-minimizer.yml

@@ -0,0 +1,33 @@
+name: Image Minimizer
+
+on:
+  issue_comment:
+    types: [created, edited]
+  issues:
+    types: [opened, edited]
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  try-minimize:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install probe-image-size
+        run: npm i probe-image-size@7.2.3 --ignore-scripts
+
+      - name: Minimize simple images
+        uses: actions/github-script@v6
+        timeout-minutes: 3
+        with:
+          script: |
+            const script = require('.github/workflows/image-minimizer.js');
+            await script({github, context});

.github/workflows/no-response.yml

@@ -9,6 +9,10 @@ on:
     # Run daily at midnight.
     - cron: '0 0 * * *'
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   noResponse:
     runs-on: ubuntu-latest
@@ -17,4 +21,4 @@ jobs:
         with:
           token: ${{ github.token }}
           daysUntilClose: 14
-          responseRequiredLabel: waiting-for-author
+          responseRequiredLabel: waiting for author

.gitignore

@@ -8,8 +8,8 @@ captures/
 *~
 .weblate
 *.class
-**/debug/
-**/release/
+app/debug/
+app/release/
 
 # vscode / eclipse files
 *.classpath

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,8 +1,8 @@
 <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 frontend for Android.</h4>
+<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://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-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 release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
@@ -13,15 +13,15 @@
 <a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
-<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#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="#screenshots">Screenshots</a> &bull; <a href="#supported-services">Supported Services</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#installation-and-updates">Installation and updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this in other languages: [English](README.md), [Español](README.es.md), [한국어](README.ko.md), [Soomaali](README.so.md), [Português Brasil](README.pt_BR.md), [日本語](README.ja.md), [Română](README.ro.md), [Türkçe](README.tr.md).*
+*Read this in other languages: [English](README.md), [Español](doc/README.es.md), [हिन्दी](doc/README.hi.md), [한국어](doc/README.ko.md), [Soomaali](doc/README.so.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md).*
 
-<b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
+<b>WARNING: THIS APP IS IN BETA, SO YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE IN OUR GITHUB REPOSITORY BY FILLING OUT THE ISSUE TEMPLATE.</b>
 
-<b>PUTTING NEWPIPE OR ANY FORK OF IT INTO THE GOOGLE PLAY STORE VIOLATES THEIR TERMS AND CONDITIONS.</b>
+<b>PUTTING NEWPIPE, OR ANY FORK OF IT, INTO THE GOOGLE PLAY STORE VIOLATES THEIR TERMS AND CONDITIONS.</b>
 
 ## Screenshots
 
@@ -38,62 +38,66 @@
 [<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
 [<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
 
+### Supported Services
+
+NewPipe currently supports these services:
+
+<!-- We link to the service websites separately to avoid people accidentally opening a website they didn't want to. -->
+* YouTube ([website](https://www.youtube.com/)) and YouTube Music ([website](https://music.youtube.com/)) ([wiki](https://en.wikipedia.org/wiki/YouTube))
+* PeerTube ([website](https://joinpeertube.org/)) and all its instances (open the website to know what that means!) ([wiki](https://en.wikipedia.org/wiki/PeerTube))
+* Bandcamp ([website](https://bandcamp.com/)) ([wiki](https://en.wikipedia.org/wiki/Bandcamp))
+* SoundCloud ([website](https://soundcloud.com/)) ([wiki](https://en.wikipedia.org/wiki/SoundCloud))
+* media.ccc.de ([website](https://media.ccc.de/)) ([wiki](https://en.wikipedia.org/wiki/Chaos_Computer_Club))
+
+As you can see, NewPipe supports multiple video and audio services. Though it started off with YouTube, other people have added more services over the years, making NewPipe more and more versatile!
+
+Partially due to circumstance, and partially due to its popularity, YouTube is the best supported out of these services. If you use or are familiar with any of these other services, please help us improve support for them! We're looking for maintainers for SoundCloud and PeerTube.
+
+If you intend to add a new service, please get in touch with us first! Our [docs](https://teamnewpipe.github.io/documentation/) provide more information on how a new service can be added to the app and to the [NewPipe Extractor](https://github.com/TeamNewPipe/NewPipeExtractor).
+
 ## Description
 
-NewPipe does not use any Google framework libraries, nor the YouTube API. Websites are only parsed to fetch required info, so this app can be used on devices without Google services installed. Also, you don't need a YouTube account to use NewPipe, which is copylefted libre software.
+NewPipe works by fetching the required data from the official API (e.g. PeerTube) of the service you're using. If the official API is restricted (e.g. YouTube) for our purposes, or is proprietary, the app parses the website or uses an internal API instead. This means that you don't need an account on any service to use NewPipe.
+
+Also, since they are free and open source software, neither the app nor the Extractor use any proprietary libraries or frameworks, such as Google Play Services. This means you can use NewPipe on devices or custom ROMs that do not have Google apps installed.
 
 ### Features
 
-* Search videos
-* No Login Required
-* Display general info about videos
-* Watch YouTube videos
-* Listen to YouTube videos
-* Popup mode (floating player)
-* Select streaming player to watch video with
-* Download videos
-* Download audio only
-* Open a video in Kodi
-* Show next/related videos
-* Search YouTube in a specific language
-* Watch/Block age restricted material
-* Display general info about channels
-* Search channels
-* Watch videos from a channel
-* Orbot/Tor support (not yet directly)
-* 1080p/2K/4K support
-* View history
-* Subscribe to channels
-* Search history
-* Search/watch playlists
-* Watch as enqueued playlists
-* Enqueue videos
-* Local playlists
-* Subtitles
-* Livestream support
-* Show comments
+* Watch videos at resolutions up to 4K
+* Listen to audio in the background, only loading the audio stream to save data
+* Popup mode (floating player, aka Picture-in-Picture)
+* Watch live streams
+* Show/hide subtitles/closed captions
+* Search videos and audios (on YouTube, you can specify the content language as well)
+* Enqueue videos (and optionally save them as local playlists)
+* Show/hide general information about videos (such as description and tags)
+* Show/hide next/related videos
+* Show/hide comments
+* Search videos, audios, channels, playlists and albums
+* Browse videos and audios within a channel
+* Subscribe to channels (yes, without logging into any account!)
+* Get notifications about new videos from channels you're subscribed to
+* Create and edit channel groups (for easier browsing and management)
+* Browse video feeds generated from your channel groups
+* View and search your watch history
+* Search and watch playlists (these are remote playlists, which means they're fetched from the service you're browsing)
+* Create and edit local playlists (these are created and saved within the app, and have nothing to do with any service)
+* Download videos/audios/subtitles (closed captions)
+* Open in Kodi
+* Watch/Block age-restricted material
 
-### Supported Services
-
-NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/documentation/) provide more info on how a new service can be added to the app and the extractor. Please get in touch with us if you intend to add a new one. Currently supported services are:
-
-* YouTube
-* SoundCloud \[beta\]
-* media.ccc.de \[beta\]
-* PeerTube instances \[beta\]
-* Bandcamp \[beta\]
-
-<!-- Hidden span to keep old links compatible. -->
+<!-- Hidden span to keep old links compatible. You should remove this span if you're translating the README into another language.-->
 <span id="updates"></span>
 
 ## Installation and updates
 You can install NewPipe using one of the following methods:
  1. Add our custom repo to F-Droid and install it from there. The instructions are here: https://newpipe.net/FAQ/tutorials/install-add-fdroid-repo/
  2. Download the APK from [GitHub Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
- 3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
+ 3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, and then push the update to users.
  4. Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
+ 5. If you're interested in a specific feature or bugfix provided in a Pull Request in this repo, you can also download its APK from within the PR. Read the PR description for instructions. The great thing about PR-specific APKs is that they're installed side-by-side the official app, so you don't have to worry about losing your data or messing anything up.
 
-We recommend method 1 for most users. APKs installed using method 1 or 2 are compatible with each other, but not with those installed using method 3. This is due to the same signing key (ours) being used for 1 and 2, but a different signing key (F-Droid's) being used for 3. Building a debug APK using method 4 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app.
+We recommend method 1 for most users. APKs installed using method 1 or 2 are compatible with each other (meaning that if you installed NewPipe using either method 1 or 2, you can also update NewPipe using the other), but not with those installed using method 3. This is due to the same signing key (ours) being used for 1 and 2, but a different signing key (F-Droid's) being used for 3. Building a debug APK using method 4 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app. When using method 5, each APK is signed with a different random key supplied by GitHub Actions, so you cannot even update it. You will have to backup and restore the app data each time you wish to use a new APK.
 
 In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality breaks and F-Droid doesn't have the latest update yet), we recommend following this procedure:
 1. Back up your data via Settings > Content > Export Database so you keep your history, subscriptions, and playlists
@@ -101,30 +105,29 @@ In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's
 3. Download the APK from the new source and install it
 4. Import the data from step 1 via Settings > Content > Import Database
 
-## Contribution
-Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
-The more is done the better it gets!
+<b>Note: when you're importing a database into the official app, always make sure that it is the one you exported _from_ the official app. If you import a database exported from an APK other than the official app, it may break things. Such an action is unsupported, and you should only do so when you're absolutely certain you know what you're doing.</b>
 
-If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
+## Contribution
+Whether you have ideas, translations, design changes, code cleaning, or even major code changes, help is always welcome. The app gets better and better with each contribution, no matter how big or small! If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
 
 <a href="https://hosted.weblate.org/engage/newpipe/">
 <img src="https://hosted.weblate.org/widgets/newpipe/-/287x66-grey.png" alt="Translation status" />
 </a>
 
 ## Donate
-If you like NewPipe we'd be happy about a donation. You can either send bitcoin or donate via Bountysource or Liberapay. For further info on donating to NewPipe, please visit our [website](https://newpipe.net/donate).
+If you like NewPipe, you're welcome to send a donation. We prefer Liberapay, as it is both open-source and non-profit. For further info on donating to NewPipe, please visit our [website](https://newpipe.net/donate).
 
 <table>
-  <tr>
-    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
-    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
-    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
-  </tr>
   <tr>
     <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
     <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
     <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
   </tr>
+  <tr>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
+    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+  </tr>
   <tr>
     <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
     <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
@@ -134,14 +137,9 @@ If you like NewPipe we'd be happy about a donation. You can either send bitcoin
 
 ## Privacy Policy
 
-The NewPipe project aims to provide a private, anonymous experience for using media web services.
-Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report, or comment in our blog. You can find the document [here](https://newpipe.net/legal/privacy/).
+The NewPipe project aims to provide a private, anonymous experience for using web-based media services. Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report, or leave a comment in our blog. You can find the document [here](https://newpipe.net/legal/privacy/).
 
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html)  
 
-NewPipe is Free Software: You can use, study share and improve it at your
-will. Specifically you can redistribute and/or modify it under the terms of the
-[GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
-published by the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.  
+NewPipe is Free Software: You can use, study, share, and improve it at will. Specifically you can redistribute and/or modify it under the terms of the [GNU General Public License](https://www.gnu.org/licenses/gpl.html) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

app/build.gradle

@@ -1,29 +1,25 @@
 plugins {
-    id "org.sonarqube" version "3.1.1"
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "kotlin-parcelize"
+    id "checkstyle"
+    id "org.sonarqube" version "3.3"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'checkstyle'
-
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdk 32
+    namespace 'org.schabi.newpipe'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         resValue "string", "app_name", "NewPipe"
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 980
-        versionName "0.21.14"
-
-        multiDexEnabled true
+        minSdk 21
+        targetSdk 29
+        versionCode 991
+        versionName "0.24.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -66,7 +62,7 @@ android {
         }
     }
 
-    lintOptions {
+    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:
@@ -80,13 +76,13 @@ android {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
         encoding 'utf-8'
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     sourceSets {
@@ -99,20 +95,22 @@ android {
 }
 
 ext {
-    checkstyleVersion = '8.38'
+    checkstyleVersion = '10.3.1'
 
-    androidxLifecycleVersion = '2.3.1'
-    androidxRoomVersion = '2.3.0'
+    androidxLifecycleVersion = '2.5.1'
+    androidxRoomVersion = '2.4.3'
+    androidxWorkVersion = '2.7.1'
 
     icepickVersion = '3.2.0'
-    exoPlayerVersion = '2.14.2'
-    googleAutoServiceVersion = '1.0'
-    groupieVersion = '2.10.0'
+    exoPlayerVersion = '2.18.1'
+    googleAutoServiceVersion = '1.0.1'
+    groupieVersion = '2.10.1'
     markwonVersion = '4.6.2'
 
     leakCanaryVersion = '2.5'
     stethoVersion = '1.6.0'
-    mockitoVersion = '3.6.0'
+    mockitoVersion = '4.0.0'
+    assertJVersion = '3.23.1'
 }
 
 configurations {
@@ -121,7 +119,7 @@ configurations {
 }
 
 checkstyle {
-    getConfigDirectory().set(rootProject.file("."))
+    getConfigDirectory().set(rootProject.file("checkstyle"))
     ignoreFailures false
     showViolations true
     toolVersion = checkstyleVersion
@@ -181,7 +179,7 @@ sonarqube {
 
 dependencies {
 /** Desugaring **/
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
 
 /** NewPipe libraries **/
     // You can use a local version by uncommenting a few lines in settings.gradle
@@ -189,28 +187,28 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.12'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:eb07d70a2ce03bee3cc74fc33b2e4173e1c21436'
+    implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
-    ktlint 'com.pinterest:ktlint:0.40.0'
+    ktlint 'com.pinterest:ktlint:0.45.2'
 
 /** Kotlin **/
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
 
 /** AndroidX **/
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'androidx.media:media:1.4.3'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+    implementation 'androidx.media:media:1.6.0'
+    implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
     implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
@@ -219,8 +217,9 @@ dependencies {
     // Newer version specified to prevent accessibility regressions with RecyclerView, see:
     // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
     implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-    implementation 'androidx.webkit:webkit:1.4.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation "androidx.work:work-runtime-ktx:${androidxWorkVersion}"
+    implementation "androidx.work:work-rxjava3:${androidxWorkVersion}"
+    implementation 'com.google.android.material:material:1.6.1'
 
 /** Third-party libraries **/
     // Instance state boilerplate elimination
@@ -228,14 +227,19 @@ dependencies {
     kapt "frankiesardo:icepick-processor:${icepickVersion}"
 
     // HTML parser
-    implementation "org.jsoup:jsoup:1.13.1"
+    implementation "org.jsoup:jsoup:1.15.3"
 
     // HTTP client
-    //noinspection GradleDependency --> do not update okhttp to keep supporting Android 4.4 users
-    implementation "com.squareup.okhttp3:okhttp:3.12.13"
+    implementation "com.squareup.okhttp3:okhttp:4.10.0"
 
     // Media player
-    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-dash:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-database:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-datasource:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-hls:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-ui:${exoPlayerVersion}"
     implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
     // Metadata generator for service descriptors
@@ -246,8 +250,6 @@ dependencies {
     implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
     implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
 
-    // Circular ImageView
-    implementation "de.hdodenhof:circleimageview:3.1.0"
     // Image loading
     //noinspection GradleDependency --> 2.8 is the last version, not 2.71828!
     implementation "com.squareup.picasso:picasso:2.8"
@@ -256,23 +258,20 @@ dependencies {
     implementation "io.noties.markwon:core:${markwonVersion}"
     implementation "io.noties.markwon:linkify:${markwonVersion}"
 
-    // File picker
-    implementation "com.nononsenseapps:filepicker:4.2.1"
-
     // Crash reporting
-    implementation "ch.acra:acra-core:5.7.0"
+    implementation "ch.acra:acra-core:5.9.3"
 
     // Properly restarting
     implementation 'com.jakewharton:process-phoenix:2.1.2'
 
     // Reactive extensions for Java VM
-    implementation "io.reactivex.rxjava3:rxjava:3.0.7"
+    implementation "io.reactivex.rxjava3:rxjava:3.0.13"
     implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
     // RxJava binding APIs for Android UI widgets
     implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
 
     // Date and time formatting
-    implementation "org.ocpsoft.prettytime:prettytime:5.0.1.Final"
+    implementation "org.ocpsoft.prettytime:prettytime:5.0.6.Final"
 
 /** Debugging **/
     // Memory leak detection
@@ -288,11 +287,10 @@ dependencies {
     testImplementation "org.mockito:mockito-core:${mockitoVersion}"
     testImplementation "org.mockito:mockito-inline:${mockitoVersion}"
 
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test:runner:1.4.0"
     androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0", {
-        exclude module: 'support-annotations'
-    }
+    androidTestImplementation "org.assertj:assertj-core:${assertJVersion}"
 }
 
 static String getGitWorkingBranch() {

app/proguard-rules.pro

@@ -18,7 +18,6 @@
 
 -dontobfuscate
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
--keep class org.ocpsoft.prettytime.i18n.** { *; }
 
 -keep class org.mozilla.javascript.** { *; }
 
@@ -26,9 +25,6 @@
 -keep class com.google.android.exoplayer2.** { *; }
 
 -dontwarn org.mozilla.javascript.tools.**
--dontwarn android.arch.util.paging.CountedDataSource
--dontwarn android.arch.persistence.room.paging.LimitOffsetDataSource
-
 
 # Rules for icepick. Copy paste from https://github.com/frankiesardo/icepick
 -dontwarn icepick.**
@@ -39,15 +35,17 @@
 }
 -keepnames class * { @icepick.State *;}
 
-# Rules for OkHttp. Copy paste from https://github.com/square/okhttp
+## Rules for OkHttp. Copy paste from https://github.com/square/okhttp
 -dontwarn okhttp3.**
 -dontwarn okio.**
--dontwarn javax.annotation.**
-# A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+##
+
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
     !static !transient <fields>;
     private void writeObject(java.io.ObjectOutputStream);
     private void readObject(java.io.ObjectInputStream);
 }
+
+# for some reason NotificationModeConfigFragment wasn't kept (only referenced in a preference xml)
+-keep class org.schabi.newpipe.settings.notifications.** { *; }

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

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

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

@@ -0,0 +1,130 @@
+package org.schabi.newpipe.database
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import androidx.room.Room
+import androidx.room.testing.MigrationTestHelper
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.schabi.newpipe.extractor.stream.StreamType
+
+@RunWith(AndroidJUnit4::class)
+class DatabaseMigrationTest {
+    companion object {
+        private const val DEFAULT_SERVICE_ID = 0
+        private const val DEFAULT_URL = "https://www.youtube.com/watch?v=cDphUib5iG4"
+        private const val DEFAULT_TITLE = "Test Title"
+        private val DEFAULT_TYPE = StreamType.VIDEO_STREAM
+        private const val DEFAULT_DURATION = 480L
+        private const val DEFAULT_UPLOADER_NAME = "Uploader Test"
+        private const val DEFAULT_THUMBNAIL = "https://example.com/example.jpg"
+
+        private const val DEFAULT_SECOND_SERVICE_ID = 0
+        private const val DEFAULT_SECOND_URL = "https://www.youtube.com/watch?v=ncQU6iBn5Fc"
+    }
+
+    @get:Rule
+    val testHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        AppDatabase::class.java.canonicalName, FrameworkSQLiteOpenHelperFactory()
+    )
+
+    @Test
+    fun migrateDatabaseFrom2to3() {
+        val databaseInV2 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_2)
+
+        databaseInV2.run {
+            insert(
+                "streams", SQLiteDatabase.CONFLICT_FAIL,
+                ContentValues().apply {
+                    put("service_id", DEFAULT_SERVICE_ID)
+                    put("url", DEFAULT_URL)
+                    put("title", DEFAULT_TITLE)
+                    put("stream_type", DEFAULT_TYPE.name)
+                    put("duration", DEFAULT_DURATION)
+                    put("uploader", DEFAULT_UPLOADER_NAME)
+                    put("thumbnail_url", DEFAULT_THUMBNAIL)
+                }
+            )
+            insert(
+                "streams", SQLiteDatabase.CONFLICT_FAIL,
+                ContentValues().apply {
+                    put("service_id", DEFAULT_SECOND_SERVICE_ID)
+                    put("url", DEFAULT_SECOND_URL)
+                }
+            )
+            insert(
+                "streams", SQLiteDatabase.CONFLICT_FAIL,
+                ContentValues().apply {
+                    put("service_id", DEFAULT_SERVICE_ID)
+                }
+            )
+            close()
+        }
+
+        testHelper.runMigrationsAndValidate(
+            AppDatabase.DATABASE_NAME, Migrations.DB_VER_3,
+            true, Migrations.MIGRATION_2_3
+        )
+
+        testHelper.runMigrationsAndValidate(
+            AppDatabase.DATABASE_NAME, Migrations.DB_VER_4,
+            true, Migrations.MIGRATION_3_4
+        )
+
+        testHelper.runMigrationsAndValidate(
+            AppDatabase.DATABASE_NAME, Migrations.DB_VER_5,
+            true, Migrations.MIGRATION_4_5
+        )
+
+        val migratedDatabaseV3 = getMigratedDatabase()
+        val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst()
+
+        // Only expect 2, the one with the null url will be ignored
+        assertEquals(2, listFromDB.size)
+
+        val streamFromMigratedDatabase = listFromDB[0]
+        assertEquals(DEFAULT_SERVICE_ID, streamFromMigratedDatabase.serviceId)
+        assertEquals(DEFAULT_URL, streamFromMigratedDatabase.url)
+        assertEquals(DEFAULT_TITLE, streamFromMigratedDatabase.title)
+        assertEquals(DEFAULT_TYPE, streamFromMigratedDatabase.streamType)
+        assertEquals(DEFAULT_DURATION, streamFromMigratedDatabase.duration)
+        assertEquals(DEFAULT_UPLOADER_NAME, streamFromMigratedDatabase.uploader)
+        assertEquals(DEFAULT_THUMBNAIL, streamFromMigratedDatabase.thumbnailUrl)
+        assertNull(streamFromMigratedDatabase.viewCount)
+        assertNull(streamFromMigratedDatabase.textualUploadDate)
+        assertNull(streamFromMigratedDatabase.uploadDate)
+        assertNull(streamFromMigratedDatabase.isUploadDateApproximation)
+
+        val secondStreamFromMigratedDatabase = listFromDB[1]
+        assertEquals(DEFAULT_SECOND_SERVICE_ID, secondStreamFromMigratedDatabase.serviceId)
+        assertEquals(DEFAULT_SECOND_URL, secondStreamFromMigratedDatabase.url)
+        assertEquals("", secondStreamFromMigratedDatabase.title)
+        // Should fallback to VIDEO_STREAM
+        assertEquals(StreamType.VIDEO_STREAM, secondStreamFromMigratedDatabase.streamType)
+        assertEquals(0, secondStreamFromMigratedDatabase.duration)
+        assertEquals("", secondStreamFromMigratedDatabase.uploader)
+        assertEquals("", secondStreamFromMigratedDatabase.thumbnailUrl)
+        assertNull(secondStreamFromMigratedDatabase.viewCount)
+        assertNull(secondStreamFromMigratedDatabase.textualUploadDate)
+        assertNull(secondStreamFromMigratedDatabase.uploadDate)
+        assertNull(secondStreamFromMigratedDatabase.isUploadDateApproximation)
+    }
+
+    private fun getMigratedDatabase(): AppDatabase {
+        val database: AppDatabase = Room.databaseBuilder(
+            ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, AppDatabase.DATABASE_NAME
+        )
+            .build()
+        testHelper.closeWhenFinished(database)
+        return database
+    }
+}

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

@@ -0,0 +1,178 @@
+package org.schabi.newpipe.local.history
+
+import androidx.test.core.app.ApplicationProvider
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+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 {
+
+    private lateinit var manager: HistoryRecordManager
+    private lateinit var database: AppDatabase
+
+    @get:Rule
+    val trampolineScheduler = TrampolineSchedulerRule()
+
+    @Before
+    fun setup() {
+        database = TestDatabase.createReplacingNewPipeDatabase()
+        manager = HistoryRecordManager(ApplicationProvider.getApplicationContext())
+    }
+
+    @After
+    fun cleanUp() {
+        database.close()
+    }
+
+    @Test
+    fun onSearched() {
+        manager.onSearched(0, "Hello").test().await().assertValue(1)
+
+        // 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().all.blockingFirst()
+        assertThat(entities).hasSize(1)
+        assertThat(entities[0].id).isEqualTo(1)
+        assertThat(entities[0].serviceId).isEqualTo(0)
+        assertThat(entities[0].search).isEqualTo("Hello")
+    }
+
+    @Test
+    fun deleteSearchHistory() {
+        val entries = listOf(
+            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().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().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().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().all.blockingFirst()).isEmpty()
+    }
+
+    @Test
+    fun deleteCompleteSearchHistory() {
+        val entries = listOf(
+            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().all.blockingFirst()).hasSameSizeAs(entries)
+
+        // should remove everything
+        manager.deleteCompleteSearchHistory().test().await().assertValue(entries.size)
+        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
+        database.searchHistoryDAO().insertAll(relatedSearches.shuffled())
+
+        // make sure all entries were inserted
+        assertEquals(
+            relatedSearches.size,
+            database.searchHistoryDAO().all.blockingFirst().size
+        )
+    }
+
+    @Test
+    fun getRelatedSearches_emptyQuery() {
+        insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)
+
+        // make sure correct number of searches is returned and in correct order
+        val searches = manager.getRelatedSearches("", 6, 4).blockingFirst()
+        assertThat(searches).containsExactly(
+            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
+        )
+    }
+
+    @Test
+    fun getRelatedSearches_emptyQuery_manyDuplicates() {
+        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"),
+            )
+        )
+
+        val searches = manager.getRelatedSearches("", 9, 3).blockingFirst()
+        assertThat(searches).containsExactly("AA", "A", "BA")
+    }
+
+    @Test
+    fun getRelatedSearched_nonEmptyQuery() {
+        insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)
+
+        // make sure correct number of searches is returned and in correct order
+        val searches = manager.getRelatedSearches("A", 3, 5).blockingFirst()
+        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
+        )
+
+        // also make sure that the string comparison is case insensitive
+        val searches2 = manager.getRelatedSearches("a", 3, 5).blockingFirst()
+        assertThat(searches).isEqualTo(searches2)
+    }
+
+    companion object {
+        private val time = OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 1, 1), ZoneOffset.UTC)
+
+        private val RELATED_SEARCHES_ENTRIES = listOf(
+            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

@@ -1,17 +1,14 @@
 package org.schabi.newpipe.local.playlist
 
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.Timeout
 import org.schabi.newpipe.database.AppDatabase
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.extractor.stream.StreamType
+import org.schabi.newpipe.testUtil.TestDatabase
 import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
-import java.util.concurrent.TimeUnit
 
 class LocalPlaylistManagerTest {
 
@@ -21,18 +18,9 @@ class LocalPlaylistManagerTest {
     @get:Rule
     val trampolineScheduler = TrampolineSchedulerRule()
 
-    @get:Rule
-    val timeout = Timeout(10, TimeUnit.SECONDS)
-
     @Before
     fun setup() {
-        database = Room.inMemoryDatabaseBuilder(
-            ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java
-        )
-            .allowMainThreadQueries()
-            .build()
-
+        database = TestDatabase.createReplacingNewPipeDatabase()
         manager = LocalPlaylistManager(database)
     }
 

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

@@ -0,0 +1,32 @@
+package org.schabi.newpipe.testUtil
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Assert.assertSame
+import org.schabi.newpipe.NewPipeDatabase
+import org.schabi.newpipe.database.AppDatabase
+
+class TestDatabase {
+    companion object {
+        fun createReplacingNewPipeDatabase(): AppDatabase {
+            val database = Room.inMemoryDatabaseBuilder(
+                ApplicationProvider.getApplicationContext(),
+                AppDatabase::class.java
+            )
+                .allowMainThreadQueries()
+                .build()
+
+            val databaseField = NewPipeDatabase::class.java.getDeclaredField("databaseInstance")
+            databaseField.isAccessible = true
+            databaseField.set(NewPipeDatabase::class, database)
+
+            assertSame(
+                "Mocking database failed!",
+                database,
+                NewPipeDatabase.getInstance(ApplicationProvider.getApplicationContext())
+            )
+
+            return database
+        }
+    }
+}

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

@@ -0,0 +1,214 @@
+package org.schabi.newpipe.util
+
+import android.content.Context
+import android.util.SparseArray
+import android.view.View
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import android.widget.Spinner
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.schabi.newpipe.R
+import org.schabi.newpipe.extractor.MediaFormat
+import org.schabi.newpipe.extractor.stream.AudioStream
+import org.schabi.newpipe.extractor.stream.Stream
+import org.schabi.newpipe.extractor.stream.SubtitlesStream
+import org.schabi.newpipe.extractor.stream.VideoStream
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class StreamItemAdapterTest {
+    private lateinit var context: Context
+    private lateinit var spinner: Spinner
+
+    @Before
+    fun setUp() {
+        context = ApplicationProvider.getApplicationContext()
+        UiThreadStatement.runOnUiThread {
+            spinner = Spinner(context)
+        }
+    }
+
+    @Test
+    fun videoStreams_noSecondaryStream() {
+        val adapter = StreamItemAdapter<VideoStream, AudioStream>(
+            context,
+            getVideoStreams(true, true, true, true),
+            null
+        )
+
+        spinner.adapter = adapter
+        assertIconVisibility(spinner, 0, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 1, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 2, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 3, VISIBLE, VISIBLE)
+    }
+
+    @Test
+    fun videoStreams_hasSecondaryStream() {
+        val adapter = StreamItemAdapter(
+            context,
+            getVideoStreams(false, true, false, true),
+            getAudioStreams(false, true, false, true)
+        )
+
+        spinner.adapter = adapter
+        assertIconVisibility(spinner, 0, GONE, GONE)
+        assertIconVisibility(spinner, 1, GONE, GONE)
+        assertIconVisibility(spinner, 2, GONE, GONE)
+        assertIconVisibility(spinner, 3, GONE, GONE)
+    }
+
+    @Test
+    fun videoStreams_Mixed() {
+        val adapter = StreamItemAdapter(
+            context,
+            getVideoStreams(true, true, true, true, true, false, true, true),
+            getAudioStreams(false, true, false, false, false, true, true, true)
+        )
+
+        spinner.adapter = adapter
+        assertIconVisibility(spinner, 0, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 1, GONE, INVISIBLE)
+        assertIconVisibility(spinner, 2, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 3, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 4, VISIBLE, VISIBLE)
+        assertIconVisibility(spinner, 5, GONE, INVISIBLE)
+        assertIconVisibility(spinner, 6, GONE, INVISIBLE)
+        assertIconVisibility(spinner, 7, GONE, INVISIBLE)
+    }
+
+    @Test
+    fun subtitleStreams_noIcon() {
+        val adapter = StreamItemAdapter<SubtitlesStream, Stream>(
+            context,
+            StreamItemAdapter.StreamSizeWrapper(
+                (0 until 5).map {
+                    SubtitlesStream.Builder()
+                        .setContent("https://example.com", true)
+                        .setMediaFormat(MediaFormat.SRT)
+                        .setLanguageCode("pt-BR")
+                        .setAutoGenerated(false)
+                        .build()
+                },
+                context
+            ),
+            null
+        )
+        spinner.adapter = adapter
+        for (i in 0 until spinner.count) {
+            assertIconVisibility(spinner, i, GONE, GONE)
+        }
+    }
+
+    @Test
+    fun audioStreams_noIcon() {
+        val adapter = StreamItemAdapter<AudioStream, Stream>(
+            context,
+            StreamItemAdapter.StreamSizeWrapper(
+                (0 until 5).map {
+                    AudioStream.Builder()
+                        .setId(Stream.ID_UNKNOWN)
+                        .setContent("https://example.com/$it", true)
+                        .setMediaFormat(MediaFormat.OPUS)
+                        .setAverageBitrate(192)
+                        .build()
+                },
+                context
+            ),
+            null
+        )
+        spinner.adapter = adapter
+        for (i in 0 until spinner.count) {
+            assertIconVisibility(spinner, i, GONE, GONE)
+        }
+    }
+
+    /**
+     * @return a list of video streams, in which their video only property mirrors the provided
+     * [videoOnly] vararg.
+     */
+    private fun getVideoStreams(vararg videoOnly: Boolean) =
+        StreamItemAdapter.StreamSizeWrapper(
+            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
+                }
+            }
+        )
+
+    /**
+     * Checks whether the item at [position] in the [spinner] has the correct icon visibility when
+     * it is shown in normal mode (selected) and in dropdown mode (user is choosing one of a list).
+     */
+    private fun assertIconVisibility(
+        spinner: Spinner,
+        position: Int,
+        normalVisibility: Int,
+        dropDownVisibility: Int
+    ) {
+        spinner.setSelection(position)
+        spinner.adapter.getView(position, null, spinner).run {
+            Assert.assertEquals(
+                "normal visibility (pos=[$position]) is not correct",
+                findViewById<View>(R.id.wo_sound_icon).visibility,
+                normalVisibility,
+            )
+        }
+        spinner.adapter.getDropDownView(position, null, spinner).run {
+            Assert.assertEquals(
+                "drop down visibility (pos=[$position]) is not correct",
+                findViewById<View>(R.id.wo_sound_icon).visibility,
+                dropDownVisibility
+            )
+        }
+    }
+
+    /**
+     * Helper function that builds a secondary stream list.
+     */
+    private fun <T : Stream> getSecondaryStreamsFromList(streams: List<T?>) =
+        SparseArray<SecondaryStreamHelper<T>?>(streams.size).apply {
+            streams.forEachIndexed { index, stream ->
+                val secondaryStreamHelper: SecondaryStreamHelper<T>? = stream?.let {
+                    SecondaryStreamHelper(
+                        StreamItemAdapter.StreamSizeWrapper(streams, context),
+                        it
+                    )
+                }
+                put(index, secondaryStreamHelper)
+            }
+        }
+}

app/src/debug/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.schabi.newpipe">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".DebugApp"

app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsBVDLeakCanary.java

@@ -0,0 +1,20 @@
+package org.schabi.newpipe.settings;
+
+import android.content.Intent;
+
+import leakcanary.LeakCanary;
+
+/**
+ * Build variant dependent (BVD) leak canary API implementation for the debug settings fragment.
+ * This class is loaded via reflection by
+ * {@link DebugSettingsFragment.DebugSettingsBVDLeakCanaryAPI}.
+ */
+@SuppressWarnings("unused") // Class is used but loaded via reflection
+public class DebugSettingsBVDLeakCanary
+        implements DebugSettingsFragment.DebugSettingsBVDLeakCanaryAPI {
+
+    @Override
+    public Intent getNewLeakDisplayActivityIntent() {
+        return LeakCanary.INSTANCE.newLeakDisplayActivityIntent();
+    }
+}

app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java

@@ -1,42 +0,0 @@
-package org.schabi.newpipe.settings;
-
-import android.os.Bundle;
-
-import androidx.preference.Preference;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.PicassoHelper;
-
-import leakcanary.LeakCanary;
-
-public class DebugSettingsFragment extends BasePreferenceFragment {
-    @Override
-    public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-        addPreferencesFromResource(R.xml.debug_settings);
-
-        final Preference showMemoryLeaksPreference
-                = findPreference(getString(R.string.show_memory_leaks_key));
-        final Preference showImageIndicatorsPreference
-                = findPreference(getString(R.string.show_image_indicators_key));
-        final Preference crashTheAppPreference
-                = findPreference(getString(R.string.crash_the_app_key));
-
-        assert showMemoryLeaksPreference != null;
-        assert showImageIndicatorsPreference != null;
-        assert crashTheAppPreference != null;
-
-        showMemoryLeaksPreference.setOnPreferenceClickListener(preference -> {
-            startActivity(LeakCanary.INSTANCE.newLeakDisplayActivityIntent());
-            return true;
-        });
-
-        showImageIndicatorsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
-            PicassoHelper.setIndicatorsEnabled((Boolean) newValue);
-            return true;
-        });
-
-        crashTheAppPreference.setOnPreferenceClickListener(preference -> {
-            throw new RuntimeException();
-        });
-    }
-}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.schabi.newpipe"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -14,6 +13,9 @@
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
 
     <application
         android:name=".App"
@@ -44,7 +46,7 @@
         </receiver>
 
         <service
-            android:name=".player.MainPlayer"
+            android:name=".player.PlayerService"
             android:exported="false"
             android:foregroundServiceType="mediaPlayback">
             <intent-filter>
@@ -151,6 +153,7 @@
                 <data android:pathPrefix="/channel/" />
                 <data android:pathPrefix="/user/" />
                 <data android:pathPrefix="/c/" />
+                <data android:pathPrefix="/@" />
                 <!-- playlist prefix -->
                 <data android:pathPrefix="/playlist" />
             </intent-filter>
@@ -338,6 +341,7 @@
                 <data android:host="video.ploud.fr" />
                 <data android:host="video.lqdn.fr" />
                 <data android:host="skeptikon.fr" />
+                <data android:host="media.fsfe.org" />
 
                 <data android:pathPrefix="/videos/" /> <!-- it contains playlists -->
                 <data android:pathPrefix="/w/" /> <!-- short video URLs -->
@@ -380,9 +384,6 @@
         <service
             android:name=".RouterActivity$FetcherService"
             android:exported="false" />
-        <service
-            android:name=".CheckForNewAppVersion"
-            android:exported="false" />
 
         <!-- opting out of sending metrics to Google in Android System WebView -->
         <meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true" />

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

@@ -282,11 +282,9 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     @Nullable
     public Parcelable saveState() {
         Bundle state = null;
-        if (mSavedState.size() > 0) {
+        if (!mSavedState.isEmpty()) {
             state = new Bundle();
-            final Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
-            mSavedState.toArray(fss);
-            state.putParcelableArray("states", fss);
+            state.putParcelableArray("states", mSavedState.toArray(new Fragment.SavedState[0]));
         }
         for (int i = 0; i < mFragments.size(); i++) {
             final Fragment f = mFragments.get(i);

app/src/main/java/com/google/android/material/appbar/FlingBehavior.java

@@ -14,7 +14,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import org.schabi.newpipe.R;
 
 import java.lang.reflect.Field;
-import java.util.Arrays;
 import java.util.List;
 
 // See https://stackoverflow.com/questions/56849221#57997489
@@ -27,7 +26,7 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
 
     private boolean allowScroll = true;
     private final Rect globalRect = new Rect();
-    private final List<Integer> skipInterceptionOfElements = Arrays.asList(
+    private final List<Integer> skipInterceptionOfElements = List.of(
             R.id.itemsListPanel, R.id.playbackSeekBar,
             R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
 
@@ -63,10 +62,11 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
         return consumed == dy;
     }
 
+    @Override
     public boolean onInterceptTouchEvent(@NonNull final CoordinatorLayout parent,
                                          @NonNull final AppBarLayout child,
                                          @NonNull final MotionEvent ev) {
-        for (final Integer element : skipInterceptionOfElements) {
+        for (final int element : skipInterceptionOfElements) {
             final View view = child.findViewById(element);
             if (view != null) {
                 final boolean visible = view.getGlobalVisibleRect(globalRect);
@@ -131,8 +131,8 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
         try {
             final Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass();
             if (headerBehaviorType != null) {
-                final Field field
-                        = headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
+                final Field field =
+                        headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
                 field.setAccessible(true);
                 return field;
             }

app/src/main/java/org/apache/commons/text/similarity/FuzzyScore.java

@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.text.similarity;
+
+import java.util.Locale;
+
+/**
+ * A matching algorithm that is similar to the searching algorithms implemented in editors such
+ * as Sublime Text, TextMate, Atom and others.
+ *
+ * <p>
+ * One point is given for every matched character. Subsequent matches yield two bonus points.
+ * A higher score indicates a higher similarity.
+ * </p>
+ *
+ * <p>
+ * This code has been adapted from Apache Commons Lang 3.3.
+ * </p>
+ *
+ * @since 1.0
+ *
+ * Note: This class was forked from
+ * <a href="https://git.io/JyYJg">
+ *     apache/commons-text (8cfdafc) FuzzyScore.java
+ * </a>
+ */
+public class FuzzyScore {
+
+    /**
+     * Locale used to change the case of text.
+     */
+    private final Locale locale;
+
+
+    /**
+     * This returns a {@link Locale}-specific {@link FuzzyScore}.
+     *
+     * @param locale The string matching logic is case insensitive.
+    A {@link Locale} is necessary to normalize both Strings to lower case.
+     * @throws IllegalArgumentException
+     *         This is thrown if the {@link Locale} parameter is {@code null}.
+     */
+    public FuzzyScore(final Locale locale) {
+        if (locale == null) {
+            throw new IllegalArgumentException("Locale must not be null");
+        }
+        this.locale = locale;
+    }
+
+    /**
+     * Find the Fuzzy Score which indicates the similarity score between two
+     * Strings.
+     *
+     * <pre>
+     * score.fuzzyScore(null, null)                          = IllegalArgumentException
+     * score.fuzzyScore("not null", null)                    = IllegalArgumentException
+     * score.fuzzyScore(null, "not null")                    = IllegalArgumentException
+     * score.fuzzyScore("", "")                              = 0
+     * score.fuzzyScore("Workshop", "b")                     = 0
+     * score.fuzzyScore("Room", "o")                         = 1
+     * score.fuzzyScore("Workshop", "w")                     = 1
+     * score.fuzzyScore("Workshop", "ws")                    = 2
+     * score.fuzzyScore("Workshop", "wo")                    = 4
+     * score.fuzzyScore("Apache Software Foundation", "asf") = 3
+     * </pre>
+     *
+     * @param term a full term that should be matched against, must not be null
+     * @param query the query that will be matched against a term, must not be
+     *            null
+     * @return result score
+     * @throws IllegalArgumentException if the term or query is {@code null}
+     */
+    public Integer fuzzyScore(final CharSequence term, final CharSequence query) {
+        if (term == null || query == null) {
+            throw new IllegalArgumentException("CharSequences must not be null");
+        }
+
+        // fuzzy logic is case insensitive. We normalize the Strings to lower
+        // case right from the start. Turning characters to lower case
+        // via Character.toLowerCase(char) is unfortunately insufficient
+        // as it does not accept a locale.
+        final String termLowerCase = term.toString().toLowerCase(locale);
+        final String queryLowerCase = query.toString().toLowerCase(locale);
+
+        // the resulting score
+        int score = 0;
+
+        // the position in the term which will be scanned next for potential
+        // query character matches
+        int termIndex = 0;
+
+        // index of the previously matched character in the term
+        int previousMatchingCharacterIndex = Integer.MIN_VALUE;
+
+        for (int queryIndex = 0; queryIndex < queryLowerCase.length(); queryIndex++) {
+            final char queryChar = queryLowerCase.charAt(queryIndex);
+
+            boolean termCharacterMatchFound = false;
+            for (; termIndex < termLowerCase.length()
+                    && !termCharacterMatchFound; termIndex++) {
+                final char termChar = termLowerCase.charAt(termIndex);
+
+                if (queryChar == termChar) {
+                    // simple character matches result in one point
+                    score++;
+
+                    // subsequent character matches further improve
+                    // the score.
+                    if (previousMatchingCharacterIndex + 1 == termIndex) {
+                        score += 2;
+                    }
+
+                    previousMatchingCharacterIndex = termIndex;
+
+                    // we can leave the nested loop. Every character in the
+                    // query can match at most one character in the term.
+                    termCharacterMatchFound = true;
+                }
+            }
+        }
+
+        return score;
+    }
+
+    /**
+     * Gets the locale.
+     *
+     * @return The locale
+     */
+    public Locale getLocale() {
+        return locale;
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
@@ -7,19 +8,13 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationChannelCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 
 import com.jakewharton.processphoenix.ProcessPhoenix;
 
 import org.acra.ACRA;
-import org.acra.config.ACRAConfigurationException;
-import org.acra.config.CoreConfiguration;
 import org.acra.config.CoreConfigurationBuilder;
-import org.schabi.newpipe.error.ErrorActivity;
-import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ReCaptchaActivity;
-import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.ktx.ExceptionUtils;
@@ -32,9 +27,8 @@ import org.schabi.newpipe.util.StateSaver;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.exceptions.CompositeException;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
@@ -61,7 +55,7 @@ import io.reactivex.rxjava3.plugins.RxJavaPlugins;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class App extends MultiDexApplication {
+public class App extends Application {
     public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
     private static final String TAG = App.class.toString();
     private static App app;
@@ -145,7 +139,7 @@ public class App extends MultiDexApplication {
                 if (throwable instanceof UndeliverableException) {
                     // As UndeliverableException is a wrapper,
                     // get the cause of it to get the "real" exception
-                    actualThrowable = throwable.getCause();
+                    actualThrowable = Objects.requireNonNull(throwable.getCause());
                 } else {
                     actualThrowable = throwable;
                 }
@@ -154,7 +148,7 @@ public class App extends MultiDexApplication {
                 if (actualThrowable instanceof CompositeException) {
                     errors = ((CompositeException) actualThrowable).getExceptions();
                 } else {
-                    errors = Collections.singletonList(actualThrowable);
+                    errors = List.of(actualThrowable);
                 }
 
                 for (final Throwable error : errors) {
@@ -210,45 +204,48 @@ public class App extends MultiDexApplication {
             return;
         }
 
-        try {
-            final CoreConfiguration acraConfig = new CoreConfigurationBuilder(this)
-                    .setBuildConfigClass(BuildConfig.class)
-                    .build();
-            ACRA.init(this, acraConfig);
-        } catch (final ACRAConfigurationException exception) {
-            exception.printStackTrace();
-            ErrorActivity.reportError(this, new ErrorInfo(exception,
-                    UserAction.SOMETHING_ELSE, "Could not initialize ACRA crash report"));
-        }
+        final CoreConfigurationBuilder acraConfig = new CoreConfigurationBuilder()
+                .withBuildConfigClass(BuildConfig.class);
+        ACRA.init(this, acraConfig);
     }
 
     private void initNotificationChannels() {
         // Keep the importance below DEFAULT to avoid making noise on every notification update for
         // the main and update channels
-        final NotificationChannelCompat mainChannel = new NotificationChannelCompat
-                .Builder(getString(R.string.notification_channel_id),
-                NotificationManagerCompat.IMPORTANCE_LOW)
-                .setName(getString(R.string.notification_channel_name))
-                .setDescription(getString(R.string.notification_channel_description))
-                .build();
-
-        final NotificationChannelCompat appUpdateChannel = new NotificationChannelCompat
-                .Builder(getString(R.string.app_update_notification_channel_id),
-                NotificationManagerCompat.IMPORTANCE_LOW)
-                .setName(getString(R.string.app_update_notification_channel_name))
-                .setDescription(getString(R.string.app_update_notification_channel_description))
-                .build();
-
-        final NotificationChannelCompat hashChannel = new NotificationChannelCompat
-                .Builder(getString(R.string.hash_channel_id),
-                NotificationManagerCompat.IMPORTANCE_HIGH)
-                .setName(getString(R.string.hash_channel_name))
-                .setDescription(getString(R.string.hash_channel_description))
-                .build();
+        final List<NotificationChannelCompat> notificationChannelCompats = List.of(
+                new NotificationChannelCompat.Builder(getString(R.string.notification_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.notification_channel_name))
+                        .setDescription(getString(R.string.notification_channel_description))
+                        .build(),
+                new NotificationChannelCompat
+                        .Builder(getString(R.string.app_update_notification_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.app_update_notification_channel_name))
+                        .setDescription(
+                                getString(R.string.app_update_notification_channel_description))
+                        .build(),
+                new NotificationChannelCompat.Builder(getString(R.string.hash_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_HIGH)
+                        .setName(getString(R.string.hash_channel_name))
+                        .setDescription(getString(R.string.hash_channel_description))
+                        .build(),
+                new NotificationChannelCompat.Builder(getString(R.string.error_report_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_LOW)
+                        .setName(getString(R.string.error_report_channel_name))
+                        .setDescription(getString(R.string.error_report_channel_description))
+                        .build(),
+                new NotificationChannelCompat
+                        .Builder(getString(R.string.streams_notification_channel_id),
+                        NotificationManagerCompat.IMPORTANCE_DEFAULT)
+                        .setName(getString(R.string.streams_notification_channel_name))
+                        .setDescription(
+                                getString(R.string.streams_notification_channel_description))
+                        .build()
+        );
 
         final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
-        notificationManager.createNotificationChannelsCompat(Arrays.asList(mainChannel,
-                appUpdateChannel, hashChannel));
+        notificationManager.createNotificationChannelsCompat(notificationChannelCompats);
     }
 
     protected boolean isDisposedRxExceptionsReported() {

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

@@ -1,264 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Application;
-import android.app.IntentService;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.pm.Signature;
-import android.net.Uri;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import androidx.core.content.pm.PackageInfoCompat;
-import androidx.preference.PreferenceManager;
-
-import com.grack.nanojson.JsonObject;
-import com.grack.nanojson.JsonParser;
-import com.grack.nanojson.JsonParserException;
-
-import org.schabi.newpipe.error.ErrorActivity;
-import org.schabi.newpipe.error.ErrorInfo;
-import org.schabi.newpipe.error.UserAction;
-import org.schabi.newpipe.extractor.downloader.Response;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-public final class CheckForNewAppVersion extends IntentService {
-    public CheckForNewAppVersion() {
-        super("CheckForNewAppVersion");
-    }
-
-    private static final boolean DEBUG = MainActivity.DEBUG;
-    private static final String TAG = CheckForNewAppVersion.class.getSimpleName();
-
-    // Public key of the certificate that is used in NewPipe release versions
-    private static final String RELEASE_CERT_PUBLIC_KEY_SHA1
-            = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
-    private static final String NEWPIPE_API_URL = "https://newpipe.net/api/data.json";
-
-    /**
-     * Method to get the APK's SHA1 key. See https://stackoverflow.com/questions/9293019/#22506133.
-     *
-     * @param application The application
-     * @return String with the APK's SHA1 fingerprint in hexadecimal
-     */
-    @NonNull
-    private static String getCertificateSHA1Fingerprint(@NonNull final Application application) {
-        final List<Signature> signatures;
-        try {
-            signatures = PackageInfoCompat.getSignatures(application.getPackageManager(),
-                    application.getPackageName());
-        } catch (final PackageManager.NameNotFoundException e) {
-            ErrorActivity.reportError(application, new ErrorInfo(e,
-                    UserAction.CHECK_FOR_NEW_APP_VERSION, "Could not find package info"));
-            return "";
-        }
-        if (signatures.isEmpty()) {
-            return "";
-        }
-
-        final X509Certificate c;
-        try {
-            final byte[] cert = signatures.get(0).toByteArray();
-            final InputStream input = new ByteArrayInputStream(cert);
-            final CertificateFactory cf = CertificateFactory.getInstance("X509");
-            c = (X509Certificate) cf.generateCertificate(input);
-        } catch (final CertificateException e) {
-            ErrorActivity.reportError(application, new ErrorInfo(e,
-                    UserAction.CHECK_FOR_NEW_APP_VERSION, "Certificate error"));
-            return "";
-        }
-
-        try {
-            final MessageDigest md = MessageDigest.getInstance("SHA1");
-            final byte[] publicKey = md.digest(c.getEncoded());
-            return byte2HexFormatted(publicKey);
-        } catch (NoSuchAlgorithmException | CertificateEncodingException e) {
-            ErrorActivity.reportError(application, new ErrorInfo(e,
-                    UserAction.CHECK_FOR_NEW_APP_VERSION, "Could not retrieve SHA1 key"));
-            return "";
-        }
-    }
-
-    private static String byte2HexFormatted(final byte[] arr) {
-        final StringBuilder str = new StringBuilder(arr.length * 2);
-
-        for (int i = 0; i < arr.length; i++) {
-            String h = Integer.toHexString(arr[i]);
-            final int l = h.length();
-            if (l == 1) {
-                h = "0" + h;
-            }
-            if (l > 2) {
-                h = h.substring(l - 2, l);
-            }
-            str.append(h.toUpperCase());
-            if (i < (arr.length - 1)) {
-                str.append(':');
-            }
-        }
-        return str.toString();
-    }
-
-    /**
-     * Method to compare the current and latest available app version.
-     * If a newer version is available, we show the update notification.
-     *
-     * @param application    The application
-     * @param versionName    Name of new version
-     * @param apkLocationUrl Url with the new apk
-     * @param versionCode    Code of new version
-     */
-    private static void compareAppVersionAndShowNotification(@NonNull final Application application,
-                                                             final String versionName,
-                                                             final String apkLocationUrl,
-                                                             final int versionCode) {
-        if (BuildConfig.VERSION_CODE >= versionCode) {
-            return;
-        }
-
-        // A pending intent to open the apk location url in the browser.
-        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        final PendingIntent pendingIntent
-                = PendingIntent.getActivity(application, 0, intent, 0);
-
-        final String channelId = application
-                .getString(R.string.app_update_notification_channel_id);
-        final NotificationCompat.Builder notificationBuilder
-                = new NotificationCompat.Builder(application, channelId)
-                .setSmallIcon(R.drawable.ic_newpipe_update)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setContentIntent(pendingIntent)
-                .setAutoCancel(true)
-                .setContentTitle(application
-                        .getString(R.string.app_update_notification_content_title))
-                .setContentText(application
-                        .getString(R.string.app_update_notification_content_text)
-                        + " " + versionName);
-
-        final NotificationManagerCompat notificationManager
-                = NotificationManagerCompat.from(application);
-        notificationManager.notify(2000, notificationBuilder.build());
-    }
-
-    public static boolean isReleaseApk(@NonNull final App app) {
-        return getCertificateSHA1Fingerprint(app).equals(RELEASE_CERT_PUBLIC_KEY_SHA1);
-    }
-
-    private void checkNewVersion() throws IOException, ReCaptchaException {
-        final App app = App.getApp();
-
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
-        final NewVersionManager manager = new NewVersionManager();
-
-        // Check if the current apk is a github one or not.
-        if (!isReleaseApk(app)) {
-            return;
-        }
-
-        // Check if the last request has happened a certain time ago
-        // to reduce the number of API requests.
-        final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0);
-        if (!manager.isExpired(expiry)) {
-            return;
-        }
-
-        // Make a network request to get latest NewPipe data.
-        final Response response = DownloaderImpl.getInstance().get(NEWPIPE_API_URL);
-        handleResponse(response, manager, prefs, app);
-    }
-
-    private void handleResponse(@NonNull final Response response,
-                                @NonNull final NewVersionManager manager,
-                                @NonNull final SharedPreferences prefs,
-                                @NonNull final App app) {
-        try {
-            // Store a timestamp which needs to be exceeded,
-            // before a new request to the API is made.
-            final long newExpiry = manager
-                    .coerceExpiry(response.getHeader("expires"));
-            prefs.edit()
-                    .putLong(app.getString(R.string.update_expiry_key), newExpiry)
-                    .apply();
-        } catch (final Exception e) {
-            if (DEBUG) {
-                Log.w(TAG, "Could not extract and save new expiry date", e);
-            }
-        }
-
-        // Parse the json from the response.
-        try {
-
-            final JsonObject githubStableObject = JsonParser.object()
-                    .from(response.responseBody()).getObject("flavors")
-                    .getObject("github").getObject("stable");
-
-            final String versionName = githubStableObject
-                    .getString("version");
-            final int versionCode = githubStableObject
-                    .getInt("version_code");
-            final String apkLocationUrl = githubStableObject
-                    .getString("apk");
-
-            compareAppVersionAndShowNotification(app, versionName,
-                    apkLocationUrl, versionCode);
-        } catch (final JsonParserException e) {
-            // Most likely something is wrong in data received from NEWPIPE_API_URL.
-            // Do not alarm user and fail silently.
-            if (DEBUG) {
-                Log.w(TAG, "Could not get NewPipe API: invalid json", e);
-            }
-        }
-    }
-
-    /**
-     * Start a new service which
-     * checks if all conditions for performing a version check are met,
-     * fetches the API endpoint {@link #NEWPIPE_API_URL} containing info
-     * about the latest NewPipe version
-     * and displays a notification about ana available update.
-     * <br>
-     * Following conditions need to be met, before data is request from the server:
-     * <ul>
-     * <li> The app is signed with the correct signing key (by TeamNewPipe / schabi).
-     * If the signing key differs from the one used upstream, the update cannot be installed.</li>
-     * <li>The user enabled searching for and notifying about updates in the settings.</li>
-     * <li>The app did not recently check for updates.
-     * We do not want to make unnecessary connections and DOS our servers.</li>
-     * </ul>
-     * <b>Must not be executed</b> when the app is in background.
-     */
-    public static void startNewVersionCheckService() {
-        final Intent intent = new Intent(App.getApp().getApplicationContext(),
-                CheckForNewAppVersion.class);
-        App.getApp().startService(intent);
-    }
-
-    @Override
-    protected void onHandleIntent(@Nullable final Intent intent) {
-        try {
-            checkNewVersion();
-        } catch (final IOException e) {
-            Log.w(TAG, "Could not fetch NewPipe API: probably network problem", e);
-        } catch (final ReCaptchaException e) {
-            Log.e(TAG, "ReCaptchaException should never happen here.", e);
-        }
-
-    }
-}

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe;
 
 import android.content.Context;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -12,40 +11,27 @@ import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.downloader.Request;
 import org.schabi.newpipe.extractor.downloader.Response;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.util.CookieUtils;
 import org.schabi.newpipe.util.InfoCache;
-import org.schabi.newpipe.util.TLSSocketFactoryCompat;
 
 import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import okhttp3.CipherSuite;
-import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 
-import static org.schabi.newpipe.MainActivity.DEBUG;
-
 public final class DownloaderImpl extends Downloader {
-    public static final String USER_AGENT
-            = "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0";
-    public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY
-            = "youtube_restricted_mode_key";
+    public static final String USER_AGENT =
+            "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.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";
     public static final String YOUTUBE_DOMAIN = "youtube.com";
 
@@ -54,9 +40,6 @@ public final class DownloaderImpl extends Downloader {
     private final OkHttpClient client;
 
     private DownloaderImpl(final OkHttpClient.Builder builder) {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-            enableModernTLS(builder);
-        }
         this.client = builder
                 .readTimeout(30, TimeUnit.SECONDS)
 //                .cache(new Cache(new File(context.getExternalCacheDir(), "okhttp"),
@@ -81,69 +64,16 @@ public final class DownloaderImpl extends Downloader {
         return instance;
     }
 
-    /**
-     * Enable TLS 1.2 and 1.1 on Android Kitkat. This function is mostly taken
-     * from the documentation of OkHttpClient.Builder.sslSocketFactory(_,_).
-     * <p>
-     * If there is an error, the function will safely fall back to doing nothing
-     * and printing the error to the console.
-     * </p>
-     *
-     * @param builder The HTTPClient Builder on which TLS is enabled on (will be modified in-place)
-     */
-    private static void enableModernTLS(final OkHttpClient.Builder builder) {
-        try {
-            // get the default TrustManager
-            final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-                    TrustManagerFactory.getDefaultAlgorithm());
-            trustManagerFactory.init((KeyStore) null);
-            final TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-            if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
-                throw new IllegalStateException("Unexpected default trust managers:"
-                        + Arrays.toString(trustManagers));
-            }
-            final X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
-
-            // insert our own TLSSocketFactory
-            final SSLSocketFactory sslSocketFactory = TLSSocketFactoryCompat.getInstance();
-
-            builder.sslSocketFactory(sslSocketFactory, trustManager);
-
-            // This will try to enable all modern CipherSuites(+2 more)
-            // that are supported on the device.
-            // Necessary because some servers (e.g. Framatube.org)
-            // don't support the old cipher suites.
-            // https://github.com/square/okhttp/issues/4053#issuecomment-402579554
-            final List<CipherSuite> cipherSuites =
-                    new ArrayList<>(ConnectionSpec.MODERN_TLS.cipherSuites());
-            cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
-            cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
-            final ConnectionSpec legacyTLS = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                    .cipherSuites(cipherSuites.toArray(new CipherSuite[0]))
-                    .build();
-
-            builder.connectionSpecs(Arrays.asList(legacyTLS, ConnectionSpec.CLEARTEXT));
-        } catch (final KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
-            if (DEBUG) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     public String getCookies(final String url) {
-        final List<String> resultCookies = new ArrayList<>();
-        if (url.contains(YOUTUBE_DOMAIN)) {
-            final String youtubeCookie = getCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY);
-            if (youtubeCookie != null) {
-                resultCookies.add(youtubeCookie);
-            }
-        }
+        final String youtubeCookie = url.contains(YOUTUBE_DOMAIN)
+                ? getCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY) : null;
+
         // Recaptcha cookie is always added TODO: not sure if this is necessary
-        final String recaptchaCookie = getCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY);
-        if (recaptchaCookie != null) {
-            resultCookies.add(recaptchaCookie);
-        }
-        return CookieUtils.concatCookies(resultCookies);
+        return Stream.of(youtubeCookie, getCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY))
+                .filter(Objects::nonNull)
+                .flatMap(cookies -> Arrays.stream(cookies.split("; *")))
+                .distinct()
+                .collect(Collectors.joining("; "));
     }
 
     public String getCookie(final String key) {
@@ -203,7 +133,7 @@ public final class DownloaderImpl extends Downloader {
 
         RequestBody requestBody = null;
         if (dataToSend != null) {
-            requestBody = RequestBody.create(null, dataToSend);
+            requestBody = RequestBody.create(dataToSend);
         }
 
         final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()

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

@@ -3,7 +3,6 @@ package org.schabi.newpipe;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 
 import org.schabi.newpipe.util.NavigationHelper;
@@ -44,11 +43,7 @@ public class ExitActivity extends Activity {
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            finishAndRemoveTask();
-        } else {
-            finish();
-        }
+        finishAndRemoveTask();
 
         NavigationHelper.restartApp(this);
     }

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

@@ -20,7 +20,6 @@
 
 package org.schabi.newpipe;
 
-import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.content.BroadcastReceiver;
@@ -29,7 +28,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -63,7 +61,7 @@ import org.schabi.newpipe.databinding.DrawerHeaderBinding;
 import org.schabi.newpipe.databinding.DrawerLayoutBinding;
 import org.schabi.newpipe.databinding.InstanceSpinnerLayoutBinding;
 import org.schabi.newpipe.databinding.ToolbarLayoutBinding;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -72,6 +70,7 @@ import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
+import org.schabi.newpipe.local.feed.notifications.NotificationWorker;
 import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.helper.PlayerHolder;
@@ -86,7 +85,6 @@ import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
-import org.schabi.newpipe.util.TLSSocketFactoryCompat;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;
 
@@ -131,11 +129,6 @@ public class MainActivity extends AppCompatActivity {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
 
-        // enable TLS1.1/1.2 for kitkat devices, to fix download and play for media.ccc.de sources
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-            TLSSocketFactoryCompat.setAsDefault();
-        }
-
         ThemeHelper.setDayNightMode(this);
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
@@ -157,13 +150,16 @@ public class MainActivity extends AppCompatActivity {
         try {
             setupDrawer();
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Setting up drawer", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Setting up drawer", e);
         }
-
         if (DeviceUtils.isTv(this)) {
             FocusOverlayView.setupFocusObserver(this);
         }
         openMiniPlayerUponPlayerStarted();
+
+        // Schedule worker for checking for new streams and creating corresponding notifications
+        // if this is enabled by the user.
+        NotificationWorker.initialize(this);
     }
 
     @Override
@@ -174,10 +170,9 @@ public class MainActivity extends AppCompatActivity {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
         if (prefs.getBoolean(app.getString(R.string.update_app_key), true)) {
-            // Start the service which is checking all conditions
+            // Start the worker which is checking all conditions
             // and eventually searching for a new version.
-            // The service searching for a new NewPipe version must not be started in background.
-            startNewVersionCheckService();
+            NewVersionWorker.enqueueNewVersionCheckingWork(app);
         }
     }
 
@@ -214,7 +209,7 @@ public class MainActivity extends AppCompatActivity {
     /**
      * Builds the drawer menu for the current service.
      *
-     * @throws ExtractionException
+     * @throws ExtractionException if the service didn't provide available kiosks
      */
     private void addDrawerMenuForCurrentService() throws ExtractionException {
         //Tabs
@@ -227,7 +222,7 @@ public class MainActivity extends AppCompatActivity {
             drawerLayoutBinding.navigation.getMenu()
                     .add(R.id.menu_tabs_group, kioskId, 0, KioskTranslator
                             .getTranslatedKioskName(ks, this))
-                    .setIcon(KioskTranslator.getKioskIcon(ks, this));
+                    .setIcon(KioskTranslator.getKioskIcon(ks));
             kioskId++;
         }
 
@@ -266,7 +261,7 @@ public class MainActivity extends AppCompatActivity {
                 try {
                     tabSelected(item);
                 } catch (final Exception e) {
-                    ErrorActivity.reportUiErrorInSnackbar(this, "Selecting main page tab", e);
+                    ErrorUtil.showUiErrorSnackbar(this, "Selecting main page tab", e);
                 }
                 break;
             case R.id.menu_options_about_group:
@@ -372,15 +367,14 @@ public class MainActivity extends AppCompatActivity {
             try {
                 addDrawerMenuForCurrentService();
             } catch (final Exception e) {
-                ErrorActivity.reportUiErrorInSnackbar(this, "Showing main page tabs", e);
+                ErrorUtil.showUiErrorSnackbar(this, "Showing main page tabs", e);
             }
         }
     }
 
     private void showServices() {
         for (final StreamingService s : NewPipe.getServices()) {
-            final String title = s.getServiceInfo().getName()
-                    + (ServiceHelper.isBeta(s) ? " (beta)" : "");
+            final String title = s.getServiceInfo().getName();
 
             final MenuItem menuItem = drawerLayoutBinding.navigation.getMenu()
                     .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
@@ -388,7 +382,7 @@ public class MainActivity extends AppCompatActivity {
 
             // peertube specifics
             if (s.getServiceId() == 3) {
-                enhancePeertubeMenu(s, menuItem);
+                enhancePeertubeMenu(menuItem);
             }
         }
         drawerLayoutBinding.navigation.getMenu()
@@ -396,9 +390,9 @@ public class MainActivity extends AppCompatActivity {
                 .setChecked(true);
     }
 
-    private void enhancePeertubeMenu(final StreamingService s, final MenuItem menuItem) {
+    private void enhancePeertubeMenu(final MenuItem menuItem) {
         final PeertubeInstance currentInstance = PeertubeHelper.getCurrentInstance();
-        menuItem.setTitle(currentInstance.getName() + (ServiceHelper.isBeta(s) ? " (beta)" : ""));
+        menuItem.setTitle(currentInstance.getName());
         final Spinner spinner = InstanceSpinnerLayoutBinding.inflate(LayoutInflater.from(this))
                 .getRoot();
         final List<PeertubeInstance> instances = PeertubeHelper.getInstanceList(this);
@@ -475,11 +469,11 @@ public class MainActivity extends AppCompatActivity {
             drawerHeaderBinding.drawerHeaderActionButton.setContentDescription(
                     getString(R.string.drawer_header_description) + selectedServiceName);
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Setting up service toggle", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
         }
 
-        final SharedPreferences sharedPreferences
-                = PreferenceManager.getDefaultSharedPreferences(this);
+        final SharedPreferences sharedPreferences =
+                PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
             if (DEBUG) {
                 Log.d(TAG, "Theme has changed, recreating activity...");
@@ -651,8 +645,8 @@ public class MainActivity extends AppCompatActivity {
         }
         super.onCreateOptionsMenu(menu);
 
-        final Fragment fragment
-                = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        final Fragment fragment =
+                getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
         if (!(fragment instanceof SearchFragment)) {
             toolbarLayoutBinding.toolbarSearchContainer.getRoot().setVisibility(View.GONE);
         }
@@ -719,7 +713,7 @@ public class MainActivity extends AppCompatActivity {
             if (toggle != null) {
                 toggle.syncState();
                 toolbarLayoutBinding.toolbar.setNavigationOnClickListener(v -> mainBinding.getRoot()
-                        .openDrawer(GravityCompat.START));
+                        .open());
                 mainBinding.getRoot().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNDEFINED);
             }
         } else {
@@ -785,7 +779,7 @@ public class MainActivity extends AppCompatActivity {
                 NavigationHelper.gotoMainFragment(getSupportFragmentManager());
             }
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Handling intent", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Handling intent", e);
         }
     }
 

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

@@ -1,5 +1,11 @@
 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 android.content.Context;
 import android.database.Cursor;
 
@@ -8,11 +14,6 @@ import androidx.room.Room;
 
 import org.schabi.newpipe.database.AppDatabase;
 
-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;
-
 public final class NewPipeDatabase {
     private static volatile AppDatabase databaseInstance;
 
@@ -23,7 +24,7 @@ public final class NewPipeDatabase {
     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)
+                .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5)
                 .build();
     }
 

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

@@ -1,28 +0,0 @@
-package org.schabi.newpipe
-
-import java.time.Instant
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-
-class NewVersionManager {
-
-    fun isExpired(expiry: Long): Boolean {
-        return Instant.ofEpochSecond(expiry).isBefore(Instant.now())
-    }
-
-    /**
-     * Coerce expiry date time in between 6 hours and 72 hours from now
-     *
-     * @return Epoch second of expiry date time
-     */
-    fun coerceExpiry(expiryString: String?): Long {
-        val now = ZonedDateTime.now()
-        return expiryString?.let {
-
-            var expiry = ZonedDateTime.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(expiryString))
-            expiry = maxOf(expiry, now.plusHours(6))
-            expiry = minOf(expiry, now.plusHours(72))
-            expiry.toEpochSecond()
-        } ?: now.plusHours(6).toEpochSecond()
-    }
-}

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

@@ -0,0 +1,163 @@
+package org.schabi.newpipe
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.edit
+import androidx.core.net.toUri
+import androidx.preference.PreferenceManager
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
+import androidx.work.WorkRequest
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import com.grack.nanojson.JsonParser
+import com.grack.nanojson.JsonParserException
+import org.schabi.newpipe.extractor.downloader.Response
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
+import org.schabi.newpipe.util.ReleaseVersionUtil.coerceUpdateCheckExpiry
+import org.schabi.newpipe.util.ReleaseVersionUtil.isLastUpdateCheckExpired
+import org.schabi.newpipe.util.ReleaseVersionUtil.isReleaseApk
+import java.io.IOException
+
+class NewVersionWorker(
+    context: Context,
+    workerParams: WorkerParameters
+) : Worker(context, workerParams) {
+
+    /**
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
+     *
+     * @param versionName    Name of new version
+     * @param apkLocationUrl Url with the new apk
+     * @param versionCode    Code of new version
+     */
+    private fun compareAppVersionAndShowNotification(
+        versionName: String,
+        apkLocationUrl: String?,
+        versionCode: Int
+    ) {
+        if (BuildConfig.VERSION_CODE >= versionCode) {
+            return
+        }
+        val app = App.getApp()
+
+        // A pending intent to open the apk location url in the browser.
+        val intent = Intent(Intent.ACTION_VIEW, apkLocationUrl?.toUri())
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        val pendingIntent = PendingIntent.getActivity(app, 0, intent, 0)
+        val channelId = app.getString(R.string.app_update_notification_channel_id)
+        val notificationBuilder = NotificationCompat.Builder(app, channelId)
+            .setSmallIcon(R.drawable.ic_newpipe_update)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setContentIntent(pendingIntent)
+            .setAutoCancel(true)
+            .setContentTitle(app.getString(R.string.app_update_notification_content_title))
+            .setContentText(
+                app.getString(R.string.app_update_notification_content_text) +
+                    " " + versionName
+            )
+        val notificationManager = NotificationManagerCompat.from(app)
+        notificationManager.notify(2000, notificationBuilder.build())
+    }
+
+    @Throws(IOException::class, ReCaptchaException::class)
+    private fun checkNewVersion() {
+        // Check if the current apk is a github one or not.
+        if (!isReleaseApk()) {
+            return
+        }
+
+        val prefs = PreferenceManager.getDefaultSharedPreferences(applicationContext)
+        // Check if the last request has happened a certain time ago
+        // to reduce the number of API requests.
+        val expiry = prefs.getLong(applicationContext.getString(R.string.update_expiry_key), 0)
+        if (!isLastUpdateCheckExpired(expiry)) {
+            return
+        }
+
+        // Make a network request to get latest NewPipe data.
+        val response = DownloaderImpl.getInstance().get(NEWPIPE_API_URL)
+        handleResponse(response)
+    }
+
+    private fun handleResponse(response: Response) {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(applicationContext)
+        try {
+            // Store a timestamp which needs to be exceeded,
+            // before a new request to the API is made.
+            val newExpiry = coerceUpdateCheckExpiry(response.getHeader("expires"))
+            prefs.edit {
+                putLong(applicationContext.getString(R.string.update_expiry_key), newExpiry)
+            }
+        } catch (e: Exception) {
+            if (DEBUG) {
+                Log.w(TAG, "Could not extract and save new expiry date", e)
+            }
+        }
+
+        // Parse the json from the response.
+        try {
+            val githubStableObject = JsonParser.`object`()
+                .from(response.responseBody()).getObject("flavors")
+                .getObject("github").getObject("stable")
+
+            val versionName = githubStableObject.getString("version")
+            val versionCode = githubStableObject.getInt("version_code")
+            val apkLocationUrl = githubStableObject.getString("apk")
+            compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode)
+        } catch (e: JsonParserException) {
+            // Most likely something is wrong in data received from NEWPIPE_API_URL.
+            // Do not alarm user and fail silently.
+            if (DEBUG) {
+                Log.w(TAG, "Could not get NewPipe API: invalid json", e)
+            }
+        }
+    }
+
+    override fun doWork(): Result {
+        try {
+            checkNewVersion()
+        } catch (e: IOException) {
+            Log.w(TAG, "Could not fetch NewPipe API: probably network problem", e)
+            return Result.failure()
+        } catch (e: ReCaptchaException) {
+            Log.e(TAG, "ReCaptchaException should never happen here.", e)
+            return Result.failure()
+        }
+        return Result.success()
+    }
+
+    companion object {
+        private val DEBUG = MainActivity.DEBUG
+        private val TAG = NewVersionWorker::class.java.simpleName
+        private const val NEWPIPE_API_URL = "https://newpipe.net/api/data.json"
+
+        /**
+         * Start a new worker which
+         * checks if all conditions for performing a version check are met,
+         * fetches the API endpoint [.NEWPIPE_API_URL] containing info
+         * about the latest NewPipe version
+         * and displays a notification about ana available update.
+         * <br></br>
+         * Following conditions need to be met, before data is request from the server:
+         *
+         *  *  The app is signed with the correct signing key (by TeamNewPipe / schabi).
+         * If the signing key differs from the one used upstream, the update cannot be installed.
+         *  * The user enabled searching for and notifying about updates in the settings.
+         *  * The app did not recently check for updates.
+         * We do not want to make unnecessary connections and DOS our servers.
+         *
+         */
+        @JvmStatic
+        fun enqueueNewVersionCheckingWork(context: Context) {
+            val workRequest: WorkRequest =
+                OneTimeWorkRequest.Builder(NewVersionWorker::class.java).build()
+            WorkManager.getInstance(context).enqueue(workRequest)
+        }
+    }
+}

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

@@ -3,7 +3,6 @@ package org.schabi.newpipe;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 
 /*
@@ -40,10 +39,6 @@ public class PanicResponderActivity extends Activity {
             ExitActivity.exitAndRemoveFromRecentApps(this);
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            finishAndRemoveTask();
-        } else {
-            finish();
-        }
+        finishAndRemoveTask();
     }
 }

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

@@ -14,8 +14,9 @@ import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.SparseItemUtil;
 
-import java.util.Collections;
+import java.util.List;
 
 public final class QueueItemMenuUtil {
     private QueueItemMenuUtil() {
@@ -52,7 +53,7 @@ public final class QueueItemMenuUtil {
                 case R.id.menu_item_append_playlist:
                     PlaylistDialog.createCorrespondingDialog(
                             context,
-                            Collections.singletonList(new StreamEntity(item)),
+                            List.of(new StreamEntity(item)),
                             dialog -> dialog.show(
                                     fragmentManager,
                                     "QueueItemMenuUtil@append_playlist"
@@ -61,11 +62,14 @@ public final class QueueItemMenuUtil {
 
                     return true;
                 case R.id.menu_item_channel_details:
-                    // An intent must be used here.
-                    // Opening with FragmentManager transactions is not working,
-                    // as PlayQueueActivity doesn't use fragments.
-                    NavigationHelper.openChannelFragmentUsingIntent(context, item.getServiceId(),
-                            item.getUploaderUrl(), item.getUploader());
+                    SparseItemUtil.fetchUploaderUrlIfSparse(context, item.getServiceId(),
+                            item.getUrl(), item.getUploaderUrl(),
+                            // An intent must be used here.
+                            // Opening with FragmentManager transactions is not working,
+                            // as PlayQueueActivity doesn't use fragments.
+                            uploaderUrl -> NavigationHelper.openChannelFragmentUsingIntent(
+                                    context, item.getServiceId(), uploaderUrl, item.getUploader()
+                            ));
                     return true;
                 case R.id.menu_item_share:
                     shareText(context, item.getTitle(), item.getUrl(),

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

@@ -24,12 +24,13 @@ import android.widget.Toast;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.ServiceCompat;
-import androidx.core.widget.TextViewCompat;
+import androidx.core.math.MathUtils;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
@@ -37,8 +38,8 @@ import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
 import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
 import org.schabi.newpipe.download.DownloadDialog;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.ReCaptchaActivity;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.Info;
@@ -58,10 +59,9 @@ import org.schabi.newpipe.extractor.exceptions.SoundCloudGoPlusContentException;
 import org.schabi.newpipe.extractor.exceptions.YoutubeMusicPremiumContentException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
-import org.schabi.newpipe.player.MainPlayer;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
@@ -71,7 +71,7 @@ import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -82,7 +82,6 @@ import org.schabi.newpipe.views.FocusOverlayView;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import icepick.Icepick;
@@ -127,8 +126,10 @@ public class RouterActivity extends AppCompatActivity {
             }
         }
 
+        ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
+        Localization.assureCorrectAppLanguage(this);
     }
 
     @Override
@@ -231,7 +232,7 @@ public class RouterActivity extends AppCompatActivity {
         } else if (errorInfo.getThrowable() instanceof ContentNotSupportedException) {
             Toast.makeText(context, R.string.content_not_supported, Toast.LENGTH_LONG).show();
         } else {
-            ErrorActivity.reportError(context, errorInfo);
+            ErrorUtil.createNotification(context, errorInfo);
         }
 
         if (context instanceof RouterActivity) {
@@ -257,80 +258,122 @@ public class RouterActivity extends AppCompatActivity {
     protected void onSuccess() {
         final SharedPreferences preferences = PreferenceManager
                 .getDefaultSharedPreferences(this);
-        final String selectedChoiceKey = preferences
-                .getString(getString(R.string.preferred_open_action_key),
-                        getString(R.string.preferred_open_action_default));
 
-        final String showInfoKey = getString(R.string.show_info_key);
-        final String videoPlayerKey = getString(R.string.video_player_key);
-        final String backgroundPlayerKey = getString(R.string.background_player_key);
-        final String popupPlayerKey = getString(R.string.popup_player_key);
-        final String downloadKey = getString(R.string.download_key);
-        final String alwaysAskKey = getString(R.string.always_ask_open_action_key);
+        final ChoiceAvailabilityChecker choiceChecker = new ChoiceAvailabilityChecker(
+                getChoicesForService(currentService, currentLinkType),
+                preferences.getString(getString(R.string.preferred_open_action_key),
+                        getString(R.string.preferred_open_action_default)));
 
-        if (selectedChoiceKey.equals(alwaysAskKey)) {
-            final List<AdapterChoiceItem> choices
-                    = getChoicesForService(currentService, currentLinkType);
+        // Check for non-player related choices
+        if (choiceChecker.isAvailableAndSelected(
+                R.string.show_info_key,
+                R.string.download_key,
+                R.string.add_to_playlist_key)) {
+            handleChoice(choiceChecker.getSelectedChoiceKey());
+            return;
+        }
+        // Check if the choice is player related
+        if (choiceChecker.isAvailableAndSelected(
+                R.string.video_player_key,
+                R.string.background_player_key,
+                R.string.popup_player_key)) {
+
+            final String selectedChoice = choiceChecker.getSelectedChoiceKey();
 
-            switch (choices.size()) {
-                case 1:
-                    handleChoice(choices.get(0).key);
-                    break;
-                case 0:
-                    handleChoice(showInfoKey);
-                    break;
-                default:
-                    showDialog(choices);
-                    break;
-            }
-        } else if (selectedChoiceKey.equals(showInfoKey)) {
-            handleChoice(showInfoKey);
-        } else if (selectedChoiceKey.equals(downloadKey)) {
-            handleChoice(downloadKey);
-        } else {
             final boolean isExtVideoEnabled = preferences.getBoolean(
                     getString(R.string.use_external_video_player_key), false);
             final boolean isExtAudioEnabled = preferences.getBoolean(
                     getString(R.string.use_external_audio_player_key), false);
-            final boolean isVideoPlayerSelected = selectedChoiceKey.equals(videoPlayerKey)
-                    || selectedChoiceKey.equals(popupPlayerKey);
-            final boolean isAudioPlayerSelected = selectedChoiceKey.equals(backgroundPlayerKey);
+            final boolean isVideoPlayerSelected =
+                    selectedChoice.equals(getString(R.string.video_player_key))
+                            || selectedChoice.equals(getString(R.string.popup_player_key));
+            final boolean isAudioPlayerSelected =
+                    selectedChoice.equals(getString(R.string.background_player_key));
 
-            if (currentLinkType != LinkType.STREAM) {
-                if (isExtAudioEnabled && isAudioPlayerSelected
-                        || isExtVideoEnabled && isVideoPlayerSelected) {
-                    Toast.makeText(this, R.string.external_player_unsupported_link_type,
-                            Toast.LENGTH_LONG).show();
-                    handleChoice(showInfoKey);
-                    return;
-                }
+            if (currentLinkType != LinkType.STREAM
+                    && ((isExtAudioEnabled && isAudioPlayerSelected)
+                    || (isExtVideoEnabled && isVideoPlayerSelected))
+            ) {
+                Toast.makeText(this, R.string.external_player_unsupported_link_type,
+                        Toast.LENGTH_LONG).show();
+                handleChoice(getString(R.string.show_info_key));
+                return;
             }
 
-            final List<StreamingService.ServiceInfo.MediaCapability> capabilities
-                    = currentService.getServiceInfo().getMediaCapabilities();
+            final List<StreamingService.ServiceInfo.MediaCapability> capabilities =
+                    currentService.getServiceInfo().getMediaCapabilities();
 
-            boolean serviceSupportsChoice = false;
-            if (isVideoPlayerSelected) {
-                serviceSupportsChoice = capabilities.contains(VIDEO);
-            } else if (selectedChoiceKey.equals(backgroundPlayerKey)) {
-                serviceSupportsChoice = capabilities.contains(AUDIO);
-            }
-
-            if (serviceSupportsChoice) {
-                handleChoice(selectedChoiceKey);
+            // Check if the service supports the choice
+            if ((isVideoPlayerSelected && capabilities.contains(VIDEO))
+                    || (isAudioPlayerSelected && capabilities.contains(AUDIO))) {
+                handleChoice(selectedChoice);
             } else {
-                handleChoice(showInfoKey);
+                handleChoice(getString(R.string.show_info_key));
             }
+            return;
+        }
+
+        // Default / Ask always
+        final List<AdapterChoiceItem> availableChoices = choiceChecker.getAvailableChoices();
+        switch (availableChoices.size()) {
+            case 1:
+                handleChoice(availableChoices.get(0).key);
+                break;
+            case 0:
+                handleChoice(getString(R.string.show_info_key));
+                break;
+            default:
+                showDialog(availableChoices);
+                break;
+        }
+    }
+
+    /**
+     * This is a helper class for checking if the choices are available and/or selected.
+     */
+    class ChoiceAvailabilityChecker {
+        private final List<AdapterChoiceItem> availableChoices;
+        private final String selectedChoiceKey;
+
+        ChoiceAvailabilityChecker(
+                @NonNull final List<AdapterChoiceItem> availableChoices,
+                @NonNull final String selectedChoiceKey) {
+            this.availableChoices = availableChoices;
+            this.selectedChoiceKey = selectedChoiceKey;
+        }
+
+        public List<AdapterChoiceItem> getAvailableChoices() {
+            return availableChoices;
+        }
+
+        public String getSelectedChoiceKey() {
+            return selectedChoiceKey;
+        }
+
+        public boolean isAvailableAndSelected(@StringRes final int... wantedKeys) {
+            return Arrays.stream(wantedKeys).anyMatch(this::isAvailableAndSelected);
+        }
+
+        public boolean isAvailableAndSelected(@StringRes final int wantedKey) {
+            final String wanted = getString(wantedKey);
+            // Check if the wanted option is selected
+            if (!selectedChoiceKey.equals(wanted)) {
+                return false;
+            }
+            // Check if it's available
+            return availableChoices.stream().anyMatch(item -> wanted.equals(item.key));
         }
     }
 
     private void showDialog(final List<AdapterChoiceItem> choices) {
         final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        final Context themeWrapperContext = getThemeWrapperContext();
 
-        final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
-        final RadioGroup radioGroup = SingleChoiceDialogViewBinding.inflate(getLayoutInflater())
-                .list;
+        final Context themeWrapperContext = getThemeWrapperContext();
+        final LayoutInflater layoutInflater = LayoutInflater.from(themeWrapperContext);
+
+        final SingleChoiceDialogViewBinding binding =
+                SingleChoiceDialogViewBinding.inflate(layoutInflater);
+        final RadioGroup radioGroup = binding.list;
 
         final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {
             final int indexOfChild = radioGroup.indexOfChild(
@@ -349,21 +392,19 @@ public class RouterActivity extends AppCompatActivity {
 
         alertDialogChoice = new AlertDialog.Builder(themeWrapperContext)
                 .setTitle(R.string.preferred_open_action_share_menu_title)
-                .setView(radioGroup)
+                .setView(binding.getRoot())
                 .setCancelable(true)
                 .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
                 .setPositiveButton(R.string.always, dialogButtonsClickListener)
-                .setOnDismissListener((dialog) -> {
+                .setOnDismissListener(dialog -> {
                     if (!selectionIsDownload && !selectionIsAddToPlaylist) {
                         finish();
                     }
                 })
                 .create();
 
-        //noinspection CodeBlock2Expr
-        alertDialogChoice.setOnShowListener(dialog -> {
-            setDialogButtonsState(alertDialogChoice, radioGroup.getCheckedRadioButtonId() != -1);
-        });
+        alertDialogChoice.setOnShowListener(dialog -> setDialogButtonsState(
+                alertDialogChoice, radioGroup.getCheckedRadioButtonId() != -1));
 
         radioGroup.setOnCheckedChangeListener((group, checkedId) ->
                 setDialogButtonsState(alertDialogChoice, true));
@@ -383,9 +424,10 @@ public class RouterActivity extends AppCompatActivity {
 
         int id = 12345;
         for (final AdapterChoiceItem item : choices) {
-            final RadioButton radioButton = ListRadioIconItemBinding.inflate(inflater).getRoot();
+            final RadioButton radioButton = ListRadioIconItemBinding.inflate(layoutInflater)
+                    .getRoot();
             radioButton.setText(item.description);
-            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
+            radioButton.setCompoundDrawablesRelativeWithIntrinsicBounds(
                     AppCompatResources.getDrawable(themeWrapperContext, item.icon),
                     null, null, null);
             radioButton.setChecked(false);
@@ -410,7 +452,7 @@ public class RouterActivity extends AppCompatActivity {
             }
         }
 
-        selectedRadioPosition = Math.min(Math.max(-1, selectedRadioPosition), choices.size() - 1);
+        selectedRadioPosition = MathUtils.clamp(selectedRadioPosition, -1, choices.size() - 1);
         if (selectedRadioPosition != -1) {
             ((RadioButton) radioGroup.getChildAt(selectedRadioPosition)).setChecked(true);
         }
@@ -425,87 +467,64 @@ public class RouterActivity extends AppCompatActivity {
 
     private List<AdapterChoiceItem> getChoicesForService(final StreamingService service,
                                                          final LinkType linkType) {
-        final Context context = getThemeWrapperContext();
-
-        final List<AdapterChoiceItem> returnList = new ArrayList<>();
-        final List<StreamingService.ServiceInfo.MediaCapability> capabilities
-                = service.getServiceInfo().getMediaCapabilities();
-
-        final SharedPreferences preferences = PreferenceManager
-                .getDefaultSharedPreferences(this);
-        final boolean isExtVideoEnabled = preferences.getBoolean(
-                getString(R.string.use_external_video_player_key), false);
-        final boolean isExtAudioEnabled = preferences.getBoolean(
-                getString(R.string.use_external_audio_player_key), false);
-
-        final AdapterChoiceItem videoPlayer = new AdapterChoiceItem(
-                getString(R.string.video_player_key), getString(R.string.video_player),
-                R.drawable.ic_play_arrow);
         final AdapterChoiceItem showInfo = new AdapterChoiceItem(
                 getString(R.string.show_info_key), getString(R.string.show_info),
                 R.drawable.ic_info_outline);
-        final AdapterChoiceItem popupPlayer = new AdapterChoiceItem(
-                getString(R.string.popup_player_key), getString(R.string.popup_player),
-                R.drawable.ic_picture_in_picture);
+        final AdapterChoiceItem videoPlayer = new AdapterChoiceItem(
+                getString(R.string.video_player_key), getString(R.string.video_player),
+                R.drawable.ic_play_arrow);
         final AdapterChoiceItem backgroundPlayer = new AdapterChoiceItem(
                 getString(R.string.background_player_key), getString(R.string.background_player),
                 R.drawable.ic_headset);
-        final AdapterChoiceItem addToPlaylist = new AdapterChoiceItem(
-                getString(R.string.add_to_playlist_key), getString(R.string.add_to_playlist),
-                R.drawable.ic_add);
+        final AdapterChoiceItem popupPlayer = new AdapterChoiceItem(
+                getString(R.string.popup_player_key), getString(R.string.popup_player),
+                R.drawable.ic_picture_in_picture);
 
+        final List<AdapterChoiceItem> returnedItems = new ArrayList<>();
+        returnedItems.add(showInfo); // Always present
+
+        final List<StreamingService.ServiceInfo.MediaCapability> capabilities =
+                service.getServiceInfo().getMediaCapabilities();
 
         if (linkType == LinkType.STREAM) {
-            if (isExtVideoEnabled) {
-                // show both "show info" and "video player", they are two different activities
-                returnList.add(showInfo);
-                returnList.add(videoPlayer);
-            } else {
-                final MainPlayer.PlayerType playerType = PlayerHolder.getInstance().getType();
-                if (capabilities.contains(VIDEO)
-                        && PlayerHelper.isAutoplayAllowedByUser(context)
-                        && playerType == null || playerType == MainPlayer.PlayerType.VIDEO) {
-                    // show only "video player" since the details activity will be opened and the
-                    // video will be auto played there. Since "show info" would do the exact same
-                    // thing, use that as a key to let VideoDetailFragment load the stream instead
-                    // of using FetcherService (see comment in handleChoice())
-                    returnList.add(new AdapterChoiceItem(
-                            showInfo.key, videoPlayer.description, videoPlayer.icon));
-                } else {
-                    // show only "show info" if video player is not applicable, auto play is
-                    // disabled or a video is playing in a player different than the main one
-                    returnList.add(showInfo);
-                }
-            }
-
             if (capabilities.contains(VIDEO)) {
-                returnList.add(popupPlayer);
+                returnedItems.add(videoPlayer);
+                returnedItems.add(popupPlayer);
             }
             if (capabilities.contains(AUDIO)) {
-                returnList.add(backgroundPlayer);
+                returnedItems.add(backgroundPlayer);
             }
             // download is redundant for linkType CHANNEL AND PLAYLIST (till playlist downloading is
             // not supported )
-            returnList.add(new AdapterChoiceItem(getString(R.string.download_key),
+            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
-            returnList.add(addToPlaylist);
-
+            returnedItems.add(new AdapterChoiceItem(getString(R.string.add_to_playlist_key),
+                    getString(R.string.add_to_playlist),
+                    R.drawable.ic_add));
         } else {
-            returnList.add(showInfo);
+            // LinkType.NONE is never present because it's filtered out before
+            // channels and playlist can be played as they contain a list of videos
+            final SharedPreferences preferences = PreferenceManager
+                    .getDefaultSharedPreferences(this);
+            final boolean isExtVideoEnabled = preferences.getBoolean(
+                    getString(R.string.use_external_video_player_key), false);
+            final boolean isExtAudioEnabled = preferences.getBoolean(
+                    getString(R.string.use_external_audio_player_key), false);
+
             if (capabilities.contains(VIDEO) && !isExtVideoEnabled) {
-                returnList.add(videoPlayer);
-                returnList.add(popupPlayer);
+                returnedItems.add(videoPlayer);
+                returnedItems.add(popupPlayer);
             }
             if (capabilities.contains(AUDIO) && !isExtAudioEnabled) {
-                returnList.add(backgroundPlayer);
+                returnedItems.add(backgroundPlayer);
             }
         }
 
-        return returnList;
+        return returnedItems;
     }
 
     private Context getThemeWrapperContext() {
@@ -567,7 +586,8 @@ public class RouterActivity extends AppCompatActivity {
 
         // stop and bypass FetcherService if InfoScreen was selected since
         // StreamDetailFragment can fetch data itself
-        if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
+        if (selectedChoiceKey.equals(getString(R.string.show_info_key))
+                || canHandleChoiceLikeShowInfo(selectedChoiceKey)) {
             disposables.add(Observable
                     .fromCallable(() -> NavigationHelper.getIntentByLink(this, currentUrl))
                     .subscribeOn(Schedulers.io())
@@ -590,6 +610,30 @@ public class RouterActivity extends AppCompatActivity {
         finish();
     }
 
+    private boolean canHandleChoiceLikeShowInfo(final String selectedChoiceKey) {
+        if (!selectedChoiceKey.equals(getString(R.string.video_player_key))) {
+            return false;
+        }
+        // "video player" can be handled like "show info" (because VideoDetailFragment can load
+        // the stream instead of FetcherService) when...
+
+        // ...Autoplay is enabled
+        if (!PlayerHelper.isAutoplayAllowedByUser(getThemeWrapperContext())) {
+            return false;
+        }
+
+        final boolean isExtVideoEnabled = PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(getString(R.string.use_external_video_player_key), false);
+        // ...it's not done via an external player
+        if (isExtVideoEnabled) {
+            return false;
+        }
+
+        // ...the player is not running or in normal Video-mode/type
+        final PlayerType playerType = PlayerHolder.getInstance().getType();
+        return playerType == null || playerType == PlayerType.MAIN;
+    }
+
     private void openAddToPlaylistDialog() {
         // Getting the stream info usually takes a moment
         // Notifying the user here to ensure that no confusion arises
@@ -605,7 +649,7 @@ public class RouterActivity extends AppCompatActivity {
                 .subscribe(
                         info -> PlaylistDialog.createCorrespondingDialog(
                                 getThemeWrapperContext(),
-                                Collections.singletonList(new StreamEntity(info)),
+                                List.of(new StreamEntity(info)),
                                 playlistDialog -> {
                                     playlistDialog.setOnDismissListener(dialog -> finish());
 
@@ -631,22 +675,13 @@ public class RouterActivity extends AppCompatActivity {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
-                    final List<VideoStream> sortedVideoStreams = ListHelper
-                            .getSortedStreamVideosList(this, result.getVideoStreams(),
-                                    result.getVideoOnlyStreams(), false);
-                    final int selectedVideoStreamIndex = ListHelper
-                            .getDefaultResolutionIndex(this, sortedVideoStreams);
+                    final DownloadDialog downloadDialog = new DownloadDialog(this, result);
+                    downloadDialog.setOnDismissListener(dialog -> finish());
 
                     final FragmentManager fm = getSupportFragmentManager();
-                    final DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
-                    downloadDialog.setVideoStreams(sortedVideoStreams);
-                    downloadDialog.setAudioStreams(result.getAudioStreams());
-                    downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
-                    downloadDialog.setOnDismissListener(dialog -> finish());
                     downloadDialog.show(fm, "downloadDialog");
                     fm.executePendingTransactions();
-                }, throwable ->
-                        showUnsupportedUrlDialog(currentUrl)));
+                }, throwable -> showUnsupportedUrlDialog(currentUrl)));
     }
 
     @Override
@@ -672,8 +707,8 @@ public class RouterActivity extends AppCompatActivity {
         final int icon;
 
         AdapterChoiceItem(final String key, final String description, final int icon) {
-            this.description = description;
             this.key = key;
+            this.description = description;
             this.icon = icon;
         }
     }

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

@@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import org.schabi.newpipe.BuildConfig
 import org.schabi.newpipe.R
@@ -21,30 +20,28 @@ import org.schabi.newpipe.util.ThemeHelper
 import org.schabi.newpipe.util.external_communication.ShareUtils
 
 class AboutActivity : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Localization.assureCorrectAppLanguage(this)
         super.onCreate(savedInstanceState)
         ThemeHelper.setTheme(this)
         title = getString(R.string.title_activity_about)
+
         val aboutBinding = ActivityAboutBinding.inflate(layoutInflater)
         setContentView(aboutBinding.root)
         setSupportActionBar(aboutBinding.aboutToolbar)
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
         // Create the adapter that will return a fragment for each of the three
         // primary sections of the activity.
         val mAboutStateAdapter = AboutStateAdapter(this)
-
         // Set up the ViewPager with the sections adapter.
         aboutBinding.aboutViewPager2.adapter = mAboutStateAdapter
         TabLayoutMediator(
             aboutBinding.aboutTabLayout,
             aboutBinding.aboutViewPager2
-        ) { tab: TabLayout.Tab, position: Int ->
-            when (position) {
-                POS_ABOUT -> tab.setText(R.string.tab_about)
-                POS_LICENSE -> tab.setText(R.string.tab_licenses)
-                else -> throw IllegalArgumentException("Unknown position for ViewPager2")
-            }
+        ) { tab, position ->
+            tab.setText(mAboutStateAdapter.getPageTitle(position))
         }.attach()
     }
 
@@ -75,13 +72,15 @@ class AboutActivity : AppCompatActivity() {
             container: ViewGroup?,
             savedInstanceState: Bundle?
         ): View {
-            val aboutBinding = FragmentAboutBinding.inflate(inflater, container, false)
-            aboutBinding.aboutAppVersion.text = BuildConfig.VERSION_NAME
-            aboutBinding.aboutGithubLink.openLink(R.string.github_url)
-            aboutBinding.aboutDonationLink.openLink(R.string.donation_url)
-            aboutBinding.aboutWebsiteLink.openLink(R.string.website_url)
-            aboutBinding.aboutPrivacyPolicyLink.openLink(R.string.privacy_policy_url)
-            return aboutBinding.root
+            FragmentAboutBinding.inflate(inflater, container, false).apply {
+                aboutAppVersion.text = BuildConfig.VERSION_NAME
+                aboutGithubLink.openLink(R.string.github_url)
+                aboutDonationLink.openLink(R.string.donation_url)
+                aboutWebsiteLink.openLink(R.string.website_url)
+                aboutPrivacyPolicyLink.openLink(R.string.privacy_policy_url)
+                faqLink.openLink(R.string.faq_url)
+                return root
+            }
         }
     }
 
@@ -90,17 +89,29 @@ class AboutActivity : AppCompatActivity() {
      * one of the sections/tabs/pages.
      */
     private class AboutStateAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+        private val posAbout = 0
+        private val posLicense = 1
+        private val totalCount = 2
+
         override fun createFragment(position: Int): Fragment {
             return when (position) {
-                POS_ABOUT -> AboutFragment()
-                POS_LICENSE -> LicenseFragment.newInstance(SOFTWARE_COMPONENTS)
+                posAbout -> AboutFragment()
+                posLicense -> LicenseFragment.newInstance(SOFTWARE_COMPONENTS)
                 else -> throw IllegalArgumentException("Unknown position for ViewPager2")
             }
         }
 
         override fun getItemCount(): Int {
             // Show 2 total pages.
-            return TOTAL_COUNT
+            return totalCount
+        }
+
+        fun getPageTitle(position: Int): Int {
+            return when (position) {
+                posAbout -> R.string.tab_about
+                posLicense -> R.string.tab_licenses
+                else -> throw IllegalArgumentException("Unknown position for ViewPager2")
+            }
         }
     }
 
@@ -117,10 +128,6 @@ class AboutActivity : AppCompatActivity() {
                 "AndroidX", "2005 - 2011", "The Android Open Source Project",
                 "https://developer.android.com/jetpack", StandardLicenses.APACHE2
             ),
-            SoftwareComponent(
-                "CircleImageView", "2014 - 2020", "Henning Dodenhof",
-                "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2
-            ),
             SoftwareComponent(
                 "ExoPlayer", "2014 - 2020", "Google, Inc.",
                 "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2
@@ -185,10 +192,11 @@ class AboutActivity : AppCompatActivity() {
             SoftwareComponent(
                 "RxJava", "2016 - 2020", "RxJava Contributors",
                 "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2
-            )
+            ),
+            SoftwareComponent(
+                "SearchPreference", "2018", "ByteHamster",
+                "https://github.com/ByteHamster/SearchPreference", StandardLicenses.MIT
+            ),
         )
-        private const val POS_ABOUT = 0
-        private const val POS_LICENSE = 1
-        private const val TOTAL_COUNT = 2
     }
 }

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

@@ -8,7 +8,6 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.schabi.newpipe.R
-import org.schabi.newpipe.about.LicenseFragmentHelper.showLicense
 import org.schabi.newpipe.databinding.FragmentLicensesBinding
 import org.schabi.newpipe.databinding.ItemSoftwareComponentBinding
 

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

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

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

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.database;
 
+import static org.schabi.newpipe.database.Migrations.DB_VER_5;
+
 import androidx.room.Database;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
@@ -27,8 +29,6 @@ import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.database.subscription.SubscriptionDAO;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 
-import static org.schabi.newpipe.database.Migrations.DB_VER_4;
-
 @TypeConverters({Converters.class})
 @Database(
         entities = {
@@ -38,7 +38,7 @@ import static org.schabi.newpipe.database.Migrations.DB_VER_4;
                 FeedEntity.class, FeedGroupEntity.class, FeedGroupSubscriptionEntity.class,
                 FeedLastUpdatedEntity.class
         },
-        version = DB_VER_4
+        version = DB_VER_5
 )
 public abstract class AppDatabase extends RoomDatabase {
     public static final String DATABASE_NAME = "newpipe.db";

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

@@ -3,7 +3,6 @@ package org.schabi.newpipe.database;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Update;
 
 import java.util.Collection;
@@ -14,13 +13,10 @@ import io.reactivex.rxjava3.core.Flowable;
 @Dao
 public interface BasicDAO<Entity> {
     /* Inserts */
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert
     long insert(Entity entity);
 
-    @Insert(onConflict = OnConflictStrategy.ABORT)
-    List<Long> insertAll(Entity... entities);
-
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert
     List<Long> insertAll(Collection<Entity> entities);
 
     /* Searches */
@@ -32,9 +28,6 @@ public interface BasicDAO<Entity> {
     @Delete
     void delete(Entity entity);
 
-    @Delete
-    int delete(Collection<Entity> entities);
-
     int deleteAll();
 
     /* Updates */

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

@@ -22,6 +22,7 @@ public final class Migrations {
     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;
 
     private static final String TAG = Migrations.class.getName();
     public static final boolean DEBUG = MainActivity.DEBUG;
@@ -179,5 +180,14 @@ public final class Migrations {
         }
     };
 
-    private Migrations() { }
+    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");
+        }
+    };
+
+    private Migrations() {
+    }
 }

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

@@ -9,9 +9,11 @@ import androidx.room.Update
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
 import org.schabi.newpipe.database.feed.model.FeedEntity
+import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 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
 
@@ -20,56 +22,16 @@ abstract class FeedDAO {
     @Query("DELETE FROM feed")
     abstract fun deleteAll(): Int
 
-    @Query(
-        """
-        SELECT s.*, sst.progress_time
-        FROM streams s
-
-        LEFT JOIN stream_state sst
-        ON s.uid = sst.stream_id
-
-        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id
-
-        INNER JOIN feed f
-        ON s.uid = f.stream_id
-
-        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
-        LIMIT 500
-        """
-    )
-    abstract fun getAllStreams(): Maybe<List<StreamWithState>>
-
-    @Query(
-        """
-        SELECT s.*, sst.progress_time
-        FROM streams s
-
-        LEFT JOIN stream_state sst
-        ON s.uid = sst.stream_id
-
-        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id
-
-        INNER JOIN feed f
-        ON s.uid = f.stream_id
-
-        INNER JOIN feed_group_subscription_join fgs
-        ON fgs.subscription_id = f.subscription_id
-
-        WHERE fgs.group_id = :groupId
-
-        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
-        LIMIT 500
-        """
-    )
-    abstract fun getAllStreamsForGroup(groupId: Long): Maybe<List<StreamWithState>>
-
     /**
+     * @param groupId          the group id to get feed streams of; use
+     *                         [FeedGroupEntity.GROUP_ALL_ID] to not filter by group
+     * @param includePlayed    if false, only return all of the live, never-played or non-finished
+     *                         feed streams (see `@see` items); if true no filter is applied
+     * @param uploadDateBefore get only streams uploaded before this date (useful to filter out
+     *                         future streams); use null to not filter by upload date
+     * @return the feed streams filtered according to the conditions provided in the parameters
      * @see StreamStateEntity.isFinished()
      * @see StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS
-     * @return all of the non-live, never-played and non-finished streams in the feed
-     *         (all of the cited conditions must hold for a stream to be in the returned list)
      */
     @Query(
         """
@@ -78,67 +40,47 @@ abstract class FeedDAO {
 
         LEFT JOIN stream_state sst
         ON s.uid = sst.stream_id
-
+        
         LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id    
-            
+        ON s.uid = sh.stream_id
+        
         INNER JOIN feed f
         ON s.uid = f.stream_id
 
+        LEFT JOIN feed_group_subscription_join fgs
+        ON (
+            :groupId <> ${FeedGroupEntity.GROUP_ALL_ID}
+            AND fgs.subscription_id = f.subscription_id
+        )
+
         WHERE (
-            sh.stream_id IS NULL
-            OR sst.stream_id IS NULL
-            OR sst.progress_time < s.duration * 1000 - ${StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS}
-            OR sst.progress_time < s.duration * 1000 * 3 / 4
-            OR s.stream_type = 'LIVE_STREAM'
-            OR s.stream_type = 'AUDIO_LIVE_STREAM'
+            :groupId = ${FeedGroupEntity.GROUP_ALL_ID}
+            OR fgs.group_id = :groupId
         )
-
-        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
-        LIMIT 500
-        """
-    )
-    abstract fun getLiveOrNotPlayedStreams(): Maybe<List<StreamWithState>>
-
-    /**
-     * @see StreamStateEntity.isFinished()
-     * @see StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS
-     * @param groupId the group id to get streams of
-     * @return all of the non-live, never-played and non-finished streams for the given feed group
-     *         (all of the cited conditions must hold for a stream to be in the returned list)
-     */
-    @Query(
-        """
-        SELECT s.*, sst.progress_time
-        FROM streams s
-
-        LEFT JOIN stream_state sst
-        ON s.uid = sst.stream_id
-        
-        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id
-        
-        INNER JOIN feed f
-        ON s.uid = f.stream_id
-
-        INNER JOIN feed_group_subscription_join fgs
-        ON fgs.subscription_id = f.subscription_id
-
-        WHERE fgs.group_id = :groupId
         AND (
-            sh.stream_id IS NULL
+            :includePlayed
+            OR sh.stream_id IS NULL
             OR sst.stream_id IS NULL
             OR sst.progress_time < s.duration * 1000 - ${StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS}
             OR sst.progress_time < s.duration * 1000 * 3 / 4
             OR s.stream_type = 'LIVE_STREAM'
             OR s.stream_type = 'AUDIO_LIVE_STREAM'
         )
+        AND (
+            :uploadDateBefore IS NULL
+            OR s.upload_date IS NULL
+            OR s.upload_date < :uploadDateBefore
+        )
 
         ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
         LIMIT 500
         """
     )
-    abstract fun getLiveOrNotPlayedStreamsForGroup(groupId: Long): Maybe<List<StreamWithState>>
+    abstract fun getStreams(
+        groupId: Long,
+        includePlayed: Boolean,
+        uploadDateBefore: OffsetDateTime?
+    ): Maybe<List<StreamWithState>>
 
     @Query(
         """
@@ -252,4 +194,21 @@ abstract class FeedDAO {
         """
     )
     abstract fun getAllOutdatedForGroup(groupId: Long, outdatedThreshold: OffsetDateTime): Flowable<List<SubscriptionEntity>>
+
+    @Query(
+        """
+        SELECT s.* FROM subscriptions s
+
+        LEFT JOIN feed_last_updated lu
+        ON s.uid = lu.subscription_id
+
+        WHERE 
+            (lu.last_updated IS NULL OR lu.last_updated < :outdatedThreshold)
+            AND s.notification_mode = :notificationMode
+        """
+    )
+    abstract fun getOutdatedWithNotificationMode(
+        outdatedThreshold: OffsetDateTime,
+        @NotificationMode notificationMode: Int
+    ): Flowable<List<SubscriptionEntity>>
 }

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

@@ -19,6 +19,7 @@ import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.TABLE
 @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 + ")")
@@ -36,16 +37,16 @@ public interface SearchHistoryDAO extends HistoryDAO<SearchHistoryEntry> {
     @Override
     Flowable<List<SearchHistoryEntry>> getAll();
 
-    @Query("SELECT * FROM " + TABLE_NAME + " GROUP BY " + SEARCH + ORDER_BY_CREATION_DATE
-            + " LIMIT :limit")
-    Flowable<List<SearchHistoryEntry>> getUniqueEntries(int limit);
+    @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 * FROM " + TABLE_NAME + " WHERE " + SEARCH + " LIKE :query || '%'"
-            + " GROUP BY " + SEARCH + " LIMIT :limit")
-    Flowable<List<SearchHistoryEntry>> getSimilarEntries(String query, int limit);
+    @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/StreamHistoryDAO.java

@@ -3,6 +3,7 @@ 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;
@@ -67,6 +68,7 @@ public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity
     @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

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

@@ -1,79 +0,0 @@
-package org.schabi.newpipe.database.history.model;
-
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
-
-import java.time.OffsetDateTime;
-
-import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SEARCH;
-
-@Entity(tableName = SearchHistoryEntry.TABLE_NAME,
-        indices = {@Index(value = SEARCH)})
-public class SearchHistoryEntry {
-    public static final String ID = "id";
-    public static final String TABLE_NAME = "search_history";
-    public static final String SERVICE_ID = "service_id";
-    public static final String CREATION_DATE = "creation_date";
-    public static final String SEARCH = "search";
-
-    @ColumnInfo(name = ID)
-    @PrimaryKey(autoGenerate = true)
-    private long id;
-
-    @ColumnInfo(name = CREATION_DATE)
-    private OffsetDateTime creationDate;
-
-    @ColumnInfo(name = SERVICE_ID)
-    private int serviceId;
-
-    @ColumnInfo(name = SEARCH)
-    private String search;
-
-    public SearchHistoryEntry(final OffsetDateTime creationDate, final int serviceId,
-                              final String search) {
-        this.serviceId = serviceId;
-        this.creationDate = creationDate;
-        this.search = search;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(final long id) {
-        this.id = id;
-    }
-
-    public OffsetDateTime getCreationDate() {
-        return creationDate;
-    }
-
-    public void setCreationDate(final OffsetDateTime creationDate) {
-        this.creationDate = creationDate;
-    }
-
-    public int getServiceId() {
-        return serviceId;
-    }
-
-    public void setServiceId(final int serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public String getSearch() {
-        return search;
-    }
-
-    public void setSearch(final String search) {
-        this.search = search;
-    }
-
-    @Ignore
-    public boolean hasEqualValues(final SearchHistoryEntry otherEntry) {
-        return getServiceId() == otherEntry.getServiceId()
-                && getSearch().equals(otherEntry.getSearch());
-    }
-}

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

@@ -0,0 +1,40 @@
+package org.schabi.newpipe.database.history.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import java.time.OffsetDateTime
+
+@Entity(
+    tableName = SearchHistoryEntry.TABLE_NAME,
+    indices = [Index(value = [SearchHistoryEntry.SEARCH])]
+)
+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)
+    var id: Long = 0
+
+    @Ignore
+    fun hasEqualValues(otherEntry: SearchHistoryEntry): Boolean {
+        return (
+            serviceId == otherEntry.serviceId &&
+                search == otherEntry.search
+            )
+    }
+
+    companion object {
+        const val ID = "id"
+        const val TABLE_NAME = "search_history"
+        const val SERVICE_ID = "service_id"
+        const val CREATION_DATE = "creation_date"
+        const val SEARCH = "search"
+    }
+}

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

@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
-import androidx.room.Ignore;
 import androidx.room.Index;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
@@ -42,18 +41,19 @@ public class StreamHistoryEntity {
     @ColumnInfo(name = STREAM_REPEAT_COUNT)
     private long repeatCount;
 
-    public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate,
+    /**
+     * @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;
     }
 
-    @Ignore
-    public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate) {
-        this(streamUid, accessDate, 1);
-    }
-
     public long getStreamUid() {
         return streamUid;
     }

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

@@ -3,10 +3,10 @@ package org.schabi.newpipe.database.playlist;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public interface PlaylistLocalItem extends LocalItem {
     String getOrderingName();
@@ -14,14 +14,9 @@ public interface PlaylistLocalItem extends LocalItem {
     static List<PlaylistLocalItem> merge(
             final List<PlaylistMetadataEntry> localPlaylists,
             final List<PlaylistRemoteEntity> remotePlaylists) {
-        final List<PlaylistLocalItem> items = new ArrayList<>(
-                localPlaylists.size() + remotePlaylists.size());
-        items.addAll(localPlaylists);
-        items.addAll(remotePlaylists);
-
-        Collections.sort(items, Comparator.comparing(PlaylistLocalItem::getOrderingName,
-                Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
-
-        return items;
+        return Stream.concat(localPlaylists.stream(), remotePlaylists.stream())
+                .sorted(Comparator.comparing(PlaylistLocalItem::getOrderingName,
+                        Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)))
+                .collect(Collectors.toList());
     }
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -52,6 +53,7 @@ public interface PlaylistStreamDAO extends BasicDAO<PlaylistStreamEntity> {
             + " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId")
     Flowable<Integer> getMaximumIndexOf(long playlistId);
 
+    @RewriteQueriesToDropUnusedColumns
     @Transaction
     @Query("SELECT * FROM " + STREAM_TABLE + " INNER JOIN "
             // get ids of streams of the given playlist

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

@@ -12,8 +12,7 @@ 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.extractor.stream.StreamType.AUDIO_LIVE_STREAM
-import org.schabi.newpipe.extractor.stream.StreamType.LIVE_STREAM
+import org.schabi.newpipe.util.StreamTypeUtil
 import java.time.OffsetDateTime
 
 @Dao
@@ -39,6 +38,9 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     internal abstract fun silentInsertAllInternal(streams: List<StreamEntity>): List<Long>
 
+    @Query("SELECT COUNT(*) != 0 FROM streams WHERE url = :url AND service_id = :serviceId")
+    internal abstract fun exists(serviceId: Int, url: String): Boolean
+
     @Query(
         """
         SELECT uid, stream_type, textual_upload_date, upload_date, is_upload_date_approximation, duration 
@@ -88,8 +90,7 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
             ?: throw IllegalStateException("Stream cannot be null just after insertion.")
         newerStream.uid = existentMinimalStream.uid
 
-        val isNewerStreamLive = newerStream.streamType == AUDIO_LIVE_STREAM || newerStream.streamType == LIVE_STREAM
-        if (!isNewerStreamLive) {
+        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.

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/SubscriptionDAO.kt

@@ -4,6 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.RewriteQueriesToDropUnusedColumns
 import androidx.room.Transaction
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
@@ -31,6 +32,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
     )
     abstract fun getSubscriptionsFiltered(filter: String): Flowable<List<SubscriptionEntity>>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query(
         """
         SELECT * FROM subscriptions s
@@ -47,6 +49,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
         currentGroupId: Long
     ): Flowable<List<SubscriptionEntity>>
 
+    @RewriteQueriesToDropUnusedColumns
     @Query(
         """
         SELECT * FROM subscriptions s

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

@@ -26,6 +26,7 @@ public class SubscriptionEntity {
     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;
@@ -48,6 +49,9 @@ public class SubscriptionEntity {
     @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();
@@ -114,6 +118,15 @@ public class SubscriptionEntity {
         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);

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

@@ -1,5 +1,9 @@
 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;
 import android.content.Context;
@@ -41,8 +45,8 @@ import com.nononsenseapps.filepicker.Utils;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.DownloadDialogBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -53,6 +57,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
 import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
 import org.schabi.newpipe.streams.io.StoredFileHelper;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
@@ -60,15 +65,16 @@ import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.SecondaryStreamHelper;
+import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import icepick.Icepick;
 import icepick.State;
@@ -80,8 +86,6 @@ import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
 import us.shandian.giga.service.MissionState;
 
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 public class DownloadDialog extends DialogFragment
         implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
@@ -90,17 +94,17 @@ public class DownloadDialog extends DialogFragment
     @State
     StreamInfo currentInfo;
     @State
-    StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
+    StreamSizeWrapper<AudioStream> wrappedAudioStreams;
     @State
-    StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
+    StreamSizeWrapper<VideoStream> wrappedVideoStreams;
     @State
-    StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams = StreamSizeWrapper.empty();
+    StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams;
     @State
-    int selectedVideoIndex = 0;
+    int selectedVideoIndex; // set in the constructor
     @State
-    int selectedAudioIndex = 0;
+    int selectedAudioIndex = 0; // default to the first item
     @State
-    int selectedSubtitleIndex = 0;
+    int selectedSubtitleIndex = 0; // default to the first item
 
     @Nullable
     private OnDismissListener onDismissListener = null;
@@ -141,77 +145,49 @@ public class DownloadDialog extends DialogFragment
     // Instance creation
     //////////////////////////////////////////////////////////////////////////*/
 
-    public static DownloadDialog newInstance(final StreamInfo info) {
-        final DownloadDialog dialog = new DownloadDialog();
-        dialog.setInfo(info);
-        return dialog;
+    public DownloadDialog() {
+        // Just an empty default no-arg ctor to keep Fragment.instantiate() happy
+        // otherwise InstantiationException will be thrown when fragment is recreated
+        // TODO: Maybe use a custom FragmentFactory instead?
     }
 
-    public static DownloadDialog newInstance(final Context context, final StreamInfo info) {
-        final ArrayList<VideoStream> streamsList = new ArrayList<>(ListHelper
-                .getSortedStreamVideosList(context, info.getVideoStreams(),
-                        info.getVideoOnlyStreams(), false));
-        final int selectedStreamIndex = ListHelper.getDefaultResolutionIndex(context, streamsList);
-
-        final DownloadDialog instance = newInstance(info);
-        instance.setVideoStreams(streamsList);
-        instance.setSelectedVideoStream(selectedStreamIndex);
-        instance.setAudioStreams(info.getAudioStreams());
-        instance.setSubtitleStreams(info.getSubtitles());
-
-        return instance;
-    }
-
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Setters
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void setInfo(final StreamInfo info) {
+    /**
+     * Create a new download dialog with the video, audio and subtitle streams from the provided
+     * stream info. Video streams and video-only streams will be put into a single list menu,
+     * sorted according to their resolution and the default video resolution will be selected.
+     *
+     * @param context the context to use just to obtain preferences and strings (will not be stored)
+     * @param info    the info from which to obtain downloadable streams and other info (e.g. title)
+     */
+    public DownloadDialog(@NonNull final Context context, @NonNull final StreamInfo info) {
         this.currentInfo = info;
+
+        // TODO: Adapt this code when the downloader support other types of stream deliveries
+        final List<VideoStream> videoStreams = ListHelper.getSortedStreamVideosList(
+                context,
+                getStreamsOfSpecifiedDelivery(info.getVideoStreams(), PROGRESSIVE_HTTP),
+                getStreamsOfSpecifiedDelivery(info.getVideoOnlyStreams(), PROGRESSIVE_HTTP),
+                false,
+                false
+        );
+
+        this.wrappedVideoStreams = new StreamSizeWrapper<>(videoStreams, context);
+        this.wrappedAudioStreams = new StreamSizeWrapper<>(
+                getStreamsOfSpecifiedDelivery(info.getAudioStreams(), PROGRESSIVE_HTTP), context);
+        this.wrappedSubtitleStreams = new StreamSizeWrapper<>(
+                getStreamsOfSpecifiedDelivery(info.getSubtitles(), PROGRESSIVE_HTTP), context);
+
+        this.selectedVideoIndex = ListHelper.getDefaultResolutionIndex(context, videoStreams);
     }
 
-    public void setAudioStreams(final List<AudioStream> audioStreams) {
-        setAudioStreams(new StreamSizeWrapper<>(audioStreams, getContext()));
-    }
-
-    public void setAudioStreams(final StreamSizeWrapper<AudioStream> was) {
-        this.wrappedAudioStreams = was;
-    }
-
-    public void setVideoStreams(final List<VideoStream> videoStreams) {
-        setVideoStreams(new StreamSizeWrapper<>(videoStreams, getContext()));
-    }
-
-    public void setVideoStreams(final StreamSizeWrapper<VideoStream> wvs) {
-        this.wrappedVideoStreams = wvs;
-    }
-
-    public void setSubtitleStreams(final List<SubtitlesStream> subtitleStreams) {
-        setSubtitleStreams(new StreamSizeWrapper<>(subtitleStreams, getContext()));
-    }
-
-    public void setSubtitleStreams(
-            final StreamSizeWrapper<SubtitlesStream> wss) {
-        this.wrappedSubtitleStreams = wss;
-    }
-
-    public void setSelectedVideoStream(final int svi) {
-        this.selectedVideoIndex = svi;
-    }
-
-    public void setSelectedAudioStream(final int sai) {
-        this.selectedAudioIndex = sai;
-    }
-
-    public void setSelectedSubtitleStream(final int ssi) {
-        this.selectedSubtitleIndex = ssi;
-    }
-
+    /**
+     * @param onDismissListener the listener to call in {@link #onDismiss(DialogInterface)}
+     */
     public void setOnDismissListener(@Nullable final OnDismissListener onDismissListener) {
         this.onDismissListener = onDismissListener;
     }
 
+
     /*//////////////////////////////////////////////////////////////////////////
     // Android lifecycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -235,8 +211,8 @@ public class DownloadDialog extends DialogFragment
         setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
         Icepick.restoreInstanceState(this, savedInstanceState);
 
-        final SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams
-                = new SparseArray<>(4);
+        final SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams =
+                new SparseArray<>(4);
         final List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
 
         for (int i = 0; i < videoStreams.size(); i++) {
@@ -247,11 +223,16 @@ public class DownloadDialog extends DialogFragment
                     .getAudioStreamFor(wrappedAudioStreams.getStreamsList(), videoStreams.get(i));
 
             if (audioStream != null) {
-                secondaryStreams
-                        .append(i, new SecondaryStreamHelper<>(wrappedAudioStreams, audioStream));
+                secondaryStreams.append(i, new SecondaryStreamHelper<>(wrappedAudioStreams,
+                        audioStream));
             } else if (DEBUG) {
-                Log.w(TAG, "No audio stream candidates for video format "
-                        + videoStreams.get(i).getFormat().name());
+                final MediaFormat mediaFormat = videoStreams.get(i).getFormat();
+                if (mediaFormat != null) {
+                    Log.w(TAG, "No audio stream candidates for video format "
+                            + mediaFormat.name());
+                } else {
+                    Log.w(TAG, "No audio stream candidates for unknown video format");
+                }
             }
         }
 
@@ -286,7 +267,8 @@ public class DownloadDialog extends DialogFragment
     }
 
     @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             final ViewGroup container,
                              final Bundle savedInstanceState) {
         if (DEBUG) {
             Log.d(TAG, "onCreateView() called with: "
@@ -297,14 +279,15 @@ public class DownloadDialog extends DialogFragment
     }
 
     @Override
-    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull final View view,
+                              @Nullable final Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         dialogBinding = DownloadDialogBinding.bind(view);
 
         dialogBinding.fileName.setText(FilenameUtils.createFilename(getContext(),
                 currentInfo.getName()));
         selectedAudioIndex = ListHelper
-                .getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());
+                .getDefaultAudioFormat(getContext(), wrappedAudioStreams.getStreamsList());
 
         selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
 
@@ -320,21 +303,16 @@ public class DownloadDialog extends DialogFragment
         final int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
         dialogBinding.threadsCount.setText(String.valueOf(threads));
         dialogBinding.threads.setProgress(threads - 1);
-        dialogBinding.threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        dialogBinding.threads.setOnSeekBarChangeListener(new SimpleOnSeekBarChangeListener() {
             @Override
-            public void onProgressChanged(final SeekBar seekbar, final int progress,
+            public void onProgressChanged(@NonNull final SeekBar seekbar,
+                                          final int progress,
                                           final boolean fromUser) {
                 final int newProgress = progress + 1;
                 prefs.edit().putInt(getString(R.string.default_download_threads), newProgress)
                         .apply();
                 dialogBinding.threadsCount.setText(String.valueOf(newProgress));
             }
-
-            @Override
-            public void onStartTrackingTouch(final SeekBar p1) { }
-
-            @Override
-            public void onStopTrackingTouch(final SeekBar p1) { }
         });
 
         fetchStreamsSize();
@@ -402,7 +380,7 @@ public class DownloadDialog extends DialogFragment
                             == R.id.video_button) {
                         setupVideoSpinner();
                     }
-                }, throwable -> ErrorActivity.reportErrorInSnackbar(context,
+                }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading video stream size",
                                 currentInfo.getServiceId()))));
@@ -412,7 +390,7 @@ public class DownloadDialog extends DialogFragment
                             == R.id.audio_button) {
                         setupAudioSpinner();
                     }
-                }, throwable -> ErrorActivity.reportErrorInSnackbar(context,
+                }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading audio stream size",
                                 currentInfo.getServiceId()))));
@@ -422,7 +400,7 @@ public class DownloadDialog extends DialogFragment
                             == R.id.subtitle_button) {
                         setupSubtitleSpinner();
                     }
-                }, throwable -> ErrorActivity.reportErrorInSnackbar(context,
+                }, throwable -> ErrorUtil.showSnackbar(context,
                         new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
                                 "Downloading subtitle stream size",
                                 currentInfo.getServiceId()))));
@@ -473,7 +451,7 @@ public class DownloadDialog extends DialogFragment
                 result, getString(R.string.download_path_video_key), DownloadManager.TAG_VIDEO);
     }
 
-    private void requestDownloadSaveAsResult(final ActivityResult result) {
+    private void requestDownloadSaveAsResult(@NonNull final ActivityResult result) {
         if (result.getResultCode() != Activity.RESULT_OK) {
             return;
         }
@@ -490,8 +468,8 @@ public class DownloadDialog extends DialogFragment
             return;
         }
 
-        final DocumentFile docFile
-                = DocumentFile.fromSingleUri(context, result.getData().getData());
+        final DocumentFile docFile = DocumentFile.fromSingleUri(context,
+                result.getData().getData());
         if (docFile == null) {
             showFailedDialog(R.string.general_error);
             return;
@@ -502,7 +480,7 @@ public class DownloadDialog extends DialogFragment
                 docFile.getType());
     }
 
-    private void requestDownloadPickFolderResult(final ActivityResult result,
+    private void requestDownloadPickFolderResult(@NonNull final ActivityResult result,
                                                  final String key,
                                                  final String tag) {
         if (result.getResultCode() != Activity.RESULT_OK) {
@@ -522,12 +500,11 @@ public class DownloadDialog extends DialogFragment
                     StoredDirectoryHelper.PERMISSION_FLAGS);
         }
 
-        PreferenceManager.getDefaultSharedPreferences(context).edit()
-                .putString(key, uri.toString()).apply();
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(key,
+                uri.toString()).apply();
 
         try {
-            final StoredDirectoryHelper mainStorage
-                    = new StoredDirectoryHelper(context, uri, tag);
+            final StoredDirectoryHelper mainStorage = new StoredDirectoryHelper(context, uri, tag);
             checkSelectedDownload(mainStorage, mainStorage.findFile(filenameTmp),
                     filenameTmp, mimeTmp);
         } catch (final IOException e) {
@@ -565,8 +542,10 @@ public class DownloadDialog extends DialogFragment
     }
 
     @Override
-    public void onItemSelected(final AdapterView<?> parent, final View view,
-                               final int position, final long id) {
+    public void onItemSelected(final AdapterView<?> parent,
+                               final View view,
+                               final int position,
+                               final long id) {
         if (DEBUG) {
             Log.d(TAG, "onItemSelected() called with: "
                     + "parent = [" + parent + "], view = [" + view + "], "
@@ -601,14 +580,16 @@ public class DownloadDialog extends DialogFragment
         final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
         final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;
 
-        dialogBinding.audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
-        dialogBinding.videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+        dialogBinding.audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE
+                : View.GONE);
+        dialogBinding.videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE
+                : View.GONE);
         dialogBinding.subtitleButton.setVisibility(isSubtitleStreamsAvailable
                 ? View.VISIBLE : View.GONE);
 
         prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
         final String defaultMedia = prefs.getString(getString(R.string.last_used_download_type),
-                    getString(R.string.last_download_type_video_key));
+                getString(R.string.last_download_type_video_key));
 
         if (isVideoStreamsAvailable
                 && (defaultMedia.equals(getString(R.string.last_download_type_video_key)))) {
@@ -644,7 +625,7 @@ public class DownloadDialog extends DialogFragment
         dialogBinding.subtitleButton.setEnabled(enabled);
     }
 
-    private int getSubtitleIndexBy(final List<SubtitlesStream> streams) {
+    private int getSubtitleIndexBy(@NonNull final List<SubtitlesStream> streams) {
         final Localization preferredLocalization = NewPipe.getPreferredLocalization();
 
         int candidate = 0;
@@ -670,8 +651,10 @@ public class DownloadDialog extends DialogFragment
         return candidate;
     }
 
+    @NonNull
     private String getNameEditText() {
-        final String str = dialogBinding.fileName.getText().toString().trim();
+        final String str = Objects.requireNonNull(dialogBinding.fileName.getText()).toString()
+                .trim();
 
         return FilenameUtils.createFilename(context, str.isEmpty() ? currentInfo.getName() : str);
     }
@@ -687,7 +670,8 @@ public class DownloadDialog extends DialogFragment
     }
 
     private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
-        launcher.launch(StoredDirectoryHelper.getPicker(context));
+        NoFileManagerSafeGuard.launchSafe(launcher, StoredDirectoryHelper.getPicker(context), TAG,
+                context);
     }
 
     private void prepareSelectedDownload() {
@@ -708,7 +692,7 @@ public class DownloadDialog extends DialogFragment
                 if (format == MediaFormat.WEBMA_OPUS) {
                     mimeTmp = "audio/ogg";
                     filenameTmp += "opus";
-                } else {
+                } else if (format != null) {
                     mimeTmp = format.mimeType;
                     filenameTmp += format.suffix;
                 }
@@ -717,22 +701,30 @@ public class DownloadDialog extends DialogFragment
                 selectedMediaType = getString(R.string.last_download_type_video_key);
                 mainStorage = mainStorageVideo;
                 format = videoStreamsAdapter.getItem(selectedVideoIndex).getFormat();
-                mimeTmp = format.mimeType;
-                filenameTmp += format.suffix;
+                if (format != null) {
+                    mimeTmp = format.mimeType;
+                    filenameTmp += format.suffix;
+                }
                 break;
             case R.id.subtitle_button:
                 selectedMediaType = getString(R.string.last_download_type_subtitle_key);
                 mainStorage = mainStorageVideo; // subtitle & video files go together
                 format = subtitleStreamsAdapter.getItem(selectedSubtitleIndex).getFormat();
-                mimeTmp = format.mimeType;
-                filenameTmp += (format == MediaFormat.TTML ? MediaFormat.SRT : format).suffix;
+                if (format != null) {
+                    mimeTmp = format.mimeType;
+                }
+
+                if (format == MediaFormat.TTML) {
+                    filenameTmp += MediaFormat.SRT.suffix;
+                } else if (format != null) {
+                    filenameTmp += format.suffix;
+                }
                 break;
             default:
                 throw new RuntimeException("No stream selected");
         }
 
-        if (!askForSavePath
-                && (mainStorage == null
+        if (!askForSavePath && (mainStorage == null
                 || mainStorage.isDirect() == NewPipeSettings.useStorageAccessFramework(context)
                 || mainStorage.isInvalidSafStorage())) {
             // Pick new download folder if one of:
@@ -766,14 +758,16 @@ public class DownloadDialog extends DialogFragment
                 initialPath = Uri.parse(initialSavePath.getAbsolutePath());
             }
 
-            requestDownloadSaveAsLauncher.launch(StoredFileHelper.getNewPicker(context,
-                    filenameTmp, mimeTmp, initialPath));
+            NoFileManagerSafeGuard.launchSafe(requestDownloadSaveAsLauncher,
+                    StoredFileHelper.getNewPicker(context, filenameTmp, mimeTmp, initialPath), TAG,
+                    context);
 
             return;
         }
 
         // check for existing file with the same name
-        checkSelectedDownload(mainStorage, mainStorage.findFile(filenameTmp), filenameTmp, mimeTmp);
+        checkSelectedDownload(mainStorage, mainStorage.findFile(filenameTmp), filenameTmp,
+                mimeTmp);
 
         // remember the last media type downloaded by the user
         prefs.edit().putString(getString(R.string.last_used_download_type), selectedMediaType)
@@ -781,7 +775,8 @@ public class DownloadDialog extends DialogFragment
     }
 
     private void checkSelectedDownload(final StoredDirectoryHelper mainStorage,
-                                       final Uri targetFile, final String filename,
+                                       final Uri targetFile,
+                                       final String filename,
                                        final String mime) {
         StoredFileHelper storage;
 
@@ -799,7 +794,7 @@ public class DownloadDialog extends DialogFragment
                         mainStorage.getTag());
             }
         } catch (final Exception e) {
-            ErrorActivity.reportErrorInSnackbar(this,
+            ErrorUtil.createNotification(requireContext(),
                     new ErrorInfo(e, UserAction.DOWNLOAD_FAILED, "Getting storage"));
             return;
         }
@@ -942,7 +937,7 @@ public class DownloadDialog extends DialogFragment
                 storage.truncate();
             }
         } catch (final IOException e) {
-            Log.e(TAG, "failed to truncate the file: " + storage.getUri().toString(), e);
+            Log.e(TAG, "Failed to truncate the file: " + storage.getUri().toString(), e);
             showFailedDialog(R.string.overwrite_failed);
             return;
         }
@@ -987,8 +982,8 @@ public class DownloadDialog extends DialogFragment
                     }
 
                     psArgs = null;
-                    final long videoSize = wrappedVideoStreams
-                            .getSizeInBytes((VideoStream) selectedStream);
+                    final long videoSize = wrappedVideoStreams.getSizeInBytes(
+                            (VideoStream) selectedStream);
 
                     // set nearLength, only, if both sizes are fetched or known. This probably
                     // does not work on slow networks but is later updated in the downloader
@@ -1004,7 +999,7 @@ public class DownloadDialog extends DialogFragment
 
                 if (selectedStream.getFormat() == MediaFormat.TTML) {
                     psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
-                    psArgs = new String[]{
+                    psArgs = new String[] {
                             selectedStream.getFormat().getSuffix(),
                             "false" // ignore empty frames
                     };
@@ -1015,17 +1010,22 @@ public class DownloadDialog extends DialogFragment
         }
 
         if (secondaryStream == null) {
-            urls = new String[]{
-                    selectedStream.getUrl()
+            urls = new String[] {
+                    selectedStream.getContent()
             };
-            recoveryInfo = new MissionRecoveryInfo[]{
+            recoveryInfo = new MissionRecoveryInfo[] {
                     new MissionRecoveryInfo(selectedStream)
             };
         } else {
-            urls = new String[]{
-                    selectedStream.getUrl(), secondaryStream.getUrl()
+            if (secondaryStream.getDeliveryMethod() != PROGRESSIVE_HTTP) {
+                throw new IllegalArgumentException("Unsupported stream delivery format"
+                        + secondaryStream.getDeliveryMethod());
+            }
+
+            urls = new String[] {
+                    selectedStream.getContent(), secondaryStream.getContent()
             };
-            recoveryInfo = new MissionRecoveryInfo[]{new MissionRecoveryInfo(selectedStream),
+            recoveryInfo = new MissionRecoveryInfo[] {new MissionRecoveryInfo(selectedStream),
                     new MissionRecoveryInfo(secondaryStream)};
         }
 

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

@@ -33,12 +33,11 @@ public class AcraReportSender implements ReportSender {
 
     @Override
     public void send(@NonNull final Context context, @NonNull final CrashReportData report) {
-        ErrorActivity.reportError(context, new ErrorInfo(
+        ErrorUtil.openActivity(context, new ErrorInfo(
                 new String[]{report.getString(ReportField.STACK_TRACE)},
                 UserAction.UI_ERROR,
                 ErrorInfo.SERVICE_NONE,
                 "ACRA report",
-                R.string.app_ui_crash,
-                null));
+                R.string.app_ui_crash));
     }
 }

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

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

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

@@ -1,9 +1,10 @@
 package org.schabi.newpipe.error;
 
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -11,15 +12,12 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.Fragment;
 
-import com.google.android.material.snackbar.Snackbar;
 import com.grack.nanojson.JsonWriter;
 
 import org.schabi.newpipe.BuildConfig;
@@ -27,14 +25,13 @@ import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.ActivityErrorBinding;
 import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
-
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+import java.util.stream.Collectors;
 
 /*
  * Created by Christian Schabesberger on 24.10.15.
@@ -56,6 +53,10 @@ import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * This activity is used to show error details and allow reporting them in various ways. Use {@link
+ * ErrorUtil#openActivity(Context, ErrorInfo)} to correctly open this activity.
+ */
 public class ErrorActivity extends AppCompatActivity {
     // LOG TAGS
     public static final String TAG = ErrorActivity.class.toString();
@@ -65,11 +66,11 @@ public class ErrorActivity extends AppCompatActivity {
     public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT = "Exception in ";
 
-    public static final String ERROR_GITHUB_ISSUE_URL
-            = "https://github.com/TeamNewPipe/NewPipe/issues";
+    public static final String ERROR_GITHUB_ISSUE_URL =
+            "https://github.com/TeamNewPipe/NewPipe/issues";
 
-    public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER
-            = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+    public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER =
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
 
     private ErrorInfo errorInfo;
@@ -77,67 +78,6 @@ public class ErrorActivity extends AppCompatActivity {
 
     private ActivityErrorBinding activityErrorBinding;
 
-    /**
-     * Reports a new error by starting a new activity.
-     * <br/>
-     * Ensure that the data within errorInfo is serializable otherwise
-     * an exception will be thrown!<br/>
-     * {@link EnsureExceptionSerializable} might help.
-     *
-     * @param context
-     * @param errorInfo
-     */
-    public static void reportError(final Context context, final ErrorInfo errorInfo) {
-        final Intent intent = new Intent(context, ErrorActivity.class);
-        intent.putExtra(ERROR_INFO, errorInfo);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-
-    public static void reportErrorInSnackbar(final Context context, final ErrorInfo errorInfo) {
-        final View rootView = context instanceof Activity
-                ? ((Activity) context).findViewById(android.R.id.content) : null;
-        reportErrorInSnackbar(context, rootView, errorInfo);
-    }
-
-    public static void reportErrorInSnackbar(final Fragment fragment, final ErrorInfo errorInfo) {
-        View rootView = fragment.getView();
-        if (rootView == null && fragment.getActivity() != null) {
-            rootView = fragment.getActivity().findViewById(android.R.id.content);
-        }
-        reportErrorInSnackbar(fragment.requireContext(), rootView, errorInfo);
-    }
-
-    public static void reportUiErrorInSnackbar(final Context context,
-                                               final String request,
-                                               final Throwable throwable) {
-        reportErrorInSnackbar(context, new ErrorInfo(throwable, UserAction.UI_ERROR, request));
-    }
-
-    public static void reportUiErrorInSnackbar(final Fragment fragment,
-                                               final String request,
-                                               final Throwable throwable) {
-        reportErrorInSnackbar(fragment, new ErrorInfo(throwable, UserAction.UI_ERROR, request));
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////
-    // Utils
-    ////////////////////////////////////////////////////////////////////////
-
-    private static void reportErrorInSnackbar(final Context context,
-                                              @Nullable final View rootView,
-                                              final ErrorInfo errorInfo) {
-        if (rootView != null) {
-            Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
-                    .setActionTextColor(Color.YELLOW)
-                    .setAction(context.getString(R.string.error_snackbar_action).toUpperCase(), v ->
-                            reportError(context, errorInfo)).show();
-        } else {
-            reportError(context, errorInfo);
-        }
-    }
-
 
     ////////////////////////////////////////////////////////////////////////
     // Activity lifecycle
@@ -243,14 +183,9 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private String formErrorText(final String[] el) {
-        final StringBuilder text = new StringBuilder();
-        if (el != null) {
-            for (final String e : el) {
-                text.append("-------------------------------------\n").append(e);
-            }
-        }
-        text.append("-------------------------------------");
-        return text.toString();
+        final String separator = "-------------------------------------";
+        return Arrays.stream(el)
+                .collect(Collectors.joining(separator + "\n", separator + "\n", separator));
     }
 
     /**

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

@@ -2,18 +2,18 @@ package org.schabi.newpipe.error
 
 import android.os.Parcelable
 import androidx.annotation.StringRes
+import com.google.android.exoplayer2.ExoPlaybackException
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.Info
-import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
 import org.schabi.newpipe.ktx.isNetworkRelated
-import java.io.PrintWriter
-import java.io.StringWriter
+import org.schabi.newpipe.util.ServiceHelper
 
 @Parcelize
 class ErrorInfo(
@@ -21,11 +21,14 @@ class ErrorInfo(
     val userAction: UserAction,
     val serviceName: String,
     val request: String,
-    val messageStringId: Int,
-    @Transient // no need to store throwable, all data for report is in other variables
-    var throwable: Throwable? = null
+    val messageStringId: Int
 ) : Parcelable {
 
+    // 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,
@@ -36,9 +39,10 @@ class ErrorInfo(
         userAction,
         serviceName,
         request,
-        getMessageStringId(throwable, userAction),
-        throwable
-    )
+        getMessageStringId(throwable, userAction)
+    ) {
+        this.throwable = throwable
+    }
 
     private constructor(
         throwable: List<Throwable>,
@@ -50,15 +54,16 @@ class ErrorInfo(
         userAction,
         serviceName,
         request,
-        getMessageStringId(throwable.firstOrNull(), userAction),
-        throwable.firstOrNull()
-    )
+        getMessageStringId(throwable.firstOrNull(), userAction)
+    ) {
+        this.throwable = throwable.firstOrNull()
+    }
 
     // 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, NewPipe.getNameOfService(serviceId), request)
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
     constructor(throwable: Throwable, userAction: UserAction, request: String, info: Info?) :
         this(throwable, userAction, getInfoServiceName(info), request)
 
@@ -66,29 +71,20 @@ class ErrorInfo(
     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, NewPipe.getNameOfService(serviceId), request)
+        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 {
         const val SERVICE_NONE = "none"
 
-        private fun getStackTrace(throwable: Throwable): String {
-            StringWriter().use { stringWriter ->
-                PrintWriter(stringWriter, true).use { printWriter ->
-                    throwable.printStackTrace(printWriter)
-                    return stringWriter.buffer.toString()
-                }
-            }
-        }
+        fun throwableToStringList(throwable: Throwable) = arrayOf(throwable.stackTraceToString())
 
-        fun throwableToStringList(throwable: Throwable) = arrayOf(getStackTrace(throwable))
-
-        fun throwableListToStringList(throwable: List<Throwable>) =
-            Array(throwable.size) { i -> getStackTrace(throwable[i]) }
+        fun throwableListToStringList(throwableList: List<Throwable>) =
+            throwableList.map { it.stackTraceToString() }.toTypedArray()
 
         private fun getInfoServiceName(info: Info?) =
-            if (info == null) SERVICE_NONE else NewPipe.getNameOfService(info.serviceId)
+            if (info == null) SERVICE_NONE else ServiceHelper.getNameOfServiceById(info.serviceId)
 
         @StringRes
         private fun getMessageStringId(
@@ -102,6 +98,13 @@ class ErrorInfo(
                 throwable is ContentNotSupportedException -> R.string.content_not_supported
                 throwable is DeobfuscateException -> R.string.youtube_signature_deobfuscation_error
                 throwable is ExtractionException -> R.string.parsing_error
+                throwable is ExoPlaybackException -> {
+                    when (throwable.type) {
+                        ExoPlaybackException.TYPE_SOURCE -> R.string.player_stream_failure
+                        ExoPlaybackException.TYPE_UNEXPECTED -> R.string.player_recoverable_failure
+                        else -> R.string.player_unrecoverable_failure
+                    }
+                }
                 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

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

@@ -15,7 +15,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.Disposable
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
-import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
@@ -31,6 +30,7 @@ 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(
@@ -53,6 +53,8 @@ class ErrorPanelHelper(
         errorPanelRoot.findViewById(R.id.error_action_button)
     private val errorRetryButton: Button =
         errorPanelRoot.findViewById(R.id.error_retry_button)
+    private val errorOpenInBrowserButton: Button =
+        errorPanelRoot.findViewById(R.id.error_open_in_browser)
 
     private var errorDisposable: Disposable? = null
 
@@ -70,6 +72,7 @@ class ErrorPanelHelper(
         errorServiceExplanationTextView.isVisible = false
         errorActionButton.isVisible = false
         errorRetryButton.isVisible = false
+        errorOpenInBrowserButton.isVisible = false
     }
 
     fun showError(errorInfo: ErrorInfo) {
@@ -100,13 +103,14 @@ class ErrorPanelHelper(
             }
 
             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,
-                    NewPipe.getNameOfService(ServiceHelper.getSelectedServiceId(context))
+                    ServiceHelper.getSelectedService(context)?.serviceInfo?.name ?: "<unknown>"
                 )
                 errorServiceInfoTextView.isVisible = true
 
@@ -118,7 +122,7 @@ class ErrorPanelHelper(
             showAndSetErrorButtonAction(
                 R.string.error_snackbar_action
             ) {
-                ErrorActivity.reportError(context, errorInfo)
+                ErrorUtil.openActivity(context, errorInfo)
             }
 
             errorTextView.setText(getExceptionDescription(errorInfo.throwable))
@@ -129,6 +133,7 @@ class ErrorPanelHelper(
                 // show retry button only for content which is not unavailable or unsupported
                 errorRetryButton.isVisible = true
             }
+            showAndSetOpenInBrowserButtonAction(errorInfo)
         }
 
         setRootVisible()
@@ -146,6 +151,15 @@ class ErrorPanelHelper(
         errorActionButton.setOnClickListener(listener)
     }
 
+    fun showAndSetOpenInBrowserButtonAction(
+        errorInfo: ErrorInfo
+    ) {
+        errorOpenInBrowserButton.isVisible = true
+        errorOpenInBrowserButton.setOnClickListener {
+            ShareUtils.openUrlInBrowser(context, errorInfo.request, true)
+        }
+    }
+
     fun showTextError(errorString: String) {
         ensureDefaultVisibility()
 
@@ -178,7 +192,7 @@ class ErrorPanelHelper(
         val DEBUG: Boolean = MainActivity.DEBUG
 
         @StringRes
-        public fun getExceptionDescription(throwable: Throwable?): Int {
+        fun getExceptionDescription(throwable: Throwable?): Int {
             return when (throwable) {
                 is AgeRestrictedContentException -> R.string.restricted_video_no_stream
                 is GeographicRestrictionException -> R.string.georestricted_content

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

@@ -0,0 +1,158 @@
+package org.schabi.newpipe.error
+
+import android.app.Activity
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+import android.view.View
+import android.widget.Toast
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.fragment.app.Fragment
+import com.google.android.material.snackbar.Snackbar
+import org.schabi.newpipe.R
+
+/**
+ * This class contains all of the methods that should be used to let the user know that an error has
+ * occurred in the least intrusive way possible for each case. This class is for unexpected errors,
+ * for handled errors (e.g. network errors) use e.g. [ErrorPanelHelper] instead.
+ * - Use a snackbar if the exception is not critical and it happens in a place where a root view
+ *      is available.
+ * - Use a notification if the exception happens inside a background service (player, subscription
+ *      import, ...) or there is no activity/fragment from which to extract a root view.
+ * - Finally use the error activity only as a last resort in case the exception is critical and
+ *      happens in an open activity (since the workflow would be interrupted anyway in that case).
+ */
+class ErrorUtil {
+    companion object {
+        private const val ERROR_REPORT_NOTIFICATION_ID = 5340681
+
+        /**
+         * Starts a new error activity allowing the user to report the provided error. Only use this
+         * method directly as a last resort in case the exception is critical and happens in an open
+         * activity (since the workflow would be interrupted anyway in that case). So never use this
+         * for background services.
+         *
+         * @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) {
+            context.startActivity(getErrorActivityIntent(context, errorInfo))
+        }
+
+        /**
+         * Show a bottom snackbar to the user, with a report button that opens the error activity.
+         * Use this method if the exception is not critical and it happens in a place where a root
+         * view is available.
+         *
+         * @param context will be used to obtain the root view if it is an [Activity]; if no root
+         *                view can be found an error notification is shown instead
+         * @param errorInfo the error info to be reported
+         */
+        @JvmStatic
+        fun showSnackbar(context: Context, errorInfo: ErrorInfo) {
+            val rootView = if (context is Activity) context.findViewById<View>(R.id.content) else null
+            showSnackbar(context, rootView, errorInfo)
+        }
+
+        /**
+         * Show a bottom snackbar to the user, with a report button that opens the error activity.
+         * Use this method if the exception is not critical and it happens in a place where a root
+         * view is available.
+         *
+         * @param fragment will be used to obtain the root view if it has a connected [Activity]; if
+         *                 no root view can be found an error notification is shown instead
+         * @param errorInfo the error info to be reported
+         */
+        @JvmStatic
+        fun showSnackbar(fragment: Fragment, errorInfo: ErrorInfo) {
+            var rootView = fragment.view
+            if (rootView == null && fragment.activity != null) {
+                rootView = fragment.requireActivity().findViewById(R.id.content)
+            }
+            showSnackbar(fragment.requireContext(), rootView, errorInfo)
+        }
+
+        /**
+         * Shortcut to calling [showSnackbar] with an [ErrorInfo] of type [UserAction.UI_ERROR]
+         */
+        @JvmStatic
+        fun showUiErrorSnackbar(context: Context, request: String, throwable: Throwable) {
+            showSnackbar(context, ErrorInfo(throwable, UserAction.UI_ERROR, request))
+        }
+
+        /**
+         * Shortcut to calling [showSnackbar] with an [ErrorInfo] of type [UserAction.UI_ERROR]
+         */
+        @JvmStatic
+        fun showUiErrorSnackbar(fragment: Fragment, request: String, throwable: Throwable) {
+            showSnackbar(fragment, ErrorInfo(throwable, UserAction.UI_ERROR, request))
+        }
+
+        /**
+         * Create an error notification. Tapping on the notification opens the error activity. Use
+         * this method if the exception happens inside a background service (player, subscription
+         * import, ...) or there is no activity/fragment from which to extract a root view.
+         *
+         * @param context the context to use to show the notification
+         * @param errorInfo the error info to be reported; the error message
+         *                  [ErrorInfo.messageStringId] will be shown in the notification
+         *                  description
+         */
+        @JvmStatic
+        fun createNotification(context: Context, errorInfo: ErrorInfo) {
+            var pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                pendingIntentFlags = pendingIntentFlags or PendingIntent.FLAG_IMMUTABLE
+            }
+
+            val notificationBuilder: NotificationCompat.Builder =
+                NotificationCompat.Builder(
+                    context,
+                    context.getString(R.string.error_report_channel_id)
+                )
+                    .setSmallIcon(R.drawable.ic_bug_report)
+                    .setContentTitle(context.getString(R.string.error_report_notification_title))
+                    .setContentText(context.getString(errorInfo.messageStringId))
+                    .setAutoCancel(true)
+                    .setContentIntent(
+                        PendingIntent.getActivity(
+                            context,
+                            0,
+                            getErrorActivityIntent(context, errorInfo),
+                            pendingIntentFlags
+                        )
+                    )
+
+            NotificationManagerCompat.from(context)
+                .notify(ERROR_REPORT_NOTIFICATION_ID, notificationBuilder.build())
+
+            // 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 {
+            val intent = Intent(context, ErrorActivity::class.java)
+            intent.putExtra(ErrorActivity.ERROR_INFO, errorInfo)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            return intent
+        }
+
+        private fun showSnackbar(context: Context, rootView: View?, errorInfo: ErrorInfo) {
+            if (rootView == null) {
+                // fallback to showing a notification if no root view is available
+                createNotification(context, errorInfo)
+            } else {
+                Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
+                    .setActionTextColor(Color.YELLOW)
+                    .setAction(context.getString(R.string.error_snackbar_action).uppercase()) {
+                        openActivity(context, errorInfo)
+                    }.show()
+            }
+        }
+    }
+}

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

@@ -3,14 +3,15 @@ package org.schabi.newpipe.error;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -18,7 +19,6 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.NavUtils;
 import androidx.preference.PreferenceManager;
-import androidx.webkit.WebViewClientCompat;
 
 import org.schabi.newpipe.databinding.ActivityRecaptchaBinding;
 import org.schabi.newpipe.DownloaderImpl;
@@ -86,14 +86,15 @@ public class ReCaptchaActivity extends AppCompatActivity {
         webSettings.setJavaScriptEnabled(true);
         webSettings.setUserAgentString(DownloaderImpl.USER_AGENT);
 
-        recaptchaBinding.reCaptchaWebView.setWebViewClient(new WebViewClientCompat() {
+        recaptchaBinding.reCaptchaWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
+            public boolean shouldOverrideUrlLoading(final WebView view,
+                                                    final WebResourceRequest request) {
                 if (MainActivity.DEBUG) {
-                    Log.d(TAG, "shouldOverrideUrlLoading: url=" + url);
+                    Log.d(TAG, "shouldOverrideUrlLoading: url=" + request.getUrl().toString());
                 }
 
-                handleCookiesFromUrl(url);
+                handleCookiesFromUrl(request.getUrl().toString());
                 return false;
             }
 
@@ -107,12 +108,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
         // cleaning cache, history and cookies from webView
         recaptchaBinding.reCaptchaWebView.clearCache(true);
         recaptchaBinding.reCaptchaWebView.clearHistory();
-        final CookieManager cookieManager = CookieManager.getInstance();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.removeAllCookies(value -> { });
-        } else {
-            cookieManager.removeAllCookie();
-        }
+        CookieManager.getInstance().removeAllCookies(null);
 
         recaptchaBinding.reCaptchaWebView.loadUrl(url);
     }

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

@@ -26,10 +26,11 @@ public enum UserAction {
     DOWNLOAD_OPEN_DIALOG("download open dialog"),
     DOWNLOAD_POSTPROCESSING("download post-processing"),
     DOWNLOAD_FAILED("download failed"),
+    NEW_STREAMS_NOTIFICATIONS("new streams notifications"),
     PREFERENCES_MIGRATION("migration of preferences"),
     SHARE_TO_NEWPIPE("share to newpipe"),
-    CHECK_FOR_NEW_APP_VERSION("check for new app version");
-
+    CHECK_FOR_NEW_APP_VERSION("check for new app version"),
+    OPEN_INFO_ITEM_DIALOG("open info item dialog");
 
     private final String message;
 

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

@@ -7,12 +7,13 @@ import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorPanelHelper;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.util.InfoCache;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -198,9 +199,8 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
     }
 
     /**
-     * Show a SnackBar and only call
-     * {@link ErrorActivity#reportErrorInSnackbar(androidx.fragment.app.Fragment, ErrorInfo)}
-     * IF we a find a valid view (otherwise the error screen appears).
+     * Directly calls {@link ErrorUtil#showSnackbar(Fragment, ErrorInfo)}, that shows a snackbar if
+     * a valid view can be found, otherwise creates an error report notification.
      *
      * @param errorInfo The error information
      */
@@ -208,6 +208,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         if (DEBUG) {
             Log.d(TAG, "showSnackBarError() called with: errorInfo = [" + errorInfo + "]");
         }
-        ErrorActivity.reportErrorInSnackbar(this, errorInfo);
+        ErrorUtil.showSnackbar(this, errorInfo);
     }
 }

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

@@ -23,7 +23,7 @@ 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.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.settings.tabs.Tab;
 import org.schabi.newpipe.settings.tabs.TabsManager;
@@ -145,7 +145,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
                 NavigationHelper.openSearchFragment(getFM(),
                         ServiceHelper.getSelectedServiceId(activity), "");
             } catch (final Exception e) {
-                ErrorActivity.reportUiErrorInSnackbar(this, "Opening search fragment", e);
+                ErrorUtil.showUiErrorSnackbar(this, "Opening search fragment", e);
             }
             return true;
         }
@@ -227,16 +227,11 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         public Fragment getItem(final int position) {
             final Tab tab = internalTabsList.get(position);
 
-            Throwable throwable = null;
-            Fragment fragment = null;
+            final Fragment fragment;
             try {
                 fragment = tab.getFragment(context);
             } catch (final ExtractionException e) {
-                throwable = e;
-            }
-
-            if (throwable != null) {
-                ErrorActivity.reportUiErrorInSnackbar(context, "Getting fragment item", throwable);
+                ErrorUtil.showUiErrorSnackbar(context, "Getting fragment item", e);
                 return new BlankFragment();
             }
 

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe.fragments;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
@@ -10,7 +11,7 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager;
  */
 public abstract class OnScrollBelowItemsListener extends RecyclerView.OnScrollListener {
     @Override
-    public void onScrolled(final RecyclerView recyclerView, final int dx, final int dy) {
+    public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx, final int dy) {
         super.onScrolled(recyclerView, dx, dy);
         if (dy > 0) {
             int pastVisibleItems = 0;

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

@@ -1,5 +1,9 @@
 package org.schabi.newpipe.fragments.detail;
 
+import static android.text.TextUtils.isEmpty;
+import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
+import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,17 +30,9 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.external_communication.TextLinkifier;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import icepick.State;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
-import static android.text.TextUtils.isEmpty;
-import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
-import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
-
 public class DescriptionFragment extends BaseFragment {
 
     @State
@@ -84,7 +80,7 @@ public class DescriptionFragment extends BaseFragment {
     private void setupDescription() {
         final Description description = streamInfo.getDescription();
         if (description == null || isEmpty(description.getContent())
-                || description == Description.emptyDescription) {
+                || description == Description.EMPTY_DESCRIPTION) {
             binding.detailDescriptionView.setVisibility(View.GONE);
             binding.detailSelectDescriptionButton.setVisibility(View.GONE);
             return;
@@ -185,8 +181,8 @@ public class DescriptionFragment extends BaseFragment {
             return;
         }
 
-        final ItemMetadataBinding itemBinding
-                = ItemMetadataBinding.inflate(inflater, layout, false);
+        final ItemMetadataBinding itemBinding =
+                ItemMetadataBinding.inflate(inflater, layout, false);
 
         itemBinding.metadataTypeView.setText(type);
         itemBinding.metadataTypeView.setOnLongClickListener(v -> {
@@ -206,19 +202,16 @@ public class DescriptionFragment extends BaseFragment {
 
     private void addTagsMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {
         if (streamInfo.getTags() != null && !streamInfo.getTags().isEmpty()) {
-            final ItemMetadataTagsBinding itemBinding
-                    = ItemMetadataTagsBinding.inflate(inflater, layout, false);
+            final var itemBinding = ItemMetadataTagsBinding.inflate(inflater, layout, false);
 
-            final List<String> tags = new ArrayList<>(streamInfo.getTags());
-            Collections.sort(tags);
-            for (final String tag : tags) {
+            streamInfo.getTags().stream().sorted(String.CASE_INSENSITIVE_ORDER).forEach(tag -> {
                 final Chip chip = (Chip) inflater.inflate(R.layout.chip,
                         itemBinding.metadataTagsChips, false);
                 chip.setText(tag);
                 chip.setOnClickListener(this::onTagClick);
                 chip.setOnLongClickListener(this::onTagLongClick);
                 itemBinding.metadataTagsChips.addView(chip);
-            }
+            });
 
             layout.addView(itemBinding.getRoot());
         }

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

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.fragments.detail;
 
+import androidx.annotation.NonNull;
+
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 
 import java.io.Serializable;
@@ -46,6 +48,7 @@ class StackItem implements Serializable {
         return playQueue;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return getServiceId() + ":" + getUrl() + " > " + getTitle();

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

@@ -1,5 +1,16 @@
 package org.schabi.newpipe.fragments.detail;
 
+import static android.text.TextUtils.isEmpty;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
+import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
+import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
+import static org.schabi.newpipe.player.helper.PlayerHelper.isClearingQueueConfirmationRequired;
+import static org.schabi.newpipe.player.playqueue.PlayQueueItem.RECOVERY_UNSET;
+import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
+import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;
+
 import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -10,7 +21,6 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.database.ContentObserver;
 import android.graphics.Color;
-import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -31,6 +41,7 @@ import android.view.WindowManager;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import androidx.annotation.AttrRes;
 import androidx.annotation.NonNull;
@@ -43,7 +54,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
-import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -55,8 +66,8 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.FragmentVideoDetailBinding;
 import org.schabi.newpipe.download.DownloadDialog;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.ReCaptchaActivity;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.InfoItem;
@@ -76,9 +87,9 @@ import org.schabi.newpipe.fragments.list.videos.RelatedItemsFragment;
 import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.MainPlayer;
-import org.schabi.newpipe.player.MainPlayer.PlayerType;
 import org.schabi.newpipe.player.Player;
+import org.schabi.newpipe.player.PlayerService;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
 import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -86,6 +97,8 @@ import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.player.ui.MainPlayerUi;
+import org.schabi.newpipe.player.ui.VideoPlayerUi;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -94,16 +107,17 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.StreamTypeUtil;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import icepick.State;
@@ -112,16 +126,6 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-import static android.text.TextUtils.isEmpty;
-import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
-import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
-import static org.schabi.newpipe.player.helper.PlayerHelper.globalScreenOrientationLocked;
-import static org.schabi.newpipe.player.helper.PlayerHelper.isClearingQueueConfirmationRequired;
-import static org.schabi.newpipe.player.playqueue.PlayQueueItem.RECOVERY_UNSET;
-import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
-
 public final class VideoDetailFragment
         extends BaseStateFragment<StreamInfo>
         implements BackPressable,
@@ -176,6 +180,8 @@ public final class VideoDetailFragment
     @State
     int bottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
     @State
+    int lastStableBottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
+    @State
     protected boolean autoPlayEnabled = true;
 
     @Nullable
@@ -186,9 +192,8 @@ public final class VideoDetailFragment
     @Nullable
     private Disposable positionSubscriber = null;
 
-    private List<VideoStream> sortedVideoStreams;
-    private int selectedVideoStreamIndex = -1;
     private BottomSheetBehavior<FrameLayout> bottomSheetBehavior;
+    private BottomSheetBehavior.BottomSheetCallback bottomSheetCallback;
     private BroadcastReceiver broadcastReceiver;
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -201,7 +206,7 @@ public final class VideoDetailFragment
 
     private ContentObserver settingsContentObserver;
     @Nullable
-    private MainPlayer playerService;
+    private PlayerService playerService;
     private Player player;
     private final PlayerHolder playerHolder = PlayerHolder.getInstance();
 
@@ -210,7 +215,7 @@ public final class VideoDetailFragment
     //////////////////////////////////////////////////////////////////////////*/
     @Override
     public void onServiceConnected(final Player connectedPlayer,
-                                   final MainPlayer connectedPlayerService,
+                                   final PlayerService connectedPlayerService,
                                    final boolean playAfterConnect) {
         player = connectedPlayer;
         playerService = connectedPlayerService;
@@ -218,6 +223,7 @@ public final class VideoDetailFragment
         // It will do nothing if the player is not in fullscreen mode
         hideSystemUiIfNeeded();
 
+        final Optional<MainPlayerUi> playerUi = player.UIs().get(MainPlayerUi.class);
         if (!player.videoPlayerSelected() && !playAfterConnect) {
             return;
         }
@@ -226,25 +232,23 @@ public final class VideoDetailFragment
             // If the video is playing but orientation changed
             // let's make the video in fullscreen again
             checkLandscape();
-        } else if (player.isFullscreen() && !player.isVerticalVideo()
+        } else if (playerUi.map(ui -> ui.isFullscreen() && !ui.isVerticalVideo()).orElse(false)
                 // Tablet UI has orientation-independent fullscreen
                 && !DeviceUtils.isTablet(activity)) {
             // Device is in portrait orientation after rotation but UI is in fullscreen.
             // Return back to non-fullscreen state
-            player.toggleFullscreen();
-        }
-
-        if (playerIsNotStopped() && player.videoPlayerSelected()) {
-            addVideoPlayerView();
+            playerUi.ifPresent(MainPlayerUi::toggleFullscreen);
         }
 
+        //noinspection SimplifyOptionalCallChains
         if (playAfterConnect
                 || (currentInfo != null
                 && isAutoplayEnabled()
-                && player.getParentActivity() == null)) {
+                && !playerUi.isPresent())) {
             autoPlayEnabled = true; // forcefully start playing
             openVideoPlayerAutoFullscreen();
         }
+        updateOverlayPlayQueueButtonVisibility();
     }
 
     @Override
@@ -268,7 +272,7 @@ public final class VideoDetailFragment
 
     public static VideoDetailFragment getInstanceInCollapsedState() {
         final VideoDetailFragment instance = new VideoDetailFragment();
-        instance.bottomSheetState = BottomSheetBehavior.STATE_COLLAPSED;
+        instance.updateBottomSheetState(BottomSheetBehavior.STATE_COLLAPSED);
         return instance;
     }
 
@@ -328,9 +332,14 @@ public final class VideoDetailFragment
     @Override
     public void onResume() {
         super.onResume();
+        if (DEBUG) {
+            Log.d(TAG, "onResume() called");
+        }
 
         activity.sendBroadcast(new Intent(ACTION_VIDEO_FRAGMENT_RESUMED));
 
+        updateOverlayPlayQueueButtonVisibility();
+
         setupBrightness();
 
         if (tabSettingsChanged) {
@@ -382,7 +391,7 @@ public final class VideoDetailFragment
         disposables.clear();
         positionSubscriber = null;
         currentWorker = null;
-        bottomSheetBehavior.setBottomSheetCallback(null);
+        bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback);
 
         if (activity.isFinishing()) {
             playQueue = null;
@@ -448,7 +457,7 @@ public final class VideoDetailFragment
                     disposables.add(
                             PlaylistDialog.createCorrespondingDialog(
                                     getContext(),
-                                    Collections.singletonList(new StreamEntity(currentInfo)),
+                                    List.of(new StreamEntity(currentInfo)),
                                     dialog -> dialog.show(getFM(), TAG)
                             )
                     );
@@ -499,8 +508,18 @@ public final class VideoDetailFragment
                 }
                 break;
             case R.id.detail_thumbnail_root_layout:
-                autoPlayEnabled = true; // forcefully start playing
-                openVideoPlayerAutoFullscreen();
+                // make sure not to open any player if there is nothing currently loaded!
+                // FIXME removing this `if` causes the player service to start correctly, then stop,
+                //  then restart badly without calling `startForeground()`, causing a crash when
+                //  later closing the detail fragment
+                if (currentInfo != null) {
+                    autoPlayEnabled = true; // forcefully start playing
+                    // FIXME Workaround #7427
+                    if (isPlayerAvailable()) {
+                        player.setRecovery();
+                    }
+                    openVideoPlayerAutoFullscreen();
+                }
                 break;
             case R.id.detail_title_root_layout:
                 toggleTitleAndSecondaryControls();
@@ -510,10 +529,13 @@ public final class VideoDetailFragment
             case R.id.overlay_buttons_layout:
                 bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
                 break;
+            case R.id.overlay_play_queue_button:
+                NavigationHelper.openPlayQueue(getContext());
+                break;
             case R.id.overlay_play_pause_button:
                 if (playerIsNotStopped()) {
                     player.playPause();
-                    player.hideControls(0, 0);
+                    player.UIs().get(VideoPlayerUi.class).ifPresent(ui -> ui.hideControls(0, 0));
                     showSystemUi();
                 } else {
                     autoPlayEnabled = true; // forcefully start playing
@@ -533,7 +555,7 @@ public final class VideoDetailFragment
             NavigationHelper.openChannelFragment(getFM(), currentInfo.getServiceId(),
                     subChannelUrl, subChannelName);
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this, "Opening channel fragment", e);
+            ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
         }
     }
 
@@ -578,12 +600,12 @@ public final class VideoDetailFragment
         if (binding.detailSecondaryControlPanel.getVisibility() == View.GONE) {
             binding.detailVideoTitleView.setMaxLines(10);
             animateRotation(binding.detailToggleSecondaryControlsView,
-                    Player.DEFAULT_CONTROLS_DURATION, 180);
+                    VideoPlayerUi.DEFAULT_CONTROLS_DURATION, 180);
             binding.detailSecondaryControlPanel.setVisibility(View.VISIBLE);
         } else {
             binding.detailVideoTitleView.setMaxLines(1);
             animateRotation(binding.detailToggleSecondaryControlsView,
-                    Player.DEFAULT_CONTROLS_DURATION, 0);
+                    VideoPlayerUi.DEFAULT_CONTROLS_DURATION, 0);
             binding.detailSecondaryControlPanel.setVisibility(View.GONE);
         }
         // view pager height has changed, update the tab layout
@@ -659,8 +681,7 @@ public final class VideoDetailFragment
             binding.detailControlsCrashThePlayer.setOnClickListener(
                     v -> VideoDetailPlayerCrasher.onCrashThePlayer(
                             this.getContext(),
-                            this.player,
-                            getLayoutInflater())
+                            this.player)
             );
         }
 
@@ -669,6 +690,7 @@ public final class VideoDetailFragment
         binding.overlayMetadataLayout.setOnClickListener(this);
         binding.overlayMetadataLayout.setOnLongClickListener(this);
         binding.overlayButtonsLayout.setOnClickListener(this);
+        binding.overlayPlayQueueButton.setOnClickListener(this);
         binding.overlayCloseButton.setOnClickListener(this);
         binding.overlayPlayPauseButton.setOnClickListener(this);
 
@@ -685,7 +707,7 @@ public final class VideoDetailFragment
         });
 
         setupBottomPlayer();
-        if (!playerHolder.bound) {
+        if (!playerHolder.isBound()) {
             setHeightThumbnail();
         } else {
             playerHolder.startService(false, this);
@@ -710,7 +732,7 @@ public final class VideoDetailFragment
     }
 
     private void initThumbnailViews(@NonNull final StreamInfo info) {
-        PicassoHelper.loadThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
+        PicassoHelper.loadDetailsThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
                 .into(binding.detailThumbnailImageView, new Callback() {
                     @Override
                     public void onSuccess() {
@@ -742,7 +764,9 @@ public final class VideoDetailFragment
 
     @Override
     public boolean onKeyDown(final int keyCode) {
-        return isPlayerAvailable() && player.onKeyDown(keyCode);
+        return isPlayerAvailable()
+                && player.UIs().get(VideoPlayerUi.class)
+                .map(playerUi -> playerUi.onKeyDown(keyCode)).orElse(false);
     }
 
     @Override
@@ -752,7 +776,7 @@ public final class VideoDetailFragment
         }
 
         // If we are in fullscreen mode just exit from it via first back press
-        if (isPlayerAvailable() && player.isFullscreen()) {
+        if (isFullscreen()) {
             if (!DeviceUtils.isTablet(activity)) {
                 player.pause();
             }
@@ -1002,8 +1026,7 @@ public final class VideoDetailFragment
                 getChildFragmentManager().beginTransaction()
                         .replace(R.id.relatedItemsLayout, RelatedItemsFragment.getInstance(info))
                         .commitAllowingStateLoss();
-                binding.relatedItemsLayout.setVisibility(
-                        isPlayerAvailable() && player.isFullscreen() ? View.GONE : View.VISIBLE);
+                binding.relatedItemsLayout.setVisibility(isFullscreen() ? View.GONE : View.VISIBLE);
             }
         }
 
@@ -1043,15 +1066,13 @@ public final class VideoDetailFragment
             // call `post()` to be sure `viewPager.getHitRect()`
             // is up to date and not being currently recomputed
             binding.tabLayout.post(() -> {
-                if (getContext() != null) {
+                final var activity = getActivity();
+                if (activity != null) {
                     final Rect pagerHitRect = new Rect();
                     binding.viewPager.getHitRect(pagerHitRect);
 
-                    final Point displaySize = new Point();
-                    Objects.requireNonNull(ContextCompat.getSystemService(getContext(),
-                            WindowManager.class)).getDefaultDisplay().getSize(displaySize);
-
-                    final int viewPagerVisibleHeight = displaySize.y - pagerHitRect.top;
+                    final int height = DeviceUtils.getWindowHeight(activity.getWindowManager());
+                    final int viewPagerVisibleHeight = height - pagerHitRect.top;
                     // see TabLayout.DEFAULT_HEIGHT, which is equal to 48dp
                     final float tabLayoutHeight = TypedValue.applyDimension(
                             TypedValue.COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics());
@@ -1083,25 +1104,41 @@ public final class VideoDetailFragment
     private void toggleFullscreenIfInFullscreenMode() {
         // If a user watched video inside fullscreen mode and than chose another player
         // return to non-fullscreen mode
-        if (isPlayerAvailable() && player.isFullscreen()) {
-            player.toggleFullscreen();
+        if (isPlayerAvailable()) {
+            player.UIs().get(MainPlayerUi.class).ifPresent(playerUi -> {
+                if (playerUi.isFullscreen()) {
+                    playerUi.toggleFullscreen();
+                }
+            });
         }
     }
 
     private void openBackgroundPlayer(final boolean append) {
-        final AudioStream audioStream = currentInfo.getAudioStreams()
-                .get(ListHelper.getDefaultAudioFormat(activity, currentInfo.getAudioStreams()));
-
         final boolean useExternalAudioPlayer = PreferenceManager
                 .getDefaultSharedPreferences(activity)
                 .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
 
         toggleFullscreenIfInFullscreenMode();
 
+        if (isPlayerAvailable()) {
+            // FIXME Workaround #7427
+            player.setRecovery();
+        }
+
         if (!useExternalAudioPlayer) {
             openNormalBackgroundPlayer(append);
         } else {
-            startOnExternalPlayer(activity, currentInfo, audioStream);
+            final List<AudioStream> audioStreams = getUrlAndNonTorrentStreams(
+                    currentInfo.getAudioStreams());
+            final int index = ListHelper.getDefaultAudioFormat(activity, audioStreams);
+
+            if (index == -1) {
+                Toast.makeText(activity, R.string.no_audio_streams_available_for_external_players,
+                        Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            startOnExternalPlayer(activity, currentInfo, audioStreams.get(index));
         }
     }
 
@@ -1114,6 +1151,9 @@ public final class VideoDetailFragment
         // See UI changes while remote playQueue changes
         if (!isPlayerAvailable()) {
             playerHolder.startService(false, this);
+        } else {
+            // FIXME Workaround #7427
+            player.setRecovery();
         }
 
         toggleFullscreenIfInFullscreenMode();
@@ -1145,7 +1185,7 @@ public final class VideoDetailFragment
             // doesn't tell which state it was settling to, and thus the bottom sheet settles to
             // STATE_COLLAPSED. This can be solved by manually setting the state that will be
             // restored (i.e. bottomSheetState) to STATE_EXPANDED.
-            bottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
+            updateBottomSheetState(BottomSheetBehavior.STATE_EXPANDED);
             // toggle landscape in order to open directly in fullscreen
             onScreenRotationButtonClicked();
         }
@@ -1195,16 +1235,10 @@ public final class VideoDetailFragment
         }
 
         final PlayQueue queue = setupPlayQueueForIntent(false);
-
-        // Video view can have elements visible from popup,
-        // We hide it here but once it ready the view will be shown in handleIntent()
-        if (playerService.getView() != null) {
-            playerService.getView().setVisibility(View.GONE);
-        }
-        addVideoPlayerView();
+        tryAddVideoPlayerView();
 
         final Intent playerIntent = NavigationHelper.getPlayerIntent(requireContext(),
-                MainPlayer.class, queue, true, autoPlayEnabled);
+                PlayerService.class, queue, true, autoPlayEnabled);
         ContextCompat.startForegroundService(activity, playerIntent);
     }
 
@@ -1216,8 +1250,8 @@ public final class VideoDetailFragment
      * be reused in a few milliseconds and the flickering would be annoying.
      */
     private void hideMainPlayerOnLoadingNewStream() {
-        if (!isPlayerServiceAvailable()
-                || playerService.getView() == null
+        //noinspection SimplifyOptionalCallChains
+        if (!isPlayerServiceAvailable() || !getRoot().isPresent()
                 || !player.videoPlayerSelected()) {
             return;
         }
@@ -1225,7 +1259,7 @@ public final class VideoDetailFragment
         removeVideoPlayerView();
         if (isAutoplayEnabled()) {
             playerService.stopForImmediateReusing();
-            playerService.getView().setVisibility(View.GONE);
+            getRoot().ifPresent(view -> view.setVisibility(View.GONE));
         } else {
             playerHolder.stopService();
         }
@@ -1282,27 +1316,41 @@ public final class VideoDetailFragment
                 && PlayerHelper.isAutoplayAllowedByUser(requireContext());
     }
 
-    private void addVideoPlayerView() {
-        if (!isPlayerAvailable() || getView() == null) {
-            return;
+    private void tryAddVideoPlayerView() {
+        if (isPlayerAvailable() && getView() != null) {
+            // Setup the surface view height, so that it fits the video correctly; this is done also
+            // here, and not only in the Handler, to avoid a choppy fullscreen rotation animation.
+            setHeightThumbnail();
         }
 
-        // Check if viewHolder already contains a child
-        if (player.getRootView().getParent() != binding.playerPlaceholder) {
-            playerService.removeViewFromParent();
-        }
-        setHeightThumbnail();
+        // do all the null checks in the posted lambda, too, since the player, the binding and the
+        // view could be set or unset before the lambda gets executed on the next main thread cycle
+        new Handler(Looper.getMainLooper()).post(() -> {
+            if (!isPlayerAvailable() || getView() == null) {
+                return;
+            }
 
-        // Prevent from re-adding a view multiple times
-        if (player.getRootView().getParent() == null) {
-            binding.playerPlaceholder.addView(player.getRootView());
-        }
+            // setup the surface view height, so that it fits the video correctly
+            setHeightThumbnail();
+
+            player.UIs().get(MainPlayerUi.class).ifPresent(playerUi -> {
+                // sometimes binding would be null here, even though getView() != null above u.u
+                if (binding != null) {
+                    // prevent from re-adding a view multiple times
+                    playerUi.removeViewFromParent();
+                    binding.playerPlaceholder.addView(playerUi.getBinding().getRoot());
+                    playerUi.setupVideoSurfaceIfNeeded();
+                }
+            });
+        });
     }
 
     private void removeVideoPlayerView() {
         makeDefaultHeightForVideoPlaceholder();
 
-        playerService.removeViewFromParent();
+        if (player != null) {
+            player.UIs().get(VideoPlayerUi.class).ifPresent(VideoPlayerUi::removeViewFromParent);
+        }
     }
 
     private void makeDefaultHeightForVideoPlaceholder() {
@@ -1343,7 +1391,7 @@ public final class VideoDetailFragment
         final boolean isPortrait = metrics.heightPixels > metrics.widthPixels;
         requireView().getViewTreeObserver().removeOnPreDrawListener(preDrawListener);
 
-        if (isPlayerAvailable() && player.isFullscreen()) {
+        if (isFullscreen()) {
             final int height = (DeviceUtils.isInMultiWindow(activity)
                     ? requireView()
                     : activity.getWindow().getDecorView()).getHeight();
@@ -1368,8 +1416,9 @@ public final class VideoDetailFragment
         binding.detailThumbnailImageView.setMinimumHeight(newHeight);
         if (isPlayerAvailable()) {
             final int maxHeight = (int) (metrics.heightPixels * MAX_PLAYER_HEIGHT);
-            player.getSurfaceView()
-                    .setHeights(newHeight, player.isFullscreen() ? newHeight : maxHeight);
+            player.UIs().get(VideoPlayerUi.class).ifPresent(ui ->
+                    ui.getBinding().surfaceView.setHeights(newHeight,
+                            ui.isFullscreen() ? newHeight : maxHeight));
         }
     }
 
@@ -1434,7 +1483,7 @@ public final class VideoDetailFragment
                             bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
                         }
                         // Rebound to the service if it was closed via notification or mini player
-                        if (!playerHolder.bound) {
+                        if (!playerHolder.isBound()) {
                             playerHolder.startService(
                                     false, VideoDetailFragment.this);
                         }
@@ -1498,7 +1547,7 @@ public final class VideoDetailFragment
         if (binding.relatedItemsLayout != null) {
             if (showRelatedItems) {
                 binding.relatedItemsLayout.setVisibility(
-                        isPlayerAvailable() && player.isFullscreen() ? View.GONE : View.INVISIBLE);
+                        isFullscreen() ? View.GONE : View.INVISIBLE);
             } else {
                 binding.relatedItemsLayout.setVisibility(View.GONE);
             }
@@ -1521,6 +1570,8 @@ public final class VideoDetailFragment
         animate(binding.detailThumbnailPlayButton, true, 200);
         binding.detailVideoTitleView.setText(title);
 
+        binding.detailSubChannelThumbnailView.setVisibility(View.GONE);
+
         if (!isEmpty(info.getSubChannelName())) {
             displayBothUploaderAndSubChannel(info);
         } else if (!isEmpty(info.getUploaderName())) {
@@ -1530,7 +1581,8 @@ public final class VideoDetailFragment
             binding.detailUploaderThumbnailView.setVisibility(View.GONE);
         }
 
-        final Drawable buddyDrawable = AppCompatResources.getDrawable(activity, R.drawable.buddy);
+        final Drawable buddyDrawable =
+                AppCompatResources.getDrawable(activity, R.drawable.placeholder_person);
         binding.detailSubChannelThumbnailView.setImageDrawable(buddyDrawable);
         binding.detailUploaderThumbnailView.setImageDrawable(buddyDrawable);
 
@@ -1599,13 +1651,6 @@ public final class VideoDetailFragment
         binding.detailToggleSecondaryControlsView.setVisibility(View.VISIBLE);
         binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
-        sortedVideoStreams = ListHelper.getSortedStreamVideosList(
-                activity,
-                info.getVideoStreams(),
-                info.getVideoOnlyStreams(),
-                false);
-        selectedVideoStreamIndex = ListHelper
-                .getDefaultResolutionIndex(activity, sortedVideoStreams);
         updateProgressInfo(info);
         initThumbnailViews(info);
         showMetaInfoInTextView(info.getMetaInfo(), binding.detailMetaInfoTextView,
@@ -1631,8 +1676,8 @@ public final class VideoDetailFragment
             }
         }
 
-        binding.detailControlsDownload.setVisibility(info.getStreamType() == StreamType.LIVE_STREAM
-                || info.getStreamType() == StreamType.AUDIO_LIVE_STREAM ? View.GONE : View.VISIBLE);
+        binding.detailControlsDownload.setVisibility(
+                StreamTypeUtil.isLiveStream(info.getStreamType()) ? View.GONE : View.VISIBLE);
         binding.detailControlsBackground.setVisibility(info.getAudioStreams().isEmpty()
                 ? View.GONE : View.VISIBLE);
 
@@ -1673,17 +1718,11 @@ public final class VideoDetailFragment
         }
 
         try {
-            final DownloadDialog downloadDialog = DownloadDialog.newInstance(currentInfo);
-            downloadDialog.setVideoStreams(sortedVideoStreams);
-            downloadDialog.setAudioStreams(currentInfo.getAudioStreams());
-            downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
-            downloadDialog.setSubtitleStreams(currentInfo.getSubtitles());
-
+            final DownloadDialog downloadDialog = new DownloadDialog(activity, currentInfo);
             downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
         } catch (final Exception e) {
-            ErrorActivity.reportErrorInSnackbar(activity,
-                    new ErrorInfo(e, UserAction.DOWNLOAD_OPEN_DIALOG, "Showing download dialog",
-                            currentInfo));
+            ErrorUtil.showSnackbar(activity, new ErrorInfo(e, UserAction.DOWNLOAD_OPEN_DIALOG,
+                    "Showing download dialog", currentInfo));
         }
     }
 
@@ -1709,8 +1748,7 @@ public final class VideoDetailFragment
                 binding.detailPositionView.setVisibility(View.GONE);
                 // TODO: Remove this check when separation of concerns is done.
                 //  (live streams weren't getting updated because they are mixed)
-                if (!info.getStreamType().equals(StreamType.LIVE_STREAM)
-                        && !info.getStreamType().equals(StreamType.AUDIO_LIVE_STREAM)) {
+                if (!StreamTypeUtil.isLiveStream(info.getStreamType())) {
                     return;
                 }
             } else {
@@ -1771,6 +1809,11 @@ public final class VideoDetailFragment
     // Player event listener
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void onViewCreated() {
+        tryAddVideoPlayerView();
+    }
+
     @Override
     public void onQueueUpdate(final PlayQueue queue) {
         playQueue = queue;
@@ -1780,6 +1823,14 @@ public final class VideoDetailFragment
                     + title + "], playQueue = [" + playQueue + "]");
         }
 
+        // Register broadcast receiver to listen to playQueue changes
+        // and hide the overlayPlayQueueButton when the playQueue is empty / destroyed.
+        if (playQueue != null && playQueue.getBroadcastReceiver() != null) {
+            playQueue.getBroadcastReceiver().subscribe(
+                    event -> updateOverlayPlayQueueButtonVisibility()
+            );
+        }
+
         // This should be the only place where we push data to stack.
         // It will allow to have live instance of PlayQueue with actual information about
         // deleted/added items inside Channel/Playlist queue and makes possible to have
@@ -1870,9 +1921,8 @@ public final class VideoDetailFragment
     }
 
     @Override
-    public void onPlayerError(final ExoPlaybackException error) {
-        if (error.type == ExoPlaybackException.TYPE_SOURCE
-                || error.type == ExoPlaybackException.TYPE_UNEXPECTED) {
+    public void onPlayerError(final PlaybackException error, final boolean isCatchableException) {
+        if (!isCatchableException) {
             // Properly exit from fullscreen
             toggleFullscreenIfInFullscreenMode();
             hideMainPlayerOnLoadingNewStream();
@@ -1887,20 +1937,16 @@ public final class VideoDetailFragment
                     currentInfo.getUploaderName(),
                     currentInfo.getThumbnailUrl());
         }
+        updateOverlayPlayQueueButtonVisibility();
     }
 
     @Override
     public void onFullscreenStateChanged(final boolean fullscreen) {
         setupBrightness();
+        //noinspection SimplifyOptionalCallChains
         if (!isPlayerAndPlayerServiceAvailable()
-                || playerService.getView() == null
-                || player.getParentActivity() == null) {
-            return;
-        }
-
-        final View view = playerService.getView();
-        final ViewGroup parent = (ViewGroup) view.getParent();
-        if (parent == null) {
+                || !player.UIs().get(MainPlayerUi.class).isPresent()
+                || getRoot().map(View::getParent).orElse(null) == null) {
             return;
         }
 
@@ -1916,13 +1962,7 @@ public final class VideoDetailFragment
         }
         scrollToTop();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            addVideoPlayerView();
-        } else {
-            // KitKat needs a delay before addVideoPlayerView call or it reports wrong height in
-            // activity.getWindow().getDecorView().getHeight()
-            new Handler().post(this::addVideoPlayerView);
-        }
+        tryAddVideoPlayerView();
     }
 
     @Override
@@ -1934,7 +1974,7 @@ public final class VideoDetailFragment
         final boolean isLandscape = DeviceUtils.isLandscape(requireContext());
         if (DeviceUtils.isTablet(activity)
                 && (!globalScreenOrientationLocked(activity) || isLandscape)) {
-            player.toggleFullscreen();
+            player.UIs().get(MainPlayerUi.class).ifPresent(MainPlayerUi::toggleFullscreen);
             return;
         }
 
@@ -1985,10 +2025,8 @@ public final class VideoDetailFragment
         }
         activity.getWindow().getDecorView().setSystemUiVisibility(0);
         activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            activity.getWindow().setStatusBarColor(ThemeHelper.resolveColorFromAttr(
-                    requireContext(), android.R.attr.colorPrimary));
-        }
+        activity.getWindow().setStatusBarColor(ThemeHelper.resolveColorFromAttr(
+                requireContext(), android.R.attr.colorPrimary));
     }
 
     private void hideSystemUi() {
@@ -2019,8 +2057,7 @@ public final class VideoDetailFragment
         }
         activity.getWindow().getDecorView().setSystemUiVisibility(visibility);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-                && (isInMultiWindow || (isPlayerAvailable() && player.isFullscreen()))) {
+        if (isInMultiWindow || isFullscreen()) {
             activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
             activity.getWindow().setNavigationBarColor(Color.TRANSPARENT);
         }
@@ -2028,14 +2065,19 @@ public final class VideoDetailFragment
     }
 
     // Listener implementation
+    @Override
     public void hideSystemUiIfNeeded() {
-        if (isPlayerAvailable()
-                && player.isFullscreen()
+        if (isFullscreen()
                 && bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
             hideSystemUi();
         }
     }
 
+    private boolean isFullscreen() {
+        return isPlayerAvailable() && player.UIs().get(VideoPlayerUi.class)
+                .map(VideoPlayerUi::isFullscreen).orElse(false);
+    }
+
     private boolean playerIsNotStopped() {
         return isPlayerAvailable() && !player.isStopped();
     }
@@ -2058,10 +2100,7 @@ public final class VideoDetailFragment
         }
 
         final WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
-        if (!isPlayerAvailable()
-                || !player.videoPlayerSelected()
-                || !player.isFullscreen()
-                || bottomSheetState != BottomSheetBehavior.STATE_EXPANDED) {
+        if (!isFullscreen() || bottomSheetState != BottomSheetBehavior.STATE_EXPANDED) {
             // Apply system brightness when the player is not in fullscreen
             restoreDefaultBrightness();
         } else {
@@ -2085,7 +2124,7 @@ public final class VideoDetailFragment
             setAutoPlay(true);
         }
 
-        player.checkLandscape();
+        player.UIs().get(MainPlayerUi.class).ifPresent(MainPlayerUi::checkLandscape);
         // Let's give a user time to look at video information page if video is not playing
         if (globalScreenOrientationLocked(activity) && !player.isPlaying()) {
             player.play();
@@ -2139,25 +2178,48 @@ public final class VideoDetailFragment
     }
 
     private void showExternalPlaybackDialog() {
-        if (sortedVideoStreams == null) {
+        if (currentInfo == null) {
             return;
         }
-        final CharSequence[] resolutions = new CharSequence[sortedVideoStreams.size()];
-        for (int i = 0; i < sortedVideoStreams.size(); i++) {
-            resolutions[i] = sortedVideoStreams.get(i).getResolution();
-        }
-        final AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                .setNegativeButton(R.string.cancel, null)
-                .setNeutralButton(R.string.open_in_browser, (dialog, i) ->
-                        ShareUtils.openUrlInBrowser(requireActivity(), url)
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setTitle(R.string.select_quality_external_players);
+        builder.setNeutralButton(R.string.open_in_browser, (dialog, i) ->
+                ShareUtils.openUrlInBrowser(requireActivity(), url));
+
+        final List<VideoStream> videoStreamsForExternalPlayers =
+                ListHelper.getSortedStreamVideosList(
+                        activity,
+                        getUrlAndNonTorrentStreams(currentInfo.getVideoStreams()),
+                        getUrlAndNonTorrentStreams(currentInfo.getVideoOnlyStreams()),
+                        false,
+                        false
                 );
-        // Maybe there are no video streams available, show just `open in browser` button
-        if (resolutions.length > 0) {
-            builder.setSingleChoiceItems(resolutions, selectedVideoStreamIndex, (dialog, i) -> {
-                        dialog.dismiss();
-                        startOnExternalPlayer(activity, currentInfo, sortedVideoStreams.get(i));
-                    }
-            );
+
+        if (videoStreamsForExternalPlayers.isEmpty()) {
+            builder.setMessage(R.string.no_video_streams_available_for_external_players);
+            builder.setPositiveButton(R.string.ok, null);
+
+        } else {
+            final int selectedVideoStreamIndexForExternalPlayers =
+                    ListHelper.getDefaultResolutionIndex(activity, videoStreamsForExternalPlayers);
+            final CharSequence[] resolutions = videoStreamsForExternalPlayers.stream()
+                    .map(VideoStream::getResolution).toArray(CharSequence[]::new);
+
+            builder.setSingleChoiceItems(resolutions, selectedVideoStreamIndexForExternalPlayers,
+                    null);
+            builder.setNegativeButton(R.string.cancel, null);
+            builder.setPositiveButton(R.string.ok, (dialog, i) -> {
+                final int index = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
+                // We don't have to manage the index validity because if there is no stream
+                // available for external players, this code will be not executed and if there is
+                // no stream which matches the default resolution, 0 is returned by
+                // ListHelper.getDefaultResolutionIndex.
+                // The index cannot be outside the bounds of the list as its always between 0 and
+                // the list size - 1, .
+                startOnExternalPlayer(activity, currentInfo,
+                        videoStreamsForExternalPlayers.get(index));
+            });
         }
         builder.show();
     }
@@ -2198,12 +2260,20 @@ public final class VideoDetailFragment
             mainFragment.setDescendantFocusability(afterDescendants);
             toolbar.setDescendantFocusability(afterDescendants);
             ((ViewGroup) requireView()).setDescendantFocusability(blockDescendants);
-            mainFragment.requestFocus();
+            // Only focus the mainFragment if the mainFragment (e.g. search-results)
+            // or the toolbar (e.g. Textfield for search) don't have focus.
+            // This was done to fix problems with the keyboard input, see also #7490
+            if (!mainFragment.hasFocus() && !toolbar.hasFocus()) {
+                mainFragment.requestFocus();
+            }
         } else {
             mainFragment.setDescendantFocusability(blockDescendants);
             toolbar.setDescendantFocusability(blockDescendants);
             ((ViewGroup) requireView()).setDescendantFocusability(afterDescendants);
-            binding.detailThumbnailRootLayout.requestFocus();
+            // Only focus the player if it not already has focus
+            if (!binding.getRoot().hasFocus()) {
+                binding.detailThumbnailRootLayout.requestFocus();
+            }
         }
     }
 
@@ -2238,7 +2308,9 @@ public final class VideoDetailFragment
 
         final FrameLayout bottomSheetLayout = activity.findViewById(R.id.fragment_player_holder);
         bottomSheetBehavior = BottomSheetBehavior.from(bottomSheetLayout);
-        bottomSheetBehavior.setState(bottomSheetState);
+        bottomSheetBehavior.setState(lastStableBottomSheetState);
+        updateBottomSheetState(lastStableBottomSheetState);
+
         final int peekHeight = getResources().getDimensionPixelSize(R.dimen.mini_player_height);
         if (bottomSheetState != BottomSheetBehavior.STATE_HIDDEN) {
             manageSpaceAtTheBottom(false);
@@ -2251,10 +2323,10 @@ public final class VideoDetailFragment
             }
         }
 
-        bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+        bottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull final View bottomSheet, final int newState) {
-                bottomSheetState = newState;
+                updateBottomSheetState(newState);
 
                 switch (newState) {
                     case BottomSheetBehavior.STATE_HIDDEN:
@@ -2277,10 +2349,10 @@ public final class VideoDetailFragment
                         if (DeviceUtils.isLandscape(requireContext())
                                 && isPlayerAvailable()
                                 && player.isPlaying()
-                                && !player.isFullscreen()
-                                && !DeviceUtils.isTablet(activity)
-                                && player.videoPlayerSelected()) {
-                            player.toggleFullscreen();
+                                && !isFullscreen()
+                                && !DeviceUtils.isTablet(activity)) {
+                            player.UIs().get(MainPlayerUi.class)
+                                    .ifPresent(MainPlayerUi::toggleFullscreen);
                         }
                         setOverlayLook(binding.appBarLayout, behavior, 1);
                         break;
@@ -2293,19 +2365,26 @@ public final class VideoDetailFragment
                         // Re-enable clicks
                         setOverlayElementsClickable(true);
                         if (isPlayerAvailable()) {
-                            player.closeItemsList();
+                            player.UIs().get(MainPlayerUi.class)
+                                    .ifPresent(MainPlayerUi::closeItemsList);
                         }
                         setOverlayLook(binding.appBarLayout, behavior, 0);
                         break;
                     case BottomSheetBehavior.STATE_DRAGGING:
                     case BottomSheetBehavior.STATE_SETTLING:
-                        if (isPlayerAvailable() && player.isFullscreen()) {
+                        if (isFullscreen()) {
                             showSystemUi();
                         }
-                        if (isPlayerAvailable() && player.isControlsVisible()) {
-                            player.hideControls(0, 0);
+                        if (isPlayerAvailable()) {
+                            player.UIs().get(MainPlayerUi.class).ifPresent(ui -> {
+                                if (ui.isControlsVisible()) {
+                                    ui.hideControls(0, 0);
+                                }
+                            });
                         }
                         break;
+                    case BottomSheetBehavior.STATE_HALF_EXPANDED:
+                        break;
                 }
             }
 
@@ -2313,7 +2392,9 @@ public final class VideoDetailFragment
             public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
                 setOverlayLook(binding.appBarLayout, behavior, slideOffset);
             }
-        });
+        };
+
+        bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);
 
         // User opened a new page and the player will hide itself
         activity.getSupportFragmentManager().addOnBackStackChangedListener(() -> {
@@ -2323,13 +2404,25 @@ public final class VideoDetailFragment
         });
     }
 
+    private void updateOverlayPlayQueueButtonVisibility() {
+        final boolean isPlayQueueEmpty =
+                player == null // no player => no play queue :)
+                        || player.getPlayQueue() == null
+                        || player.getPlayQueue().isEmpty();
+        if (binding != null) {
+            // binding is null when rotating the device...
+            binding.overlayPlayQueueButton.setVisibility(
+                    isPlayQueueEmpty ? View.GONE : View.VISIBLE);
+        }
+    }
+
     private void updateOverlayData(@Nullable final String overlayTitle,
                                    @Nullable final String uploader,
                                    @Nullable final String thumbnailUrl) {
         binding.overlayTitleTextView.setText(isEmpty(overlayTitle) ? "" : overlayTitle);
         binding.overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
-        binding.overlayThumbnail.setImageResource(R.drawable.dummy_thumbnail_dark);
-        PicassoHelper.loadThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
+        binding.overlayThumbnail.setImageDrawable(null);
+        PicassoHelper.loadDetailsThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
                 .into(binding.overlayThumbnail);
     }
 
@@ -2361,6 +2454,7 @@ public final class VideoDetailFragment
         binding.overlayMetadataLayout.setClickable(enable);
         binding.overlayMetadataLayout.setLongClickable(enable);
         binding.overlayButtonsLayout.setClickable(enable);
+        binding.overlayPlayQueueButton.setClickable(enable);
         binding.overlayPlayPauseButton.setClickable(enable);
         binding.overlayCloseButton.setClickable(enable);
     }
@@ -2377,4 +2471,21 @@ public final class VideoDetailFragment
     boolean isPlayerAndPlayerServiceAvailable() {
         return (player != null && playerService != null);
     }
+
+    public Optional<View> getRoot() {
+        if (player == null) {
+            return Optional.empty();
+        }
+
+        return player.UIs().get(VideoPlayerUi.class)
+                .map(playerUi -> playerUi.getBinding().getRoot());
+    }
+
+    private void updateBottomSheetState(final int newState) {
+        bottomSheetState = newState;
+        if (newState != BottomSheetBehavior.STATE_DRAGGING
+                && newState != BottomSheetBehavior.STATE_SETTLING) {
+            lastStableBottomSheetState = newState;
+        }
+    }
 }

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

@@ -1,7 +1,12 @@
 package org.schabi.newpipe.fragments.detail;
 
+import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW;
+import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_DECODING_FAILED;
+import static com.google.android.exoplayer2.PlaybackException.ERROR_CODE_UNSPECIFIED;
+
 import android.content.Context;
 import android.util.Log;
+import android.util.Pair;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -15,6 +20,7 @@ import androidx.appcompat.app.AlertDialog;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.PlaybackException;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
@@ -23,9 +29,7 @@ import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.function.Supplier;
 
 /**
@@ -38,46 +42,34 @@ public final class VideoDetailPlayerCrasher {
     // https://stackoverflow.com/a/54744028
     private static final String TAG = "VideoDetPlayerCrasher";
 
-    private static final Map<String, Supplier<ExoPlaybackException>> AVAILABLE_EXCEPTION_TYPES =
-            getExceptionTypes();
+    private static final String DEFAULT_MSG = "Dummy";
+
+    private static final List<Pair<String, Supplier<ExoPlaybackException>>>
+            AVAILABLE_EXCEPTION_TYPES = List.of(
+                    new Pair<>("Source", () -> ExoPlaybackException.createForSource(
+                            new IOException(DEFAULT_MSG),
+                            ERROR_CODE_BEHIND_LIVE_WINDOW
+                    )),
+                    new Pair<>("Renderer", () -> ExoPlaybackException.createForRenderer(
+                            new Exception(DEFAULT_MSG),
+                            "Dummy renderer",
+                            0,
+                            null,
+                            C.FORMAT_HANDLED,
+                            /*isRecoverable=*/false,
+                            ERROR_CODE_DECODING_FAILED
+                    )),
+                    new Pair<>("Unexpected", () -> ExoPlaybackException.createForUnexpected(
+                            new RuntimeException(DEFAULT_MSG),
+                            ERROR_CODE_UNSPECIFIED
+                    )),
+                    new Pair<>("Remote", () -> ExoPlaybackException.createForRemote(DEFAULT_MSG))
+            );
 
     private VideoDetailPlayerCrasher() {
         // No impls
     }
 
-    private static Map<String, Supplier<ExoPlaybackException>> getExceptionTypes() {
-        final String defaultMsg = "Dummy";
-        final Map<String, Supplier<ExoPlaybackException>> exceptionTypes = new LinkedHashMap<>();
-        exceptionTypes.put(
-                "Source",
-                () -> ExoPlaybackException.createForSource(
-                        new IOException(defaultMsg)
-                )
-        );
-        exceptionTypes.put(
-                "Renderer",
-                () -> ExoPlaybackException.createForRenderer(
-                        new Exception(defaultMsg),
-                        "Dummy renderer",
-                        0,
-                        null,
-                        C.FORMAT_HANDLED
-                )
-        );
-        exceptionTypes.put(
-                "Unexpected",
-                () -> ExoPlaybackException.createForUnexpected(
-                        new RuntimeException(defaultMsg)
-                )
-        );
-        exceptionTypes.put(
-                "Remote",
-                () -> ExoPlaybackException.createForRemote(defaultMsg)
-        );
-
-        return Collections.unmodifiableMap(exceptionTypes);
-    }
-
     private static Context getThemeWrapperContext(final Context context) {
         return new ContextThemeWrapper(
                 context,
@@ -88,8 +80,7 @@ public final class VideoDetailPlayerCrasher {
 
     public static void onCrashThePlayer(
             @NonNull final Context context,
-            @Nullable final Player player,
-            @NonNull final LayoutInflater layoutInflater
+            @Nullable final Player player
     ) {
         if (player == null) {
             Log.d(TAG, "Player is not available");
@@ -100,24 +91,22 @@ public final class VideoDetailPlayerCrasher {
         }
 
         // -- Build the dialog/UI --
-
         final Context themeWrapperContext = getThemeWrapperContext(context);
-
         final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
-        final RadioGroup radioGroup = SingleChoiceDialogViewBinding.inflate(layoutInflater)
-                .list;
 
-        final AlertDialog alertDialog = new AlertDialog.Builder(getThemeWrapperContext(context))
+        final SingleChoiceDialogViewBinding binding =
+                SingleChoiceDialogViewBinding.inflate(inflater);
+
+        final AlertDialog alertDialog = new AlertDialog.Builder(themeWrapperContext)
                 .setTitle("Choose an exception")
-                .setView(radioGroup)
+                .setView(binding.getRoot())
                 .setCancelable(true)
                 .setNegativeButton(R.string.cancel, null)
                 .create();
 
-        for (final Map.Entry<String, Supplier<ExoPlaybackException>> entry
-                : AVAILABLE_EXCEPTION_TYPES.entrySet()) {
+        for (final Pair<String, Supplier<ExoPlaybackException>> entry : AVAILABLE_EXCEPTION_TYPES) {
             final RadioButton radioButton = ListRadioIconItemBinding.inflate(inflater).getRoot();
-            radioButton.setText(entry.getKey());
+            radioButton.setText(entry.first);
             radioButton.setChecked(false);
             radioButton.setLayoutParams(
                     new RadioGroup.LayoutParams(
@@ -126,12 +115,10 @@ public final class VideoDetailPlayerCrasher {
                     )
             );
             radioButton.setOnClickListener(v -> {
-                tryCrashPlayerWith(player, entry.getValue().get());
-                if (alertDialog != null) {
-                    alertDialog.cancel();
-                }
+                tryCrashPlayerWith(player, entry.second.get());
+                alertDialog.cancel();
             });
-            radioGroup.addView(radioButton);
+            binding.list.addView(radioButton);
         }
 
         alertDialog.show();
@@ -139,7 +126,7 @@ public final class VideoDetailPlayerCrasher {
 
     /**
      * Note that this method does not crash the underlying exoplayer directly (it's not possible).
-     * It simply supplies a Exception to {@link Player#onPlayerError(ExoPlaybackException)}.
+     * It simply supplies a Exception to {@link Player#onPlayerError(PlaybackException)}.
      * @param player
      * @param exception
      */

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

@@ -1,9 +1,10 @@
 package org.schabi.newpipe.fragments.list;
 
-import android.app.Activity;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
+
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.Log;
@@ -17,37 +18,24 @@ import androidx.appcompat.app.ActionBar;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewbinding.ViewBinding;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.PignateFooterBinding;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
-import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
-import org.schabi.newpipe.player.helper.PlayerHolder;
-import org.schabi.newpipe.util.external_communication.KoreUtils;
+import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
-import org.schabi.newpipe.util.StreamDialogEntry;
+import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.SuperScrollLayoutManager;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Queue;
-
-import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
+import java.util.function.Supplier;
 
 public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         implements ListViewContract<I, N>, StateSaver.WriteRead,
@@ -79,11 +67,6 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         }
     }
 
-    @Override
-    public void onDetach() {
-        super.onDetach();
-    }
-
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -220,14 +203,10 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
     //////////////////////////////////////////////////////////////////////////*/
 
     @Nullable
-    protected ViewBinding getListHeader() {
+    protected Supplier<View> getListHeaderSupplier() {
         return null;
     }
 
-    protected ViewBinding getListFooter() {
-        return PignateFooterBinding.inflate(activity.getLayoutInflater(), itemsList, false);
-    }
-
     protected RecyclerView.LayoutManager getListLayoutManager() {
         return new SuperScrollLayoutManager(activity);
     }
@@ -252,11 +231,10 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
         infoListAdapter.setUseGridVariant(useGrid);
-        infoListAdapter.setFooter(getListFooter().getRoot());
 
-        final ViewBinding listHeader = getListHeader();
-        if (listHeader != null) {
-            infoListAdapter.setHeader(listHeader.getRoot());
+        final Supplier<View> listHeaderSupplier = getListHeaderSupplier();
+        if (listHeaderSupplier != null) {
+            infoListAdapter.setHeaderSupplier(listHeaderSupplier);
         }
 
         itemsList.setAdapter(infoListAdapter);
@@ -271,7 +249,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
     @Override
     protected void initListeners() {
         super.initListeners();
-        infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<StreamInfoItem>() {
+        infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<>() {
             @Override
             public void selected(final StreamInfoItem selectedItem) {
                 onStreamSelected(selectedItem);
@@ -279,56 +257,116 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
 
             @Override
             public void held(final StreamInfoItem selectedItem) {
-                showStreamDialog(selectedItem);
+                showInfoItemDialog(selectedItem);
             }
         });
 
-        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
-            @Override
-            public void selected(final ChannelInfoItem selectedItem) {
-                try {
-                    onItemSelected(selectedItem);
-                    NavigationHelper.openChannelFragment(getFM(),
-                            selectedItem.getServiceId(),
-                            selectedItem.getUrl(),
-                            selectedItem.getName());
-                } catch (final Exception e) {
-                    ErrorActivity.reportUiErrorInSnackbar(
-                            BaseListFragment.this, "Opening channel fragment", e);
-                }
-            }
-        });
-
-        infoListAdapter.setOnPlaylistSelectedListener(new OnClickGesture<PlaylistInfoItem>() {
-            @Override
-            public void selected(final PlaylistInfoItem selectedItem) {
-                try {
-                    onItemSelected(selectedItem);
-                    NavigationHelper.openPlaylistFragment(getFM(),
-                            selectedItem.getServiceId(),
-                            selectedItem.getUrl(),
-                            selectedItem.getName());
-                } catch (final Exception e) {
-                    ErrorActivity.reportUiErrorInSnackbar(BaseListFragment.this,
-                            "Opening playlist fragment", e);
-                }
-            }
-        });
-
-        infoListAdapter.setOnCommentsSelectedListener(new OnClickGesture<CommentsInfoItem>() {
-            @Override
-            public void selected(final CommentsInfoItem selectedItem) {
+        infoListAdapter.setOnChannelSelectedListener(selectedItem -> {
+            try {
                 onItemSelected(selectedItem);
+                NavigationHelper.openChannelFragment(getFM(), selectedItem.getServiceId(),
+                        selectedItem.getUrl(), selectedItem.getName());
+            } catch (final Exception e) {
+                ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
             }
         });
 
-        itemsList.clearOnScrollListeners();
-        itemsList.addOnScrollListener(new OnScrollBelowItemsListener() {
-            @Override
-            public void onScrolledDown(final RecyclerView recyclerView) {
-                onScrollToBottom();
+        infoListAdapter.setOnPlaylistSelectedListener(selectedItem -> {
+            try {
+                onItemSelected(selectedItem);
+                NavigationHelper.openPlaylistFragment(getFM(), selectedItem.getServiceId(),
+                        selectedItem.getUrl(), selectedItem.getName());
+            } catch (final Exception e) {
+                ErrorUtil.showUiErrorSnackbar(this, "Opening playlist fragment", e);
             }
         });
+
+        infoListAdapter.setOnCommentsSelectedListener(this::onItemSelected);
+
+        // Ensure that there is always a scroll listener (e.g. when rotating the device)
+        useNormalItemListScrollListener();
+    }
+
+    /**
+     * Removes all listeners and adds the normal scroll listener to the {@link #itemsList}.
+     */
+    protected void useNormalItemListScrollListener() {
+        if (DEBUG) {
+            Log.d(TAG, "useNormalItemListScrollListener called");
+        }
+        itemsList.clearOnScrollListeners();
+        itemsList.addOnScrollListener(new DefaultItemListOnScrolledDownListener());
+    }
+
+    /**
+     * Removes all listeners and adds the initial scroll listener to the {@link #itemsList}.
+     * <br/>
+     * Which tries to load more items when not enough are in the view (not scrollable)
+     * and more are available.
+     * <br/>
+     * Note: This method only works because "This callback will also be called if visible
+     * item range changes after a layout calculation. In that case, dx and dy will be 0."
+     * - which might be unexpected because no actual scrolling occurs...
+     * <br/>
+     * This listener will be replaced by DefaultItemListOnScrolledDownListener when
+     * <ul>
+     *     <li>the view was actually scrolled</li>
+     *     <li>the view is scrollable</li>
+     *     <li>no more items can be loaded</li>
+     * </ul>
+     */
+    protected void useInitialItemListLoadScrollListener() {
+        if (DEBUG) {
+            Log.d(TAG, "useInitialItemListLoadScrollListener called");
+        }
+        itemsList.clearOnScrollListeners();
+        itemsList.addOnScrollListener(new DefaultItemListOnScrolledDownListener() {
+            @Override
+            public void onScrolled(@NonNull final RecyclerView recyclerView,
+                                   final int dx, final int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+
+                if (dy != 0) {
+                    log("Vertical scroll occurred");
+
+                    useNormalItemListScrollListener();
+                    return;
+                }
+                if (isLoading.get()) {
+                    log("Still loading data -> Skipping");
+                    return;
+                }
+                if (!hasMoreItems()) {
+                    log("No more items to load");
+
+                    useNormalItemListScrollListener();
+                    return;
+                }
+                if (itemsList.canScrollVertically(1)
+                        || itemsList.canScrollVertically(-1)) {
+                    log("View is scrollable");
+
+                    useNormalItemListScrollListener();
+                    return;
+                }
+
+                log("Loading more data");
+                loadMoreItems();
+            }
+
+            private void log(final String msg) {
+                if (DEBUG) {
+                    Log.d(TAG, "initItemListLoadScrollListener - " + msg);
+                }
+            }
+        });
+    }
+
+    class DefaultItemListOnScrolledDownListener extends OnScrollBelowItemsListener {
+        @Override
+        public void onScrolledDown(final RecyclerView recyclerView) {
+            onScrollToBottom();
+        }
     }
 
     private void onStreamSelected(final StreamInfoItem selectedItem) {
@@ -344,55 +382,12 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
         }
     }
 
-    protected void showStreamDialog(final StreamInfoItem item) {
-        final Context context = getContext();
-        final Activity activity = getActivity();
-        if (context == null || context.getResources() == null || activity == null) {
-            return;
+    protected void showInfoItemDialog(final StreamInfoItem item) {
+        try {
+            new InfoItemDialog.Builder(getActivity(), getContext(), this, item).create().show();
+        } catch (final IllegalArgumentException e) {
+            InfoItemDialog.Builder.reportErrorDuringInitialization(e, item);
         }
-        final List<StreamDialogEntry> entries = new ArrayList<>();
-
-        if (PlayerHolder.getInstance().isPlayerOpen()) {
-            entries.add(StreamDialogEntry.enqueue);
-
-            if (PlayerHolder.getInstance().getQueueSize() > 1) {
-                entries.add(StreamDialogEntry.enqueue_next);
-            }
-        }
-
-        if (item.getStreamType() == StreamType.AUDIO_STREAM) {
-            entries.addAll(Arrays.asList(
-                    StreamDialogEntry.start_here_on_background,
-                    StreamDialogEntry.append_playlist,
-                    StreamDialogEntry.share
-            ));
-        } else {
-            entries.addAll(Arrays.asList(
-                    StreamDialogEntry.start_here_on_background,
-                    StreamDialogEntry.start_here_on_popup,
-                    StreamDialogEntry.append_playlist,
-                    StreamDialogEntry.share
-            ));
-        }
-        entries.add(StreamDialogEntry.open_in_browser);
-        if (KoreUtils.shouldShowPlayWithKodi(context, item.getServiceId())) {
-            entries.add(StreamDialogEntry.play_with_kodi);
-        }
-
-        // show "mark as watched" only when watch history is enabled
-        if (StreamDialogEntry.shouldAddMarkAsWatched(item.getStreamType(), context)) {
-            entries.add(
-                    StreamDialogEntry.mark_as_watched
-            );
-        }
-        if (!isNullOrEmpty(item.getUploaderUrl())) {
-            entries.add(StreamDialogEntry.show_channel_details);
-        }
-
-        StreamDialogEntry.setEnabledEntries(entries);
-
-        new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context),
-                (dialog, which) -> StreamDialogEntry.clickOn(which, this, item)).show();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -418,6 +413,12 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
     // Load and handle
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    protected void startLoading(final boolean forceLoad) {
+        useInitialItemListLoadScrollListener();
+        super.startLoading(forceLoad);
+    }
+
     protected abstract void loadMoreItems();
 
     protected abstract boolean hasMoreItems();
@@ -475,15 +476,6 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I>
     }
 
     protected boolean isGridLayout() {
-        final String listMode = PreferenceManager.getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.list_view_mode_key),
-                        getString(R.string.list_view_mode_value));
-        if ("auto".equals(listMode)) {
-            final Configuration configuration = getResources().getConfiguration();
-            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
-                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
-        } else {
-            return "grid".equals(listMode);
-        }
+        return ThemeHelper.shouldUseGridLayout(activity);
     }
 }

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

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.extractor.Page;
@@ -27,8 +28,8 @@ import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-public abstract class BaseListInfoFragment<I extends ListInfo>
-        extends BaseListFragment<I, ListExtractor.InfoItemsPage> {
+public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInfo<I>>
+        extends BaseListFragment<L, ListExtractor.InfoItemsPage<I>> {
     @State
     protected int serviceId = Constants.NO_SERVICE_ID;
     @State
@@ -37,7 +38,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
     protected String url;
 
     private final UserAction errorUserAction;
-    protected I currentInfo;
+    protected L currentInfo;
     protected Page currentNextPage;
     protected Disposable currentWorker;
 
@@ -65,7 +66,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
         super.onResume();
         // Check if it was loading when the fragment was stopped/paused,
         if (wasLoading.getAndSet(false)) {
-            if (hasMoreItems() && infoListAdapter.getItemsList().size() > 0) {
+            if (hasMoreItems() && !infoListAdapter.getItemsList().isEmpty()) {
                 loadMoreItems();
             } else {
                 doInitialLoadLogic();
@@ -97,7 +98,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
     @SuppressWarnings("unchecked")
     public void readFrom(@NonNull final Queue<Object> savedObjects) throws Exception {
         super.readFrom(savedObjects);
-        currentInfo = (I) savedObjects.poll();
+        currentInfo = (L) savedObjects.poll();
         currentNextPage = (Page) savedObjects.poll();
     }
 
@@ -105,6 +106,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
     // Load and handle
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
     protected void doInitialLoadLogic() {
         if (DEBUG) {
             Log.d(TAG, "doInitialLoadLogic() called");
@@ -123,7 +125,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
      * @param forceLoad allow or disallow the result to come from the cache
      * @return Rx {@link Single} containing the {@link ListInfo}
      */
-    protected abstract Single<I> loadResult(boolean forceLoad);
+    protected abstract Single<L> loadResult(boolean forceLoad);
 
     @Override
     public void startLoading(final boolean forceLoad) {
@@ -139,7 +141,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
         currentWorker = loadResult(forceLoad)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((@NonNull I result) -> {
+                .subscribe((@NonNull L result) -> {
                     isLoading.set(false);
                     currentInfo = result;
                     currentNextPage = result.getNextPage();
@@ -156,8 +158,9 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
      *
      * @return Rx {@link Single} containing the {@link ListExtractor.InfoItemsPage}
      */
-    protected abstract Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic();
+    protected abstract Single<ListExtractor.InfoItemsPage<I>> loadMoreItemsLogic();
 
+    @Override
     protected void loadMoreItems() {
         isLoading.set(true);
 
@@ -171,9 +174,9 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .doFinally(this::allowDownwardFocusScroll)
-                .subscribe((@NonNull ListExtractor.InfoItemsPage InfoItemsPage) -> {
+                .subscribe(infoItemsPage -> {
                     isLoading.set(false);
-                    handleNextItems(InfoItemsPage);
+                    handleNextItems(infoItemsPage);
                 }, (@NonNull Throwable throwable) ->
                         dynamicallyShowErrorPanelOrSnackbar(new ErrorInfo(throwable,
                                 errorUserAction, "Loading more items: " + url, serviceId)));
@@ -192,7 +195,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
     }
 
     @Override
-    public void handleNextItems(final ListExtractor.InfoItemsPage result) {
+    public void handleNextItems(final ListExtractor.InfoItemsPage<I> result) {
         super.handleNextItems(result);
 
         currentNextPage = result.getNextPage();
@@ -216,14 +219,14 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void handleResult(@NonNull final I result) {
+    public void handleResult(@NonNull final L result) {
         super.handleResult(result);
 
         name = result.getName();
         setTitle(name);
 
         if (infoListAdapter.getItemsList().isEmpty()) {
-            if (result.getRelatedItems().size() > 0) {
+            if (!result.getRelatedItems().isEmpty()) {
                 infoListAdapter.addInfoItemList(result.getRelatedItems());
                 showListFooter(hasMoreItems());
             } else {
@@ -240,7 +243,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
             final List<Throwable> errors = new ArrayList<>(result.getErrors());
             // handling ContentNotSupportedException not to show the error but an appropriate string
             // so that crashes won't be sent uselessly and the user will understand what happened
-            errors.removeIf(throwable -> throwable instanceof ContentNotSupportedException);
+            errors.removeIf(ContentNotSupportedException.class::isInstance);
 
             if (!errors.isEmpty()) {
                 dynamicallyShowErrorPanelOrSnackbar(new ErrorInfo(result.getErrors(),

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

@@ -1,6 +1,11 @@
 package org.schabi.newpipe.fragments.list.channel;
 
+import static org.schabi.newpipe.ktx.TextViewUtils.animateTextColor;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateBackgroundColor;
+
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -17,19 +22,19 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.core.content.ContextCompat;
-import androidx.viewbinding.ViewBinding;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.jakewharton.rxbinding4.view.RxView;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.subscription.NotificationMode;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.databinding.ChannelHeaderBinding;
 import org.schabi.newpipe.databinding.FragmentChannelBinding;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
-import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
@@ -37,19 +42,21 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
-import org.schabi.newpipe.player.MainPlayer.PlayerType;
+import org.schabi.newpipe.local.feed.notifications.NotificationHelper;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
@@ -61,11 +68,7 @@ import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-import static org.schabi.newpipe.ktx.TextViewUtils.animateTextColor;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.ktx.ViewUtils.animateBackgroundColor;
-
-public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
+public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, ChannelInfo>
         implements View.OnClickListener {
 
     private static final int BUTTON_DEBOUNCE_INTERVAL = 100;
@@ -74,6 +77,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
 
+    private boolean channelContentNotSupported = false;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -85,6 +90,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     private PlaylistControlBinding playlistControlBinding;
 
     private MenuItem menuRssButton;
+    private MenuItem menuNotifyButton;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -126,6 +132,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         channelBinding = FragmentChannelBinding.bind(rootView);
+        showContentNotSupportedIfNeeded();
     }
 
     @Override
@@ -145,12 +152,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected ViewBinding getListHeader() {
+    protected Supplier<View> getListHeaderSupplier() {
         headerBinding = ChannelHeaderBinding
                 .inflate(activity.getLayoutInflater(), itemsList, false);
         playlistControlBinding = headerBinding.playlistControl;
 
-        return headerBinding;
+        return headerBinding::getRoot;
     }
 
     @Override
@@ -180,13 +187,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                         + "menu = [" + menu + "], inflater = [" + inflater + "]");
             }
             menuRssButton = menu.findItem(R.id.menu_item_rss);
-        }
-    }
-
-    private void openRssFeed() {
-        final ChannelInfo info = currentInfo;
-        if (info != null) {
-            ShareUtils.openUrlInBrowser(requireContext(), info.getFeedUrl(), false);
+            menuNotifyButton = menu.findItem(R.id.menu_item_notify);
         }
     }
 
@@ -196,8 +197,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
             case R.id.action_settings:
                 NavigationHelper.openSettings(requireContext());
                 break;
+            case R.id.menu_item_notify:
+                final boolean value = !item.isChecked();
+                item.setEnabled(false);
+                setNotify(value);
+                break;
             case R.id.menu_item_rss:
-                openRssFeed();
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInBrowser(
+                            requireContext(), currentInfo.getFeedUrl(), false);
+                }
                 break;
             case R.id.menu_item_openInBrowser:
                 if (currentInfo != null) {
@@ -237,15 +246,22 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                 .subscribe(getSubscribeUpdateMonitor(info), onError));
 
         disposables.add(observable
-                // Some updates are very rapid
-                // (for example when calling the updateSubscription(info))
-                // so only update the UI for the latest emission
-                // ("sync" the subscribe button's state)
-                .debounce(100, TimeUnit.MILLISECONDS)
+                .map(List::isEmpty)
+                .distinctUntilChanged()
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((List<SubscriptionEntity> subscriptionEntities) ->
-                        updateSubscribeButton(!subscriptionEntities.isEmpty()), onError));
+                .subscribe(isEmpty -> updateSubscribeButton(!isEmpty), onError));
 
+        disposables.add(observable
+                .map(List::isEmpty)
+                .distinctUntilChanged()
+                .skip(1) // channel has just been opened
+                .filter(x -> NotificationHelper.areNewStreamsNotificationsEnabled(requireContext()))
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(isEmpty -> {
+                    if (!isEmpty) {
+                        showNotifySnackbar();
+                    }
+                }, onError));
     }
 
     private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription,
@@ -325,6 +341,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                         info.getAvatarUrl(),
                         info.getDescription(),
                         info.getSubscriberCount());
+                updateNotifyButton(null);
                 subscribeButtonMonitor = monitorSubscribeButton(
                         headerBinding.channelSubscribeButton, mapOnSubscribe(channel, info));
             } else {
@@ -332,6 +349,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                     Log.d(TAG, "Found subscription to this channel!");
                 }
                 final SubscriptionEntity subscription = subscriptionEntities.get(0);
+                updateNotifyButton(subscription);
                 subscribeButtonMonitor = monitorSubscribeButton(
                         headerBinding.channelSubscribeButton, mapOnUnsubscribe(subscription));
             }
@@ -374,12 +392,51 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                 AnimationType.LIGHT_SCALE_AND_ALPHA);
     }
 
+    private void updateNotifyButton(@Nullable final SubscriptionEntity subscription) {
+        if (menuNotifyButton == null) {
+            return;
+        }
+        if (subscription != null) {
+            menuNotifyButton.setEnabled(
+                    NotificationHelper.areNewStreamsNotificationsEnabled(requireContext())
+            );
+            menuNotifyButton.setChecked(
+                    subscription.getNotificationMode() == NotificationMode.ENABLED
+            );
+        }
+
+        menuNotifyButton.setVisible(subscription != null);
+    }
+
+    private void setNotify(final boolean isEnabled) {
+        disposables.add(
+                subscriptionManager
+                        .updateNotificationMode(
+                                currentInfo.getServiceId(),
+                                currentInfo.getUrl(),
+                                isEnabled ? NotificationMode.ENABLED : NotificationMode.DISABLED)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe()
+        );
+    }
+
+    /**
+     * Show a snackbar with the option to enable notifications on new streams for this channel.
+     */
+    private void showNotifySnackbar() {
+        Snackbar.make(itemsList, R.string.you_successfully_subscribed, Snackbar.LENGTH_LONG)
+                .setAction(R.string.get_notified, v -> setNotify(true))
+                .setActionTextColor(Color.YELLOW)
+                .show();
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Load and handle
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+    protected Single<ListExtractor.InfoItemsPage<StreamInfoItem>> loadMoreItemsLogic() {
         return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextPage);
     }
 
@@ -407,7 +464,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
                                 currentInfo.getParentChannelUrl(),
                                 currentInfo.getParentChannelName());
                     } catch (final Exception e) {
-                        ErrorActivity.reportUiErrorInSnackbar(this, "Opening channel fragment", e);
+                        ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
                     }
                 } else if (DEBUG) {
                     Log.i(TAG, "Can't open parent channel because we got no channel URL");
@@ -470,9 +527,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
             playlistControlBinding.getRoot().setVisibility(View.GONE);
         }
 
+        channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {
             if (throwable instanceof ContentNotSupportedException) {
-                showContentNotSupported();
+                channelContentNotSupported = true;
+                showContentNotSupportedIfNeeded();
+                break;
             }
         }
 
@@ -504,7 +564,13 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
         });
     }
 
-    private void showContentNotSupported() {
+    private void showContentNotSupportedIfNeeded() {
+        // channelBinding might not be initialized when handleResult() is called
+        // (e.g. after rotating the screen, #6696)
+        if (!channelContentNotSupported || channelBinding == null) {
+            return;
+        }
+
         channelBinding.errorContentNotSupported.setVisibility(View.VISIBLE);
         channelBinding.channelKaomoji.setText("(︶︹︺)");
         channelBinding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
@@ -512,18 +578,13 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
     }
 
     private PlayQueue getPlayQueue() {
-        return getPlayQueue(0);
-    }
+        final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
+                .filter(StreamInfoItem.class::isInstance)
+                .map(StreamInfoItem.class::cast)
+                .collect(Collectors.toList());
 
-    private PlayQueue getPlayQueue(final int index) {
-        final List<StreamInfoItem> streamItems = new ArrayList<>();
-        for (final InfoItem i : infoListAdapter.getItemsList()) {
-            if (i instanceof StreamInfoItem) {
-                streamItems.add((StreamInfoItem) i);
-            }
-        }
         return new ChannelPlayQueue(currentInfo.getServiceId(), currentInfo.getUrl(),
-                currentInfo.getNextPage(), streamItems, index);
+                currentInfo.getNextPage(), streamItems, 0);
     }
 
     /*//////////////////////////////////////////////////////////////////////////

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

@@ -15,6 +15,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.comments.CommentsInfo;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -22,7 +23,7 @@ import org.schabi.newpipe.util.ExtractorHelper;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
-public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
+public class CommentsFragment extends BaseListInfoFragment<CommentsInfoItem, CommentsInfo> {
     private final CompositeDisposable disposables = new CompositeDisposable();
 
     private TextView emptyStateDesc;
@@ -67,7 +68,7 @@ public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+    protected Single<ListExtractor.InfoItemsPage<CommentsInfoItem>> loadMoreItemsLogic() {
         return ExtractorHelper.getMoreCommentItems(serviceId, currentInfo, currentNextPage);
     }
 

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

@@ -21,6 +21,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
@@ -53,7 +54,7 @@ import io.reactivex.rxjava3.core.Single;
  * </p>
  */
 
-public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
+public class KioskFragment extends BaseListInfoFragment<StreamInfoItem, KioskInfo> {
     @State
     String kioskId = "";
     String kioskTranslatedName;
@@ -145,7 +146,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     }
 
     @Override
-    public Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+    public Single<ListExtractor.InfoItemsPage<StreamInfoItem>> loadMoreItemsLogic() {
         return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextPage);
     }
 

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

@@ -1,6 +1,8 @@
 package org.schabi.newpipe.fragments.list.playlist;
 
-import android.app.Activity;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -15,17 +17,20 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.viewbinding.ViewBinding;
+
+import com.google.android.material.shape.CornerFamily;
+import com.google.android.material.shape.ShapeAppearanceModel;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.databinding.PlaylistHeaderBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -33,26 +38,25 @@ import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
+import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
-import org.schabi.newpipe.player.MainPlayer.PlayerType;
-import org.schabi.newpipe.player.helper.PlayerHolder;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.PicassoHelper;
-import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.StreamDialogEntry;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
@@ -60,11 +64,7 @@ import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
-
-public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
+public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, PlaylistInfo> {
 
     private static final String PICASSO_PLAYLIST_TAG = "PICASSO_PLAYLIST_TAG";
 
@@ -120,12 +120,12 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected ViewBinding getListHeader() {
+    protected Supplier<View> getListHeaderSupplier() {
         headerBinding = PlaylistHeaderBinding
                 .inflate(activity.getLayoutInflater(), itemsList, false);
         playlistControlBinding = headerBinding.playlistControl;
 
-        return headerBinding;
+        return headerBinding::getRoot;
     }
 
     @Override
@@ -140,60 +140,22 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     }
 
     @Override
-    protected void showStreamDialog(final StreamInfoItem item) {
+    protected void showInfoItemDialog(final StreamInfoItem item) {
         final Context context = getContext();
-        final Activity activity = getActivity();
-        if (context == null || context.getResources() == null || activity == null) {
-            return;
+        try {
+            final InfoItemDialog.Builder dialogBuilder =
+                    new InfoItemDialog.Builder(getActivity(), context, this, item);
+
+            dialogBuilder
+                    .setAction(
+                            StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND,
+                            (f, infoItem) -> NavigationHelper.playOnBackgroundPlayer(
+                                    context, getPlayQueueStartingAt(infoItem), true))
+                    .create()
+                    .show();
+        } catch (final IllegalArgumentException e) {
+            InfoItemDialog.Builder.reportErrorDuringInitialization(e, item);
         }
-
-        final ArrayList<StreamDialogEntry> entries = new ArrayList<>();
-
-        if (PlayerHolder.getInstance().isPlayerOpen()) {
-            entries.add(StreamDialogEntry.enqueue);
-
-            if (PlayerHolder.getInstance().getQueueSize() > 1) {
-                entries.add(StreamDialogEntry.enqueue_next);
-            }
-        }
-
-        if (item.getStreamType() == StreamType.AUDIO_STREAM) {
-            entries.addAll(Arrays.asList(
-                    StreamDialogEntry.start_here_on_background,
-                    StreamDialogEntry.append_playlist,
-                    StreamDialogEntry.share
-            ));
-        } else  {
-            entries.addAll(Arrays.asList(
-                    StreamDialogEntry.start_here_on_background,
-                    StreamDialogEntry.start_here_on_popup,
-                    StreamDialogEntry.append_playlist,
-                    StreamDialogEntry.share
-            ));
-        }
-        entries.add(StreamDialogEntry.open_in_browser);
-        if (KoreUtils.shouldShowPlayWithKodi(context, item.getServiceId())) {
-            entries.add(StreamDialogEntry.play_with_kodi);
-        }
-
-        // show "mark as watched" only when watch history is enabled
-        if (StreamDialogEntry.shouldAddMarkAsWatched(item.getStreamType(), context)) {
-            entries.add(
-                    StreamDialogEntry.mark_as_watched
-            );
-        }
-        if (!isNullOrEmpty(item.getUploaderUrl())) {
-            entries.add(StreamDialogEntry.show_channel_details);
-        }
-
-        StreamDialogEntry.setEnabledEntries(entries);
-
-        StreamDialogEntry.start_here_on_background.setCustomAction((fragment, infoItem) ->
-                NavigationHelper.playOnBackgroundPlayer(context,
-                        getPlayQueueStartingAt(infoItem), true));
-
-        new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context),
-                (dialog, which) -> StreamDialogEntry.clickOn(which, this, item)).show();
     }
 
     @Override
@@ -249,7 +211,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+    protected Single<ListExtractor.InfoItemsPage<StreamInfoItem>> loadMoreItemsLogic() {
         return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextPage);
     }
 
@@ -268,11 +230,25 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                 ShareUtils.openUrlInBrowser(requireContext(), url);
                 break;
             case R.id.menu_item_share:
-                ShareUtils.shareText(requireContext(), name, url, currentInfo.getThumbnailUrl());
+                if (currentInfo != null) {
+                    ShareUtils.shareText(requireContext(), name, url,
+                            currentInfo.getThumbnailUrl());
+                }
                 break;
             case R.id.menu_item_bookmark:
                 onBookmarkClicked();
                 break;
+            case R.id.menu_item_append_playlist:
+                disposables.add(PlaylistDialog.createCorrespondingDialog(
+                        getContext(),
+                        getPlayQueue()
+                                .getStreams()
+                                .stream()
+                                .map(StreamEntity::new)
+                                .collect(Collectors.toList()),
+                        dialog -> dialog.show(getFM(), TAG)
+                ));
+                break;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -310,7 +286,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                         NavigationHelper.openChannelFragment(getFM(), result.getServiceId(),
                                 result.getUploaderUrl(), result.getUploaderName());
                     } catch (final Exception e) {
-                        ErrorActivity.reportUiErrorInSnackbar(this, "Opening channel fragment", e);
+                        ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
                     }
                 });
             }
@@ -325,9 +301,12 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                 && (YoutubeParsingHelper.isYoutubeMixId(result.getId())
                 || YoutubeParsingHelper.isYoutubeMusicMixId(result.getId()))) {
             // this is an auto-generated playlist (e.g. Youtube mix), so a radio is shown
-            headerBinding.uploaderAvatarView.setDisableCircularTransformation(true);
-            headerBinding.uploaderAvatarView.setBorderColor(
-                    getResources().getColor(R.color.transparent_background_color));
+            final ShapeAppearanceModel model = ShapeAppearanceModel.builder()
+                    .setAllCorners(CornerFamily.ROUNDED, 0f)
+                    .build(); // this turns the image back into a square
+            headerBinding.uploaderAvatarView.setShapeAppearanceModel(model);
+            headerBinding.uploaderAvatarView.setStrokeColor(AppCompatResources
+                    .getColorStateList(requireContext(), R.color.transparent_background_color));
             headerBinding.uploaderAvatarView.setImageDrawable(
                     AppCompatResources.getDrawable(requireContext(),
                     R.drawable.ic_radio)
@@ -410,7 +389,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     }
 
     private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
-        return new Subscriber<List<PlaylistRemoteEntity>>() {
+        return new Subscriber<>() {
             @Override
             public void onSubscribe(final Subscription s) {
                 if (bookmarkReactor != null) {

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

@@ -1,5 +1,10 @@
 package org.schabi.newpipe.fragments.list.search;
 
+import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
+import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
+import static java.util.Arrays.asList;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -20,7 +25,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -29,17 +33,15 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.TooltipCompat;
-import androidx.core.content.ContextCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 import org.schabi.newpipe.databinding.FragmentSearchBinding;
-import org.schabi.newpipe.error.ErrorActivity;
 import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.ReCaptchaActivity;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.InfoItem;
@@ -61,6 +63,7 @@ import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.KeyboardUtil;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 
@@ -68,12 +71,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -84,11 +86,6 @@ import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 
-import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
-import static java.util.Arrays.asList;
-import static org.schabi.newpipe.ktx.ViewUtils.animate;
-import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
-
 public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.InfoItemsPage<?>>
         implements BackPressable {
     /*//////////////////////////////////////////////////////////////////////////
@@ -203,7 +200,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         showLocalSuggestions = NewPipeSettings.showLocalSearchSuggestions(activity, prefs);
         showRemoteSuggestions = NewPipeSettings.showRemoteSearchSuggestions(activity, prefs);
 
-        suggestionListAdapter = new SuggestionListAdapter(activity);
+        suggestionListAdapter = new SuggestionListAdapter();
         historyRecordManager = new HistoryRecordManager(context);
     }
 
@@ -225,8 +222,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         try {
             service = NewPipe.getService(serviceId);
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(this,
-                    "Getting service for id " + serviceId, e);
+            ErrorUtil.showUiErrorSnackbar(this, "Getting service for id " + serviceId, e);
         }
     }
 
@@ -344,6 +340,8 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         super.initViews(rootView, savedInstanceState);
 
         searchBinding.suggestionsList.setAdapter(suggestionListAdapter);
+        // animations are just strange and useless, since the suggestions keep changing too much
+        searchBinding.suggestionsList.setItemAnimator(null);
         new ItemTouchHelper(new ItemTouchHelper.Callback() {
             @Override
             public int getMovementFlags(@NonNull final RecyclerView recyclerView,
@@ -501,9 +499,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                     + lastSearchedString);
         }
         searchEditText.setText(searchString);
-        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
-            searchEditText.setHintTextColor(searchEditText.getTextColors().withAlpha(128));
-        }
 
         if (TextUtils.isEmpty(searchString) || TextUtils.isEmpty(searchEditText.getText())) {
             searchToolbarContainer.setTranslationX(100);
@@ -537,7 +532,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             searchBinding.correctSuggestion.setVisibility(View.GONE);
 
             searchEditText.setText("");
-            suggestionListAdapter.setItems(new ArrayList<>());
+            suggestionListAdapter.submitList(null);
             showKeyboardSearch();
         });
 
@@ -673,31 +668,15 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         if (DEBUG) {
             Log.d(TAG, "showKeyboardSearch() called");
         }
-        if (searchEditText == null) {
-            return;
-        }
-
-        if (searchEditText.requestFocus()) {
-            final InputMethodManager imm = ContextCompat.getSystemService(activity,
-                    InputMethodManager.class);
-            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_FORCED);
-        }
+        KeyboardUtil.showKeyboard(activity, searchEditText);
     }
 
     private void hideKeyboardSearch() {
         if (DEBUG) {
             Log.d(TAG, "hideKeyboardSearch() called");
         }
-        if (searchEditText == null) {
-            return;
-        }
 
-        final InputMethodManager imm = ContextCompat.getSystemService(activity,
-                InputMethodManager.class);
-        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(),
-                InputMethodManager.RESULT_UNCHANGED_SHOWN);
-
-        searchEditText.clearFocus();
+        KeyboardUtil.hideKeyboard(activity, searchEditText);
     }
 
     private void showDeleteSuggestionDialog(final SuggestionItem item) {
@@ -727,7 +706,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     @Override
     public boolean onBackPressed() {
         if (suggestionsPanelVisible
-                && infoListAdapter.getItemsList().size() > 0
+                && !infoListAdapter.getItemsList().isEmpty()
                 && !isLoading.get()) {
             hideSuggestionsPanel();
             hideKeyboardSearch();
@@ -743,13 +722,10 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         return historyRecordManager
                 .getRelatedSearches(query, similarQueryLimit, 25)
                 .toObservable()
-                .map(searchHistoryEntries -> {
-                    final Set<SuggestionItem> result = new HashSet<>(); // remove duplicates
-                    for (final SearchHistoryEntry entry : searchHistoryEntries) {
-                        result.add(new SuggestionItem(true, entry.getSearch()));
-                    }
-                    return new ArrayList<>(result);
-                });
+                .map(searchHistoryEntries ->
+                    searchHistoryEntries.stream()
+                            .map(entry -> new SuggestionItem(true, entry))
+                            .collect(Collectors.toList()));
     }
 
     private Observable<List<SuggestionItem>> getRemoteSuggestionsObservable(final String query) {
@@ -945,7 +921,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         filterItemCheckedId = item.getItemId();
         item.setChecked(true);
 
-        contentFilter = new String[]{theContentFilter.get(0)};
+        contentFilter = theContentFilter.toArray(new String[0]);
 
         if (!TextUtils.isEmpty(searchString)) {
             search(searchString, contentFilter, sortFilter);
@@ -970,8 +946,8 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         if (DEBUG) {
             Log.d(TAG, "handleSuggestions() called with: suggestions = [" + suggestions + "]");
         }
-        searchBinding.suggestionsList.smoothScrollToPosition(0);
-        searchBinding.suggestionsList.post(() -> suggestionListAdapter.setItems(suggestions));
+        suggestionListAdapter.submitList(suggestions,
+                () -> searchBinding.suggestionsList.scrollToPosition(0));
 
         if (suggestionsPanelVisible && isErrorPanelVisible()) {
             hideLoading();
@@ -1006,8 +982,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         isCorrectedSearch = result.isCorrectedSearch();
 
         // List<MetaInfo> cannot be bundled without creating some containers
-        metaInfo = new MetaInfo[result.getMetaInfo().size()];
-        metaInfo = result.getMetaInfo().toArray(metaInfo);
+        metaInfo = result.getMetaInfo().toArray(new MetaInfo[0]);
         showMetaInfoInTextView(result.getMetaInfo(), searchBinding.searchMetaInfoTextView,
                 searchBinding.searchMetaInfoSeparator, disposables);
 
@@ -1093,14 +1068,14 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             return 0;
         }
 
-        final SuggestionItem item = suggestionListAdapter.getItem(position);
+        final SuggestionItem item = suggestionListAdapter.getCurrentList().get(position);
         return item.fromHistory ? makeMovementFlags(0,
                 ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) : 0;
     }
 
     public void onSuggestionItemSwiped(@NonNull final RecyclerView.ViewHolder viewHolder) {
         final int position = viewHolder.getBindingAdapterPosition();
-        final String query = suggestionListAdapter.getItem(position).query;
+        final String query = suggestionListAdapter.getCurrentList().get(position).query;
         final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(

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

@@ -1,80 +1,58 @@
 package org.schabi.newpipe.fragments.list.search;
 
-import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.schabi.newpipe.R;
-
-import java.util.ArrayList;
-import java.util.List;
+import org.schabi.newpipe.databinding.ItemSearchSuggestionBinding;
 
 public class SuggestionListAdapter
-        extends RecyclerView.Adapter<SuggestionListAdapter.SuggestionItemHolder> {
-    private final ArrayList<SuggestionItem> items = new ArrayList<>();
-    private final Context context;
+        extends ListAdapter<SuggestionItem, SuggestionListAdapter.SuggestionItemHolder> {
     private OnSuggestionItemSelected listener;
 
-    public SuggestionListAdapter(final Context context) {
-        this.context = context;
-    }
-
-    public void setItems(final List<SuggestionItem> items) {
-        this.items.clear();
-        this.items.addAll(items);
-        notifyDataSetChanged();
+    public SuggestionListAdapter() {
+        super(new SuggestionItemCallback());
     }
 
     public void setListener(final OnSuggestionItemSelected listener) {
         this.listener = listener;
     }
 
+    @NonNull
     @Override
-    public SuggestionItemHolder onCreateViewHolder(final ViewGroup parent, final int viewType) {
-        return new SuggestionItemHolder(LayoutInflater.from(context)
-                .inflate(R.layout.item_search_suggestion, parent, false));
+    public SuggestionItemHolder onCreateViewHolder(@NonNull final ViewGroup parent,
+                                                   final int viewType) {
+        return new SuggestionItemHolder(ItemSearchSuggestionBinding
+                .inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
     public void onBindViewHolder(final SuggestionItemHolder holder, final int position) {
         final SuggestionItem currentItem = getItem(position);
         holder.updateFrom(currentItem);
-        holder.queryView.setOnClickListener(v -> {
+        holder.itemBinding.suggestionSearch.setOnClickListener(v -> {
             if (listener != null) {
                 listener.onSuggestionItemSelected(currentItem);
             }
         });
-        holder.queryView.setOnLongClickListener(v -> {
+        holder.itemBinding.suggestionSearch.setOnLongClickListener(v -> {
             if (listener != null) {
                 listener.onSuggestionItemLongClick(currentItem);
             }
             return true;
         });
-        holder.insertView.setOnClickListener(v -> {
+        holder.itemBinding.suggestionInsert.setOnClickListener(v -> {
             if (listener != null) {
                 listener.onSuggestionItemInserted(currentItem);
             }
         });
     }
 
-    SuggestionItem getItem(final int position) {
-        return items.get(position);
-    }
-
-    @Override
-    public int getItemCount() {
-        return items.size();
-    }
-
-    public boolean isEmpty() {
-        return getItemCount() == 0;
-    }
-
     public interface OnSuggestionItemSelected {
         void onSuggestionItemSelected(SuggestionItem item);
 
@@ -84,30 +62,32 @@ public class SuggestionListAdapter
     }
 
     public static final class SuggestionItemHolder extends RecyclerView.ViewHolder {
-        private final TextView itemSuggestionQuery;
-        private final ImageView suggestionIcon;
-        private final View queryView;
-        private final View insertView;
+        private final ItemSearchSuggestionBinding itemBinding;
 
-        // Cache some ids, as they can potentially be constantly updated/recycled
-        private final int historyResId;
-        private final int searchResId;
-
-        private SuggestionItemHolder(final View rootView) {
-            super(rootView);
-            suggestionIcon = rootView.findViewById(R.id.item_suggestion_icon);
-            itemSuggestionQuery = rootView.findViewById(R.id.item_suggestion_query);
-
-            queryView = rootView.findViewById(R.id.suggestion_search);
-            insertView = rootView.findViewById(R.id.suggestion_insert);
-
-            historyResId = R.drawable.ic_history;
-            searchResId = R.drawable.ic_search;
+        private SuggestionItemHolder(final ItemSearchSuggestionBinding binding) {
+            super(binding.getRoot());
+            this.itemBinding = binding;
         }
 
         private void updateFrom(final SuggestionItem item) {
-            suggestionIcon.setImageResource(item.fromHistory ? historyResId : searchResId);
-            itemSuggestionQuery.setText(item.query);
+            itemBinding.itemSuggestionIcon.setImageResource(item.fromHistory ? R.drawable.ic_history
+                    : R.drawable.ic_search);
+            itemBinding.itemSuggestionQuery.setText(item.query);
+        }
+    }
+
+    private static class SuggestionItemCallback extends DiffUtil.ItemCallback<SuggestionItem> {
+        @Override
+        public boolean areItemsTheSame(@NonNull final SuggestionItem oldItem,
+                                       @NonNull final SuggestionItem newItem) {
+            return oldItem.fromHistory == newItem.fromHistory
+                    && oldItem.query.equals(newItem.query);
+        }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull final SuggestionItem oldItem,
+                                          @NonNull final SuggestionItem newItem) {
+            return true; // items' contents never change; the list of items themselves does
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.fragments.list.videos;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,11 +11,11 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
-import androidx.viewbinding.ViewBinding;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.RelatedItemsHeaderBinding;
 import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
@@ -24,14 +23,14 @@ import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.util.RelatedItemInfo;
 
 import java.io.Serializable;
+import java.util.function.Supplier;
 
 import io.reactivex.rxjava3.core.Single;
-import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
-public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
+public class RelatedItemsFragment extends BaseListInfoFragment<InfoItem, RelatedItemInfo>
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String INFO_KEY = "related_info_key";
-    private final CompositeDisposable disposables = new CompositeDisposable();
+
     private RelatedItemInfo relatedItemInfo;
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -54,11 +53,6 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onAttach(@NonNull final Context context) {
-        super.onAttach(context);
-    }
-
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater,
                              @Nullable final ViewGroup container,
@@ -66,12 +60,6 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
         return inflater.inflate(R.layout.fragment_related_items, container, false);
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        disposables.clear();
-    }
-
     @Override
     public void onDestroyView() {
         headerBinding = null;
@@ -79,26 +67,27 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
     }
 
     @Override
-    protected ViewBinding getListHeader() {
-        if (relatedItemInfo != null && relatedItemInfo.getRelatedItems() != null) {
-            headerBinding = RelatedItemsHeaderBinding
-                    .inflate(activity.getLayoutInflater(), itemsList, false);
-
-            final SharedPreferences pref = PreferenceManager
-                    .getDefaultSharedPreferences(requireContext());
-            final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
-            headerBinding.autoplaySwitch.setChecked(autoplay);
-            headerBinding.autoplaySwitch.setOnCheckedChangeListener((compoundButton, b) ->
-                    PreferenceManager.getDefaultSharedPreferences(requireContext()).edit()
-                            .putBoolean(getString(R.string.auto_queue_key), b).apply());
-            return headerBinding;
-        } else {
+    protected Supplier<View> getListHeaderSupplier() {
+        if (relatedItemInfo == null || relatedItemInfo.getRelatedItems() == null) {
             return null;
         }
+
+        headerBinding = RelatedItemsHeaderBinding
+                .inflate(activity.getLayoutInflater(), itemsList, false);
+
+        final SharedPreferences pref = PreferenceManager
+                .getDefaultSharedPreferences(requireContext());
+        final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
+        headerBinding.autoplaySwitch.setChecked(autoplay);
+        headerBinding.autoplaySwitch.setOnCheckedChangeListener((compoundButton, b) ->
+                PreferenceManager.getDefaultSharedPreferences(requireContext()).edit()
+                        .putBoolean(getString(R.string.auto_queue_key), b).apply());
+
+        return headerBinding::getRoot;
     }
 
     @Override
-    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+    protected Single<ListExtractor.InfoItemsPage<InfoItem>> loadMoreItemsLogic() {
         return Single.fromCallable(ListExtractor.InfoItemsPage::emptyPage);
     }
 
@@ -128,7 +117,6 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
         }
         ViewUtils.slideUp(requireView(), 120, 96, 0.06f);
 
-        disposables.clear();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -137,11 +125,13 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
 
     @Override
     public void setTitle(final String title) {
+        // Nothing to do - override parent
     }
 
     @Override
     public void onCreateOptionsMenu(@NonNull final Menu menu,
                                     @NonNull final MenuInflater inflater) {
+        // Nothing to do - override parent
     }
 
     private void setInitialData(final StreamInfo info) {
@@ -169,11 +159,10 @@ public class RelatedItemsFragment extends BaseListInfoFragment<RelatedItemInfo>
     @Override
     public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
                                           final String s) {
-        final SharedPreferences pref =
-                PreferenceManager.getDefaultSharedPreferences(requireContext());
-        final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
         if (headerBinding != null) {
-            headerBinding.autoplaySwitch.setChecked(autoplay);
+            headerBinding.autoplaySwitch.setChecked(
+                    sharedPreferences.getBoolean(
+                            getString(R.string.auto_queue_key), false));
         }
     }
 

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

@@ -67,8 +67,8 @@ public class InfoItemBuilder {
     public View buildView(@NonNull final ViewGroup parent, @NonNull final InfoItem infoItem,
                           final HistoryRecordManager historyRecordManager,
                           final boolean useMiniVariant) {
-        final InfoItemHolder holder
-                = holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
+        final InfoItemHolder holder =
+                holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
         holder.updateFromItem(infoItem, historyRecordManager);
         return holder.itemView;
     }

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

@@ -1,54 +0,0 @@
-package org.schabi.newpipe.info_list;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-
-public class InfoItemDialog {
-    private final AlertDialog dialog;
-
-    public InfoItemDialog(@NonNull final Activity activity,
-                          @NonNull final StreamInfoItem info,
-                          @NonNull final String[] commands,
-                          @NonNull final DialogInterface.OnClickListener actions) {
-        this(activity, commands, actions, info.getName(), info.getUploaderName());
-    }
-
-    public InfoItemDialog(@NonNull final Activity activity,
-                          @NonNull final String[] commands,
-                          @NonNull final DialogInterface.OnClickListener actions,
-                          @NonNull final String title,
-                          @Nullable final String additionalDetail) {
-
-        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
-        bannerView.setSelected(true);
-
-        final TextView titleView = bannerView.findViewById(R.id.itemTitleView);
-        titleView.setText(title);
-
-        final TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
-        if (additionalDetail != null) {
-            detailsView.setText(additionalDetail);
-            detailsView.setVisibility(View.VISIBLE);
-        } else {
-            detailsView.setVisibility(View.GONE);
-        }
-
-        dialog = new AlertDialog.Builder(activity)
-                .setCustomTitle(bannerView)
-                .setItems(commands, actions)
-                .create();
-    }
-
-    public void show() {
-        dialog.show();
-    }
-}

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

@@ -2,6 +2,7 @@ package org.schabi.newpipe.info_list;
 
 import android.content.Context;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -10,7 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.databinding.PignateFooterBinding;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
@@ -34,6 +35,7 @@ import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 /*
  * Created by Christian Schabesberger on 01.08.16.
@@ -74,18 +76,20 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private static final int MINI_COMMENT_HOLDER_TYPE = 0x400;
     private static final int COMMENT_HOLDER_TYPE = 0x401;
 
+    private final LayoutInflater layoutInflater;
     private final InfoItemBuilder infoItemBuilder;
-    private final ArrayList<InfoItem> infoItemList;
+    private final List<InfoItem> infoItemList;
     private final HistoryRecordManager recordManager;
 
     private boolean useMiniVariant = false;
     private boolean useGridVariant = false;
     private boolean showFooter = false;
-    private View header = null;
-    private View footer = null;
+
+    private Supplier<View> headerSupplier = null;
 
     public InfoListAdapter(final Context context) {
-        this.recordManager = new HistoryRecordManager(context);
+        layoutInflater = LayoutInflater.from(context);
+        recordManager = new HistoryRecordManager(context);
         infoItemBuilder = new InfoItemBuilder(context);
         infoItemList = new ArrayList<>();
     }
@@ -129,12 +133,12 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         if (DEBUG) {
             Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", "
                     + "infoItemList.size() = " + infoItemList.size() + ", "
-                    + "header = " + header + ", footer = " + footer + ", "
+                    + "hasHeader = " + hasHeader() + ", "
                     + "showFooter = " + showFooter);
         }
         notifyItemRangeInserted(offsetStart, data.size());
 
-        if (footer != null && showFooter) {
+        if (showFooter) {
             final int footerNow = sizeConsideringHeaderOffset();
             notifyItemMoved(offsetStart, footerNow);
 
@@ -145,43 +149,6 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
-    public void setInfoItemList(final List<? extends InfoItem> data) {
-        infoItemList.clear();
-        infoItemList.addAll(data);
-        notifyDataSetChanged();
-    }
-
-    public void addInfoItem(@Nullable final InfoItem data) {
-        if (data == null) {
-            return;
-        }
-        if (DEBUG) {
-            Log.d(TAG, "addInfoItem() before > infoItemList.size() = "
-                    + infoItemList.size() + ", thread = " + Thread.currentThread());
-        }
-
-        final int positionInserted = sizeConsideringHeaderOffset();
-        infoItemList.add(data);
-
-        if (DEBUG) {
-            Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", "
-                    + "infoItemList.size() = " + infoItemList.size() + ", "
-                    + "header = " + header + ", footer = " + footer + ", "
-                    + "showFooter = " + showFooter);
-        }
-        notifyItemInserted(positionInserted);
-
-        if (footer != null && showFooter) {
-            final int footerNow = sizeConsideringHeaderOffset();
-            notifyItemMoved(positionInserted, footerNow);
-
-            if (DEBUG) {
-                Log.d(TAG, "addInfoItem() footer from " + positionInserted
-                        + " to " + footerNow);
-            }
-        }
-    }
-
     public void clearStreamItemList() {
         if (infoItemList.isEmpty()) {
             return;
@@ -190,16 +157,16 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         notifyDataSetChanged();
     }
 
-    public void setHeader(final View header) {
-        final boolean changed = header != this.header;
-        this.header = header;
+    public void setHeaderSupplier(@Nullable final Supplier<View> headerSupplier) {
+        final boolean changed = headerSupplier != this.headerSupplier;
+        this.headerSupplier = headerSupplier;
         if (changed) {
             notifyDataSetChanged();
         }
     }
 
-    public void setFooter(final View view) {
-        this.footer = view;
+    protected boolean hasHeader() {
+        return this.headerSupplier != null;
     }
 
     public void showFooter(final boolean show) {
@@ -219,48 +186,49 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     private int sizeConsideringHeaderOffset() {
-        final int i = infoItemList.size() + (header != null ? 1 : 0);
+        final int i = infoItemList.size() + (hasHeader() ? 1 : 0);
         if (DEBUG) {
             Log.d(TAG, "sizeConsideringHeaderOffset() called → " + i);
         }
         return i;
     }
 
-    public ArrayList<InfoItem> getItemsList() {
+    public List<InfoItem> getItemsList() {
         return infoItemList;
     }
 
     @Override
     public int getItemCount() {
         int count = infoItemList.size();
-        if (header != null) {
+        if (hasHeader()) {
             count++;
         }
-        if (footer != null && showFooter) {
+        if (showFooter) {
             count++;
         }
 
         if (DEBUG) {
             Log.d(TAG, "getItemCount() called with: "
                     + "count = " + count + ", infoItemList.size() = " + infoItemList.size() + ", "
-                    + "header = " + header + ", footer = " + footer + ", "
+                    + "hasHeader = " + hasHeader() + ", "
                     + "showFooter = " + showFooter);
         }
         return count;
     }
 
+    @SuppressWarnings("FinalParameters")
     @Override
     public int getItemViewType(int position) {
         if (DEBUG) {
             Log.d(TAG, "getItemViewType() called with: position = [" + position + "]");
         }
 
-        if (header != null && position == 0) {
+        if (hasHeader() && position == 0) {
             return HEADER_TYPE;
-        } else if (header != null) {
+        } else if (hasHeader()) {
             position--;
         }
-        if (footer != null && position == infoItemList.size() && showFooter) {
+        if (position == infoItemList.size() && showFooter) {
             return FOOTER_TYPE;
         }
         final InfoItem item = infoItemList.get(position);
@@ -290,10 +258,16 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     + "parent = [" + parent + "], type = [" + type + "]");
         }
         switch (type) {
+            // #4475 and #3368
+            // Always create a new instance otherwise the same instance
+            // is sometimes reused which causes a crash
             case HEADER_TYPE:
-                return new HFHolder(header);
+                return new HFHolder(headerSupplier.get());
             case FOOTER_TYPE:
-                return new HFHolder(footer);
+                return new HFHolder(PignateFooterBinding
+                        .inflate(layoutInflater, parent, false)
+                        .getRoot()
+                );
             case MINI_STREAM_HOLDER_TYPE:
                 return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
             case STREAM_HOLDER_TYPE:
@@ -322,42 +296,17 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     @Override
-    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder,
+                                 final int position) {
         if (DEBUG) {
             Log.d(TAG, "onBindViewHolder() called with: "
                     + "holder = [" + holder.getClass().getSimpleName() + "], "
                     + "position = [" + position + "]");
         }
         if (holder instanceof InfoItemHolder) {
-            // If header isn't null, offset the items by -1
-            if (header != null) {
-                position--;
-            }
-
-            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), recordManager);
-        } else if (holder instanceof HFHolder && position == 0 && header != null) {
-            ((HFHolder) holder).view = header;
-        } else if (holder instanceof HFHolder && position == sizeConsideringHeaderOffset()
-                && footer != null && showFooter) {
-            ((HFHolder) holder).view = footer;
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, final int position,
-                                 @NonNull final List<Object> payloads) {
-        if (!payloads.isEmpty() && holder instanceof InfoItemHolder) {
-            for (final Object payload : payloads) {
-                if (payload instanceof StreamStateEntity) {
-                    ((InfoItemHolder) holder).updateState(infoItemList
-                            .get(header == null ? position : position - 1), recordManager);
-                } else if (payload instanceof Boolean) {
-                    ((InfoItemHolder) holder).updateState(infoItemList
-                            .get(header == null ? position : position - 1), recordManager);
-                }
-            }
-        } else {
-            onBindViewHolder(holder, position);
+            ((InfoItemHolder) holder).updateFromItem(
+                    // If header is present, offset the items by -1
+                    infoItemList.get(hasHeader() ? position - 1 : position), recordManager);
         }
     }
 
@@ -371,12 +320,9 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         };
     }
 
-    public static class HFHolder extends RecyclerView.ViewHolder {
-        public View view;
-
+    static class HFHolder extends RecyclerView.ViewHolder {
         HFHolder(final View v) {
             super(v);
-            view = v;
         }
     }
 }

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

@@ -61,5 +61,6 @@ class StreamSegmentAdapter(
 
     interface StreamSegmentListener {
         fun onItemClick(item: StreamSegmentItem, seconds: Int)
+        fun onItemLongClick(item: StreamSegmentItem, seconds: Int)
     }
 }

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

@@ -41,6 +41,7 @@ class StreamSegmentItem(
         viewHolder.root.findViewById<TextView>(R.id.textViewStartSeconds).text =
             Localization.getDurationString(item.startTimeSeconds.toLong())
         viewHolder.root.setOnClickListener { onClick.onItemClick(this, item.startTimeSeconds) }
+        viewHolder.root.setOnLongClickListener { onClick.onItemLongClick(this, item.startTimeSeconds); true }
         viewHolder.root.isSelected = isSelected
     }
 

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

@@ -0,0 +1,355 @@
+package org.schabi.newpipe.info_list.dialog;
+
+import static org.schabi.newpipe.MainActivity.DEBUG;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Build;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.error.ErrorInfo;
+import org.schabi.newpipe.error.ErrorUtil;
+import org.schabi.newpipe.error.UserAction;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
+import org.schabi.newpipe.player.helper.PlayerHolder;
+import org.schabi.newpipe.util.StreamTypeUtil;
+import org.schabi.newpipe.util.external_communication.KoreUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+/**
+ * Dialog for a {@link StreamInfoItem}.
+ * The dialog's content are actions that can be performed on the {@link StreamInfoItem}.
+ * This dialog is mostly used for longpress context menus.
+ */
+public final class InfoItemDialog {
+    private static final String TAG = Build.class.getSimpleName();
+    /**
+     * Ideally, {@link InfoItemDialog} would extend {@link AlertDialog}.
+     * However, extending {@link AlertDialog} requires many additional lines
+     * and brings more complexity to this class, especially the constructor.
+     * To circumvent this, an {@link AlertDialog.Builder} is used in the constructor.
+     * Its result is stored in this class variable to allow access via the {@link #show()} method.
+     */
+    private final AlertDialog dialog;
+
+    private InfoItemDialog(@NonNull final Activity activity,
+                           @NonNull final Fragment fragment,
+                           @NonNull final StreamInfoItem info,
+                           @NonNull final List<StreamDialogEntry> entries) {
+
+        // Create the dialog's title
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+        bannerView.setSelected(true);
+
+        final TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+        titleView.setText(info.getName());
+
+        final TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+        if (info.getUploaderName() != null) {
+            detailsView.setText(info.getUploaderName());
+            detailsView.setVisibility(View.VISIBLE);
+        } else {
+            detailsView.setVisibility(View.GONE);
+        }
+
+        // Get the entry's descriptions which are displayed in the dialog
+        final String[] items = entries.stream()
+                .map(entry -> entry.getString(activity)).toArray(String[]::new);
+
+        // Call an entry's action / onClick method when the entry is selected.
+        final DialogInterface.OnClickListener action = (d, index) ->
+            entries.get(index).action.onClick(fragment, info);
+
+        dialog = new AlertDialog.Builder(activity)
+                .setCustomTitle(bannerView)
+                .setItems(items, action)
+                .create();
+
+    }
+
+    public void show() {
+        dialog.show();
+    }
+
+    /**
+     * <p>Builder to generate a {@link InfoItemDialog} for a {@link StreamInfoItem}.</p>
+     * Use {@link #addEntry(StreamDialogDefaultEntry)}
+     * and {@link #addAllEntries(StreamDialogDefaultEntry...)} to add options to the dialog.
+     * <br>
+     * Custom actions for entries can be set using
+     * {@link #setAction(StreamDialogDefaultEntry, StreamDialogEntry.StreamDialogEntryAction)}.
+     */
+    public static class Builder {
+        @NonNull private final Activity activity;
+        @NonNull private final Context context;
+        @NonNull private final StreamInfoItem infoItem;
+        @NonNull private final Fragment fragment;
+        @NonNull private final List<StreamDialogEntry> entries = new ArrayList<>();
+        private final boolean addDefaultEntriesAutomatically;
+
+        /**
+         * <p>Create a {@link Builder builder} instance for a {@link StreamInfoItem}
+         * that automatically adds the some default entries
+         * at the top and bottom of the dialog.</p>
+         * The dialog has the following structure:
+         * <pre>
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         *     | ENQUEUE                                    |
+         *     | ENQUEUE_NEXT                               |
+         *     | START_ON_BACKGROUND                        |
+         *     | START_ON_POPUP                             |
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         *     | entries added manually with                |
+         *     | addEntry() and addAllEntries()             |
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         *     | APPEND_PLAYLIST                            |
+         *     | SHARE                                      |
+         *     | OPEN_IN_BROWSER                            |
+         *     | PLAY_WITH_KODI                             |
+         *     | MARK_AS_WATCHED                            |
+         *     | SHOW_CHANNEL_DETAILS                       |
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         * </pre>
+         * Please note that some entries are not added depending on the user's preferences,
+         * the item's {@link StreamType} and the current player state.
+         *
+         * @param activity
+         * @param context
+         * @param fragment
+         * @param infoItem the item for this dialog; all entries and their actions work with
+         *                this {@link StreamInfoItem}
+         * @throws IllegalArgumentException if <code>activity, context</code>
+         *         or resources is <code>null</code>
+         */
+        public Builder(final Activity activity,
+                       final Context context,
+                       @NonNull final Fragment fragment,
+                       @NonNull final StreamInfoItem infoItem) {
+            this(activity, context, fragment, infoItem, true);
+        }
+
+        /**
+         * <p>Create an instance of this {@link Builder} for a {@link StreamInfoItem}.</p>
+         * <p>If {@code addDefaultEntriesAutomatically} is set to {@code true},
+         * some default entries are added to the top and bottom of the dialog.</p>
+         * The dialog has the following structure:
+         * <pre>
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         *     | ENQUEUE                                    |
+         *     | ENQUEUE_NEXT                               |
+         *     | START_ON_BACKGROUND                        |
+         *     | START_ON_POPUP                             |
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         *     | entries added manually with                |
+         *     | addEntry() and addAllEntries()             |
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         *     | APPEND_PLAYLIST                            |
+         *     | SHARE                                      |
+         *     | OPEN_IN_BROWSER                            |
+         *     | PLAY_WITH_KODI                             |
+         *     | MARK_AS_WATCHED                            |
+         *     | SHOW_CHANNEL_DETAILS                       |
+         *     + - - - - - - - - - - - - - - - - - - - - - -+
+         * </pre>
+         * Please note that some entries are not added depending on the user's preferences,
+         * the item's {@link StreamType} and the current player state.
+         *
+         * @param activity
+         * @param context
+         * @param fragment
+         * @param infoItem
+         * @param addDefaultEntriesAutomatically
+         *        whether default entries added with {@link #addDefaultBeginningEntries()}
+         *        and {@link #addDefaultEndEntries()} are added automatically when generating
+         *        the {@link InfoItemDialog}.
+         *        <br/>
+         *        Entries added with {@link #addEntry(StreamDialogDefaultEntry)} and
+         *        {@link #addAllEntries(StreamDialogDefaultEntry...)} are added in between.
+         * @throws IllegalArgumentException if <code>activity, context</code>
+         * or resources is <code>null</code>
+         */
+        public Builder(final Activity activity,
+                       final Context context,
+                       @NonNull final Fragment fragment,
+                       @NonNull final StreamInfoItem infoItem,
+                       final boolean addDefaultEntriesAutomatically) {
+            if (activity == null || context == null || context.getResources() == null) {
+                if (DEBUG) {
+                    Log.d(TAG, "activity, context or resources is null: activity = "
+                            + activity + ", context = " + context);
+                }
+                throw new IllegalArgumentException("activity, context or resources is null");
+            }
+            this.activity = activity;
+            this.context = context;
+            this.fragment = fragment;
+            this.infoItem = infoItem;
+            this.addDefaultEntriesAutomatically = addDefaultEntriesAutomatically;
+            if (addDefaultEntriesAutomatically) {
+                addDefaultBeginningEntries();
+            }
+        }
+
+        /**
+         * Adds a new entry and appends it to the current entry list.
+         * @param entry the entry to add
+         * @return the current {@link Builder} instance
+         */
+        public Builder addEntry(@NonNull final StreamDialogDefaultEntry entry) {
+            entries.add(entry.toStreamDialogEntry());
+            return this;
+        }
+
+        /**
+         * Adds new entries. These are appended to the current entry list.
+         * @param newEntries the entries to add
+         * @return the current {@link Builder} instance
+         */
+        public Builder addAllEntries(@NonNull final StreamDialogDefaultEntry... newEntries) {
+            Stream.of(newEntries).forEach(this::addEntry);
+            return this;
+        }
+
+        /**
+         * <p>Change an entries' action that is called when the entry is selected.</p>
+         * <p><strong>Warning:</strong> Only use this method when the entry has been already added.
+         * Changing the action of an entry which has not been added to the Builder yet
+         * does not have an effect.</p>
+         * @param entry the entry to change
+         * @param action the action to perform when the entry is selected
+         * @return the current {@link Builder} instance
+         */
+        public Builder setAction(@NonNull final StreamDialogDefaultEntry entry,
+                              @NonNull final StreamDialogEntry.StreamDialogEntryAction action) {
+            for (int i = 0; i < entries.size(); i++) {
+                if (entries.get(i).resource == entry.resource) {
+                    entries.set(i, new StreamDialogEntry(entry.resource, action));
+                    return this;
+                }
+            }
+            return this;
+        }
+
+        /**
+         * Adds {@link StreamDialogDefaultEntry#ENQUEUE} if the player is open and
+         * {@link StreamDialogDefaultEntry#ENQUEUE_NEXT} if there are multiple streams
+         * in the play queue.
+         * @return the current {@link Builder} instance
+         */
+        public Builder addEnqueueEntriesIfNeeded() {
+            if (PlayerHolder.getInstance().isPlayQueueReady()) {
+                addEntry(StreamDialogDefaultEntry.ENQUEUE);
+
+                if (PlayerHolder.getInstance().getQueueSize() > 1) {
+                    addEntry(StreamDialogDefaultEntry.ENQUEUE_NEXT);
+                }
+            }
+            return this;
+        }
+
+        /**
+         * Adds the {@link StreamDialogDefaultEntry#START_HERE_ON_BACKGROUND}.
+         * If the {@link #infoItem} is not a pure audio (live) stream,
+         * {@link StreamDialogDefaultEntry#START_HERE_ON_POPUP} is added, too.
+         * @return the current {@link Builder} instance
+         */
+        public Builder addStartHereEntries() {
+            addEntry(StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND);
+            if (!StreamTypeUtil.isAudio(infoItem.getStreamType())) {
+                addEntry(StreamDialogDefaultEntry.START_HERE_ON_POPUP);
+            }
+            return this;
+        }
+
+        /**
+         * Adds {@link StreamDialogDefaultEntry#MARK_AS_WATCHED} if the watch history is enabled
+         * and the stream is not a livestream.
+         * @return the current {@link Builder} instance
+         */
+        public Builder addMarkAsWatchedEntryIfNeeded() {
+            final boolean isWatchHistoryEnabled = PreferenceManager
+                    .getDefaultSharedPreferences(context)
+                    .getBoolean(context.getString(R.string.enable_watch_history_key), false);
+            if (isWatchHistoryEnabled && !StreamTypeUtil.isLiveStream(infoItem.getStreamType())) {
+                addEntry(StreamDialogDefaultEntry.MARK_AS_WATCHED);
+            }
+            return this;
+        }
+
+        /**
+         * Adds the {@link StreamDialogDefaultEntry#PLAY_WITH_KODI} entry if it is needed.
+         * @return the current {@link Builder} instance
+         */
+        public Builder addPlayWithKodiEntryIfNeeded() {
+            if (KoreUtils.shouldShowPlayWithKodi(context, infoItem.getServiceId())) {
+                addEntry(StreamDialogDefaultEntry.PLAY_WITH_KODI);
+            }
+            return this;
+        }
+
+        /**
+         * Add the entries which are usually at the top of the action list.
+         * <br/>
+         * This method adds the "enqueue" (see {@link #addEnqueueEntriesIfNeeded()})
+         * and "start here" (see {@link #addStartHereEntries()} entries.
+         * @return the current {@link Builder} instance
+         */
+        public Builder addDefaultBeginningEntries() {
+            addEnqueueEntriesIfNeeded();
+            addStartHereEntries();
+            return this;
+        }
+
+        /**
+         * Add the entries which are usually at the bottom of the action list.
+         * @return the current {@link Builder} instance
+         */
+        public Builder addDefaultEndEntries() {
+            addAllEntries(
+                    StreamDialogDefaultEntry.DOWNLOAD,
+                    StreamDialogDefaultEntry.APPEND_PLAYLIST,
+                    StreamDialogDefaultEntry.SHARE,
+                    StreamDialogDefaultEntry.OPEN_IN_BROWSER
+            );
+            addPlayWithKodiEntryIfNeeded();
+            addMarkAsWatchedEntryIfNeeded();
+            addEntry(StreamDialogDefaultEntry.SHOW_CHANNEL_DETAILS);
+            return this;
+        }
+
+        /**
+         * Creates the {@link InfoItemDialog}.
+         * @return a new instance of {@link InfoItemDialog}
+         */
+        public InfoItemDialog create() {
+            if (addDefaultEntriesAutomatically) {
+                addDefaultEndEntries();
+            }
+            return new InfoItemDialog(this.activity, this.fragment, this.infoItem, this.entries);
+        }
+
+        public static void reportErrorDuringInitialization(final Throwable throwable,
+                                                           final InfoItem item) {
+            ErrorUtil.showSnackbar(App.getApp().getBaseContext(), new ErrorInfo(
+                    throwable,
+                    UserAction.OPEN_INFO_ITEM_DIALOG,
+                    "none",
+                    item.getServiceId()));
+        }
+    }
+}

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

@@ -0,0 +1,160 @@
+package org.schabi.newpipe.info_list.dialog;
+
+import static org.schabi.newpipe.util.NavigationHelper.openChannelFragment;
+import static org.schabi.newpipe.util.SparseItemUtil.fetchItemInfoIfSparse;
+import static org.schabi.newpipe.util.SparseItemUtil.fetchStreamInfoAndSaveToDatabase;
+import static org.schabi.newpipe.util.SparseItemUtil.fetchUploaderUrlIfSparse;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.download.DownloadDialog;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.external_communication.KoreUtils;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+
+/**
+ * <p>
+ *     This enum provides entries that are accepted
+ *     by the {@link InfoItemDialog.Builder}.
+ * </p>
+ * <p>
+ *     These entries contain a String {@link #resource} which is displayed in the dialog and
+ *     a default {@link #action} that is executed
+ *     when the entry is selected (via <code>onClick()</code>).
+ *     <br/>
+ *     They action can be overridden by using the Builder's
+ *     {@link InfoItemDialog.Builder#setAction(
+ *     StreamDialogDefaultEntry, StreamDialogEntry.StreamDialogEntryAction)}
+ *     method.
+ * </p>
+ */
+public enum StreamDialogDefaultEntry {
+    SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) ->
+            fetchUploaderUrlIfSparse(fragment.requireContext(), item.getServiceId(), item.getUrl(),
+                    item.getUploaderUrl(), url -> openChannelFragment(fragment, item, url))
+    ),
+
+    /**
+     * Enqueues the stream automatically to the current PlayerType.
+     */
+    ENQUEUE(R.string.enqueue_stream, (fragment, item) ->
+            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+                NavigationHelper.enqueueOnPlayer(fragment.getContext(), singlePlayQueue))
+    ),
+
+    /**
+     * Enqueues the stream automatically to the current PlayerType
+     * after the currently playing stream.
+     */
+    ENQUEUE_NEXT(R.string.enqueue_next_stream, (fragment, item) ->
+            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+                NavigationHelper.enqueueNextOnPlayer(fragment.getContext(), singlePlayQueue))
+    ),
+
+    START_HERE_ON_BACKGROUND(R.string.start_here_on_background, (fragment, item) ->
+            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+                NavigationHelper.playOnBackgroundPlayer(
+                        fragment.getContext(), singlePlayQueue, true))),
+
+    START_HERE_ON_POPUP(R.string.start_here_on_popup, (fragment, item) ->
+            fetchItemInfoIfSparse(fragment.requireContext(), item, singlePlayQueue ->
+                NavigationHelper.playOnPopupPlayer(fragment.getContext(), singlePlayQueue, true))),
+
+    SET_AS_PLAYLIST_THUMBNAIL(R.string.set_as_playlist_thumbnail, (fragment, item) -> {
+        throw new UnsupportedOperationException("This needs to be implemented manually "
+                + "by using InfoItemDialog.Builder.setAction()");
+    }),
+
+    DELETE(R.string.delete, (fragment, item) -> {
+        throw new UnsupportedOperationException("This needs to be implemented manually "
+                + "by using InfoItemDialog.Builder.setAction()");
+    }),
+
+    /**
+     * Opens a {@link PlaylistDialog} to either append the stream to a playlist
+     * or create a new playlist if there are no local playlists.
+     */
+    APPEND_PLAYLIST(R.string.add_to_playlist, (fragment, item) ->
+        PlaylistDialog.createCorrespondingDialog(
+                fragment.getContext(),
+                List.of(new StreamEntity(item)),
+                dialog -> dialog.show(
+                        fragment.getParentFragmentManager(),
+                        "StreamDialogEntry@"
+                                + (dialog instanceof PlaylistAppendDialog ? "append" : "create")
+                                + "_playlist"
+                )
+        )
+    ),
+
+    PLAY_WITH_KODI(R.string.play_with_kodi_title, (fragment, item) -> {
+        final Uri videoUrl = Uri.parse(item.getUrl());
+        try {
+            NavigationHelper.playWithKore(fragment.requireContext(), videoUrl);
+        } catch (final Exception e) {
+            KoreUtils.showInstallKoreDialog(fragment.requireActivity());
+        }
+    }),
+
+    SHARE(R.string.share, (fragment, item) ->
+            ShareUtils.shareText(fragment.requireContext(), item.getName(), item.getUrl(),
+                    item.getThumbnailUrl())),
+
+    /**
+     * Opens a {@link DownloadDialog} after fetching some stream info.
+     * If the user quits the current fragment, it will not open a DownloadDialog.
+     */
+    DOWNLOAD(R.string.download, (fragment, item) ->
+            fetchStreamInfoAndSaveToDatabase(fragment.requireContext(), item.getServiceId(),
+                    item.getUrl(), info -> {
+                        if (fragment.getContext() != null) {
+                            final DownloadDialog downloadDialog =
+                                    new DownloadDialog(fragment.requireContext(), info);
+                            downloadDialog.show(fragment.getChildFragmentManager(),
+                                    "downloadDialog");
+                        }
+                    })
+    ),
+
+    OPEN_IN_BROWSER(R.string.open_in_browser, (fragment, item) ->
+            ShareUtils.openUrlInBrowser(fragment.requireContext(), item.getUrl())),
+
+
+    MARK_AS_WATCHED(R.string.mark_as_watched, (fragment, item) ->
+        new HistoryRecordManager(fragment.getContext())
+                .markAsWatched(item)
+                .onErrorComplete()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe()
+    );
+
+
+    @StringRes
+    public final int resource;
+    @NonNull
+    public final StreamDialogEntry.StreamDialogEntryAction action;
+
+    StreamDialogDefaultEntry(@StringRes final int resource,
+                             @NonNull final StreamDialogEntry.StreamDialogEntryAction action) {
+        this.resource = resource;
+        this.action = action;
+    }
+
+    @NonNull
+    public StreamDialogEntry toStreamDialogEntry() {
+        return new StreamDialogEntry(resource, action);
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package org.schabi.newpipe.info_list.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+
+public class StreamDialogEntry {
+
+    @StringRes
+    public final int resource;
+    @NonNull
+    public final StreamDialogEntryAction action;
+
+    public StreamDialogEntry(@StringRes final int resource,
+                             @NonNull final StreamDialogEntryAction action) {
+        this.resource = resource;
+        this.action = action;
+    }
+
+    public String getString(@NonNull final Context context) {
+        return context.getString(resource);
+    }
+
+    public interface StreamDialogEntryAction {
+        void onClick(Fragment fragment, StreamInfoItem infoItem);
+    }
+}

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.info_list.holder;
 
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
@@ -11,10 +12,8 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
 
-import de.hdodenhof.circleimageview.CircleImageView;
-
 public class ChannelMiniInfoItemHolder extends InfoItemHolder {
-    public final CircleImageView itemThumbnailView;
+    public final ImageView itemThumbnailView;
     public final TextView itemTitleView;
     private final TextView itemAdditionalDetailView;
 
@@ -43,7 +42,7 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
         itemTitleView.setText(item.getName());
         itemAdditionalDetailView.setText(getDetailLine(item));
 
-        PicassoHelper.loadThumbnail(item.getThumbnailUrl()).into(itemThumbnailView);
+        PicassoHelper.loadAvatar(item.getThumbnailUrl()).into(itemThumbnailView);
 
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnChannelSelectedListener() != null) {

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

@@ -34,12 +34,14 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
 public class CommentsInfoItemHolder extends CommentsMiniInfoItemHolder {
     public final TextView itemTitleView;
     private final ImageView itemHeartView;
+    private final ImageView itemPinnedView;
 
     public CommentsInfoItemHolder(final InfoItemBuilder infoItemBuilder, final ViewGroup parent) {
         super(infoItemBuilder, R.layout.list_comments_item, parent);
 
         itemTitleView = itemView.findViewById(R.id.itemTitleView);
         itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
+        itemPinnedView = itemView.findViewById(R.id.detail_pinned_view);
     }
 
     @Override
@@ -55,5 +57,7 @@ public class CommentsInfoItemHolder extends CommentsMiniInfoItemHolder {
         itemTitleView.setText(item.getUploaderName());
 
         itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
+
+        itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
     }
 }

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

@@ -7,13 +7,15 @@ import android.text.util.Linkify;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.text.util.LinkifyCompat;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.error.ErrorActivity;
+import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
@@ -22,13 +24,11 @@ import org.schabi.newpipe.util.CommentTextOnTouchListener;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.external_communication.TimestampExtractor;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.util.external_communication.TimestampExtractor;
 
-import java.util.regex.Matcher;
-
-import de.hdodenhof.circleimageview.CircleImageView;
+import java.util.Objects;
 
 public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private static final String TAG = "CommentsMiniIIHolder";
@@ -40,7 +40,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private final int commentVerticalPadding;
 
     private final RelativeLayout itemRoot;
-    public final CircleImageView itemThumbnailView;
+    private final ImageView itemThumbnailView;
     private final TextView itemContentView;
     private final TextView itemLikesCountView;
     private final TextView itemPublishedTime;
@@ -48,27 +48,6 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private String commentText;
     private String streamUrl;
 
-    private final Linkify.TransformFilter timestampLink = new Linkify.TransformFilter() {
-        @Override
-        public String transformUrl(final Matcher match, final String url) {
-            try {
-                final TimestampExtractor.TimestampMatchDTO timestampMatchDTO =
-                        TimestampExtractor.getTimestampFromMatcher(match, commentText);
-
-                if (timestampMatchDTO == null) {
-                    return url;
-                }
-
-                return streamUrl + url.replace(
-                        match.group(0),
-                        "#timestamp=" + timestampMatchDTO.seconds());
-            } catch (final Exception ex) {
-                Log.e(TAG, "Unable to process url='" + url + "' as timestampLink", ex);
-                return url;
-            }
-        }
-    };
-
     CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder, final int layoutId,
                                final ViewGroup parent) {
         super(infoItemBuilder, layoutId, parent);
@@ -116,7 +95,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
 
         itemContentView.setLines(COMMENT_DEFAULT_LINES);
         commentText = item.getCommentText();
-        itemContentView.setText(commentText);
+        itemContentView.setText(commentText, TextView.BufferType.SPANNABLE);
         itemContentView.setOnTouchListener(CommentTextOnTouchListener.INSTANCE);
 
         if (itemContentView.getLineCount() == 0) {
@@ -171,7 +150,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
                     item.getUploaderUrl(),
                     item.getUploaderName());
         } catch (final Exception e) {
-            ErrorActivity.reportUiErrorInSnackbar(activity, "Opening channel fragment", e);
+            ErrorUtil.showUiErrorSnackbar(activity, "Opening channel fragment", e);
         }
     }
 
@@ -205,8 +184,9 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
         boolean hasEllipsis = false;
 
         if (itemContentView.getLineCount() > COMMENT_DEFAULT_LINES) {
-            final int endOfLastLine
-                    = itemContentView.getLayout().getLineEnd(COMMENT_DEFAULT_LINES - 1);
+            final int endOfLastLine = itemContentView
+                    .getLayout()
+                    .getLineEnd(COMMENT_DEFAULT_LINES - 1);
             int end = itemContentView.getText().toString().lastIndexOf(' ', endOfLastLine - 2);
             if (end == -1) {
                 end = Math.max(endOfLastLine - 2, 0);
@@ -243,14 +223,21 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     }
 
     private void linkify() {
-        Linkify.addLinks(
-                itemContentView,
-                Linkify.WEB_URLS);
-        Linkify.addLinks(
-                itemContentView,
-                TimestampExtractor.TIMESTAMPS_PATTERN,
-                null,
-                null,
-                timestampLink);
+        LinkifyCompat.addLinks(itemContentView, Linkify.WEB_URLS);
+        LinkifyCompat.addLinks(itemContentView, TimestampExtractor.TIMESTAMPS_PATTERN, null, null,
+                (match, url) -> {
+                    try {
+                        final var timestampMatch = TimestampExtractor
+                                .getTimestampFromMatcher(match, commentText);
+                        if (timestampMatch == null) {
+                            return url;
+                        }
+                        return streamUrl + url.replace(Objects.requireNonNull(match.group(0)),
+                                "#timestamp=" + timestampMatch.seconds());
+                    } catch (final Exception ex) {
+                        Log.e(TAG, "Unable to process url='" + url + "' as timestampLink", ex);
+                        return url;
+                    }
+                });
     }
 }

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

@@ -11,12 +11,12 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.StreamTypeUtil;
 import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.util.concurrent.TimeUnit;
@@ -70,8 +70,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
             } else {
                 itemProgressView.setVisibility(View.GONE);
             }
-        } else if (item.getStreamType() == StreamType.LIVE_STREAM
-                || item.getStreamType() == StreamType.AUDIO_LIVE_STREAM) {
+        } else if (StreamTypeUtil.isLiveStream(item.getStreamType())) {
             itemDurationView.setText(R.string.duration_live);
             itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                     R.color.live_duration_background_color));
@@ -96,9 +95,10 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
             case VIDEO_STREAM:
             case LIVE_STREAM:
             case AUDIO_LIVE_STREAM:
+            case POST_LIVE_STREAM:
+            case POST_LIVE_AUDIO_STREAM:
                 enableLongClick(item);
                 break;
-            case FILE:
             case NONE:
             default:
                 disableLongClick();
@@ -111,10 +111,11 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
                             final HistoryRecordManager historyRecordManager) {
         final StreamInfoItem item = (StreamInfoItem) infoItem;
 
-        final StreamStateEntity state
-                = historyRecordManager.loadStreamState(infoItem).blockingGet()[0];
+        final StreamStateEntity state = historyRecordManager
+                .loadStreamState(infoItem)
+                .blockingGet()[0];
         if (state != null && item.getDuration() > 0
-                && item.getStreamType() != StreamType.LIVE_STREAM) {
+                && !StreamTypeUtil.isLiveStream(item.getStreamType())) {
             itemProgressView.setMax((int) item.getDuration());
             if (itemProgressView.getVisibility() == View.VISIBLE) {
                 itemProgressView.setProgressAnimated((int) TimeUnit.MILLISECONDS

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

@@ -21,10 +21,6 @@ import org.schabi.newpipe.MainActivity
 
 private const val TAG = "ViewUtils"
 
-inline var View.backgroundTintListCompat: ColorStateList?
-    get() = ViewCompat.getBackgroundTintList(this)
-    set(value) = ViewCompat.setBackgroundTintList(this, value)
-
 /**
  * Animate the view.
  *
@@ -75,6 +71,7 @@ fun View.animate(
     }
     animate().setListener(null).cancel()
     isVisible = true
+
     when (animationType) {
         AnimationType.ALPHA -> animateAlpha(enterOrExit, duration, delay, execOnEnd)
         AnimationType.SCALE_AND_ALPHA -> animateScaleAndAlpha(enterOrExit, duration, delay, execOnEnd)
@@ -95,62 +92,43 @@ fun View.animateBackgroundColor(duration: Long, @ColorInt colorStart: Int, @Colo
     if (MainActivity.DEBUG) {
         Log.d(
             TAG,
-            "animateBackgroundColor() called with: " +
-                "view = [" + this + "], duration = [" + duration + "], " +
-                "colorStart = [" + colorStart + "], colorEnd = [" + colorEnd + "]"
+            "animateBackgroundColor() called with: view = [$this], duration = [$duration], " +
+                "colorStart = [$colorStart], colorEnd = [$colorEnd]"
         )
     }
-    val empty = arrayOf(IntArray(0))
     val viewPropertyAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorStart, colorEnd)
     viewPropertyAnimator.interpolator = FastOutSlowInInterpolator()
     viewPropertyAnimator.duration = duration
-    viewPropertyAnimator.addUpdateListener { animation: ValueAnimator ->
-        backgroundTintListCompat = ColorStateList(empty, intArrayOf(animation.animatedValue as Int))
+
+    fun listenerAction(color: Int) {
+        ViewCompat.setBackgroundTintList(this, ColorStateList.valueOf(color))
     }
-    viewPropertyAnimator.addListener(
-        onCancel = { backgroundTintListCompat = ColorStateList(empty, intArrayOf(colorEnd)) },
-        onEnd = { backgroundTintListCompat = ColorStateList(empty, intArrayOf(colorEnd)) }
-    )
+    viewPropertyAnimator.addUpdateListener { listenerAction(it.animatedValue as Int) }
+    viewPropertyAnimator.addListener(onCancel = { listenerAction(colorEnd) }, onEnd = { listenerAction(colorEnd) })
     viewPropertyAnimator.start()
 }
 
 fun View.animateHeight(duration: Long, targetHeight: Int): ValueAnimator {
     if (MainActivity.DEBUG) {
-        Log.d(
-            TAG,
-            "animateHeight: duration = [" + duration + "], " +
-                "from " + height + " to → " + targetHeight + " in: " + this
-        )
+        Log.d(TAG, "animateHeight: duration = [$duration], from $height to → $targetHeight in: $this")
     }
     val animator = ValueAnimator.ofFloat(height.toFloat(), targetHeight.toFloat())
     animator.interpolator = FastOutSlowInInterpolator()
     animator.duration = duration
-    animator.addUpdateListener { animation: ValueAnimator ->
-        val value = animation.animatedValue as Float
-        layoutParams.height = value.toInt()
+
+    fun listenerAction(value: Int) {
+        layoutParams.height = value
         requestLayout()
     }
-    animator.addListener(
-        onCancel = {
-            layoutParams.height = targetHeight
-            requestLayout()
-        },
-        onEnd = {
-            layoutParams.height = targetHeight
-            requestLayout()
-        }
-    )
+    animator.addUpdateListener { listenerAction((it.animatedValue as Float).toInt()) }
+    animator.addListener(onCancel = { listenerAction(targetHeight) }, onEnd = { listenerAction(targetHeight) })
     animator.start()
     return animator
 }
 
 fun View.animateRotation(duration: Long, targetRotation: Int) {
     if (MainActivity.DEBUG) {
-        Log.d(
-            TAG,
-            "animateRotation: duration = [" + duration + "], " +
-                "from " + rotation + " to → " + targetRotation + " in: " + this
-        )
+        Log.d(TAG, "animateRotation: duration = [$duration], from $rotation to → $targetRotation in: $this")
     }
     animate().setListener(null).cancel()
     animate()
@@ -171,20 +149,13 @@ private fun View.animateAlpha(enterOrExit: Boolean, duration: Long, delay: Long,
     if (enterOrExit) {
         animate().setInterpolator(FastOutSlowInInterpolator()).alpha(1f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(ExecOnEndListener(execOnEnd))
+            .start()
     } else {
         animate().setInterpolator(FastOutSlowInInterpolator()).alpha(0f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    isGone = true
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(HideAndExecOnEndListener(this, execOnEnd))
+            .start()
     }
 }
 
@@ -196,11 +167,8 @@ private fun View.animateScaleAndAlpha(enterOrExit: Boolean, duration: Long, dela
             .setInterpolator(FastOutSlowInInterpolator())
             .alpha(1f).scaleX(1f).scaleY(1f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(ExecOnEndListener(execOnEnd))
+            .start()
     } else {
         scaleX = 1f
         scaleY = 1f
@@ -208,12 +176,8 @@ private fun View.animateScaleAndAlpha(enterOrExit: Boolean, duration: Long, dela
             .setInterpolator(FastOutSlowInInterpolator())
             .alpha(0f).scaleX(.8f).scaleY(.8f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    isGone = true
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(HideAndExecOnEndListener(this, execOnEnd))
+            .start()
     }
 }
 
@@ -226,11 +190,8 @@ private fun View.animateLightScaleAndAlpha(enterOrExit: Boolean, duration: Long,
             .setInterpolator(FastOutSlowInInterpolator())
             .alpha(1f).scaleX(1f).scaleY(1f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(ExecOnEndListener(execOnEnd))
+            .start()
     } else {
         alpha = 1f
         scaleX = 1f
@@ -239,12 +200,8 @@ private fun View.animateLightScaleAndAlpha(enterOrExit: Boolean, duration: Long,
             .setInterpolator(FastOutSlowInInterpolator())
             .alpha(0f).scaleX(.95f).scaleY(.95f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    isGone = true
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(HideAndExecOnEndListener(this, execOnEnd))
+            .start()
     }
 }
 
@@ -255,22 +212,15 @@ private fun View.animateSlideAndAlpha(enterOrExit: Boolean, duration: Long, dela
         animate()
             .setInterpolator(FastOutSlowInInterpolator()).alpha(1f).translationY(0f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(ExecOnEndListener(execOnEnd))
+            .start()
     } else {
         animate()
             .setInterpolator(FastOutSlowInInterpolator())
             .alpha(0f).translationY(-height.toFloat())
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    isGone = true
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(HideAndExecOnEndListener(this, execOnEnd))
+            .start()
     }
 }
 
@@ -281,32 +231,18 @@ private fun View.animateLightSlideAndAlpha(enterOrExit: Boolean, duration: Long,
         animate()
             .setInterpolator(FastOutSlowInInterpolator()).alpha(1f).translationY(0f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(ExecOnEndListener(execOnEnd))
+            .start()
     } else {
         animate().setInterpolator(FastOutSlowInInterpolator())
             .alpha(0f).translationY(-height / 2.0f)
             .setDuration(duration).setStartDelay(delay)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    isGone = true
-                    execOnEnd?.run()
-                }
-            }).start()
+            .setListener(HideAndExecOnEndListener(this, execOnEnd))
+            .start()
     }
 }
 
-fun View.slideUp(
-    duration: Long,
-    delay: Long,
-    @FloatRange(from = 0.0, to = 1.0) translationPercent: Float
-) {
-    slideUp(duration, delay, translationPercent, null)
-}
-
+@JvmOverloads
 fun View.slideUp(
     duration: Long,
     delay: Long = 0L,
@@ -324,11 +260,7 @@ fun View.slideUp(
         .setStartDelay(delay)
         .setDuration(duration)
         .setInterpolator(FastOutSlowInInterpolator())
-        .setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                execOnEnd?.run()
-            }
-        })
+        .setListener(ExecOnEndListener(execOnEnd))
         .start()
 }
 
@@ -342,6 +274,20 @@ fun View.animateHideRecyclerViewAllowingScrolling() {
     animate().alpha(0.0f).setDuration(200).start()
 }
 
+private open class ExecOnEndListener(private val execOnEnd: Runnable?) : AnimatorListenerAdapter() {
+    override fun onAnimationEnd(animation: Animator) {
+        execOnEnd?.run()
+    }
+}
+
+private class HideAndExecOnEndListener(private val view: View, execOnEnd: Runnable?) :
+    ExecOnEndListener(execOnEnd) {
+    override fun onAnimationEnd(animation: Animator) {
+        view.isGone = true
+        super.onAnimationEnd(animation)
+    }
+}
+
 enum class AnimationType {
     ALPHA, SCALE_AND_ALPHA, LIGHT_SCALE_AND_ALPHA, SLIDE_AND_ALPHA, LIGHT_SLIDE_AND_ALPHA
 }

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

@@ -228,6 +228,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         return count;
     }
 
+    @SuppressWarnings("FinalParameters")
     @Override
     public int getItemViewType(int position) {
         if (DEBUG) {
@@ -300,6 +301,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
+    @SuppressWarnings("FinalParameters")
     @Override
     public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
         if (DEBUG) {

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

@@ -98,7 +98,7 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     protected void initListeners() {
         super.initListeners();
 
-        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
+        itemListAdapter.setSelectedListener(new OnClickGesture<>() {
             @Override
             public void selected(final LocalItem selectedItem) {
                 final FragmentManager fragmentManager = getFM();
@@ -256,8 +256,8 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     }
 
     private void showLocalDialog(final PlaylistMetadataEntry selectedItem) {
-        final DialogEditTextBinding dialogBinding
-                = DialogEditTextBinding.inflate(getLayoutInflater());
+        final DialogEditTextBinding dialogBinding =
+                DialogEditTextBinding.inflate(getLayoutInflater());
         dialogBinding.dialogEditText.setHint(R.string.name);
         dialogBinding.dialogEditText.setInputType(InputType.TYPE_CLASS_TEXT);
         dialogBinding.dialogEditText.setText(selectedItem.name);