newpipe/error: declare variables from onCreate as lateinit

We will init them at the beginning of the view lifecycle, so they are
definitly not null.

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE/config.yml

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

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

@@ -1,38 +0,0 @@
-name: "Build unsigned release APK on master"
-
-on:
-  workflow_dispatch:
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: 'master'
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-          cache: 'gradle'
-
-      - name: "Build release APK"
-        run: ./gradlew assembleRelease --stacktrace
-
-      - name: "Rename APK"
-        run: |
-          VERSION_NAME="$(jq -r ".elements[0].versionName" "app/build/outputs/apk/release/output-metadata.json")"
-          echo "Version name: $VERSION_NAME" >> "$GITHUB_STEP_SUMMARY"
-          echo '```json' >> "$GITHUB_STEP_SUMMARY"
-          cat "app/build/outputs/apk/release/output-metadata.json" >> "$GITHUB_STEP_SUMMARY"
-          echo >> "$GITHUB_STEP_SUMMARY"
-          echo '```' >> "$GITHUB_STEP_SUMMARY"
-          # assume there is only one APK in that folder
-          mv app/build/outputs/apk/release/*.apk "app/build/outputs/apk/release/NewPipe_v$VERSION_NAME.apk"
-
-      - name: "Upload APK"
-        uses: actions/upload-artifact@v4
-        with:
-          name: app
-          path: app/build/outputs/apk/release/*.apk

.github/workflows/ci.yml

@@ -6,7 +6,6 @@ on:
     branches:
       - dev
       - master
-      - refactor
       - release**
     paths-ignore:
       - 'README.md'
@@ -47,10 +46,10 @@ jobs:
           BRANCH: ${{ github.head_ref }}
         run: git checkout -B "$BRANCH"
 
-      - name: set up JDK
+      - name: set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
@@ -64,7 +63,8 @@ jobs:
           path: app/build/outputs/apk/debug/*.apk
 
   test-android:
-    runs-on: ubuntu-latest
+    # macos has hardware acceleration. See android-emulator-runner action
+    runs-on: macos-latest
     timeout-minutes: 20
     strategy:
       matrix:
@@ -82,16 +82,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: set up JDK
+      - name: set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
@@ -121,10 +115,10 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 

.github/workflows/image-minimizer.js

@@ -32,8 +32,8 @@ module.exports = async ({github, context}) => {
     }
 
     // Regex for finding images (simple variant) ![ALT_TEXT](https://*.githubusercontent.com/<number>/<variousHexStringsAnd->.<fileExtension>)
-    const REGEX_USER_CONTENT_IMAGE_LOOKUP = /\!\[([^\]]*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
-    const REGEX_ASSETS_IMAGE_LOCKUP = /\!\[([^\]]*)\]\((https:\/\/github\.com\/[-\w\d]+\/[-\w\d]+\/assets\/\d+\/[\-0-9a-f]{32,512})\)/gm;
+    const REGEX_USER_CONTENT_IMAGE_LOOKUP = /\!\[(.*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
+    const REGEX_ASSETS_IMAGE_LOCKUP = /\!\[(.*)\]\((https:\/\/github\.com\/[-\w\d]+\/[-\w\d]+\/assets\/\d+\/[\-0-9a-f]{32,512})\)/gm;
 
     // Check if we found something
     let foundSimpleImages = REGEX_USER_CONTENT_IMAGE_LOOKUP.test(initialBody)

.idea/icon.svg

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

README.md

@@ -20,7 +20,7 @@
 <p align="center"><a href="https://newpipe.net">Website</a> &bull; <a href="https://newpipe.net/blog/">Blog</a> &bull; <a href="https://newpipe.net/FAQ/">FAQ</a> &bull; <a href="https://newpipe.net/press/">Press</a></p>
 <hr>
 
-*Read this document in other languages: [Deutsch](doc/README.de.md), [English](README.md), [Español](doc/README.es.md), [Français](doc/README.fr.md), [हिन्दी](doc/README.hi.md), [Italiano](doc/README.it.md), [한국어](doc/README.ko.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [ਪੰਜਾਬੀ ](doc/README.pa.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Soomaali](doc/README.so.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md), [অসমীয়া](doc/README.asm.md), [Српски](doc/README.sr.md), [العربية](README.ar.md)* 
+*Read this document in other languages: [Deutsch](doc/README.de.md), [English](README.md), [Español](doc/README.es.md), [Français](doc/README.fr.md), [हिन्दी](doc/README.hi.md), [Italiano](doc/README.it.md), [한국어](doc/README.ko.md), [Português Brasil](doc/README.pt_BR.md), [Polski](doc/README.pl.md), [ਪੰਜਾਬੀ ](doc/README.pa.md), [日本語](doc/README.ja.md), [Română](doc/README.ro.md), [Soomaali](doc/README.so.md), [Türkçe](doc/README.tr.md), [正體中文](doc/README.zh_TW.md), [অসমীয়া](doc/README.asm.md), [Српски](doc/README.sr.md)*
 
 > [!warning]
 > <b>THIS APP IS IN BETA, SO YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE IN OUR GITHUB REPOSITORY BY FILLING OUT THE ISSUE TEMPLATE.</b>
@@ -96,7 +96,7 @@ Also, since they are free and open source software, neither the app nor the Extr
 ## 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), [compare the signing key](#apk-info) and install it.
+ 2. Download the APK from [GitHub Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
  3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, 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.
@@ -104,20 +104,12 @@ You can install NewPipe using one of the following methods:
 We recommend method 1 for most users. APKs installed using method 1 or 2 are compatible with each other (meaning that if you installed NewPipe using either method 1 or 2, you can also update NewPipe using the other), but not with those installed using method 3. This is due to the same signing key (ours) being used for 1 and 2, but a different signing key (F-Droid's) being used for 3. Building a debug APK using method 4 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app. When using method 5, each APK is signed with a different random key supplied by GitHub Actions, so you cannot even update it. You will have to backup and restore the app data each time you wish to use a new APK.
 
 In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality breaks and F-Droid doesn't have the latest update yet), we recommend following this procedure:
-1. Back up your data via Settings > Backup and Restore > Export Database so you keep your history, subscriptions, and playlists
+1. Back up your data via Settings > Content > Export Database so you keep your history, subscriptions, and playlists
 2. Uninstall NewPipe
 3. Download the APK from the new source and install it
-4. Import the data from step 1 via Settings > Backup and Restore > Import Database
+4. Import the data from step 1 via Settings > Content > Import Database
 
-> [!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.
-
-### APK Info
-
-This is the SHA fingerprint of NewPipe's signing key to verify downloaded APKs which are signed by us. The fingerprint is also available on [NewPipe's website](https://newpipe.net#download). This is relevant for method 2.
-```
-CB:84:06:9B:D6:81:16:BA:FA:E5:EE:4E:E5:B0:8A:56:7A:A6:D8:98:40:4E:7C:B1:2F:9E:75:6D:F5:CF:5C:AB
-```
+<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>
 
 ## 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).

app/build.gradle

@@ -20,15 +20,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdk 21
         targetSdk 33
-        if (System.properties.containsKey('versionCodeOverride')) {
-            versionCode System.getProperty('versionCodeOverride') as Integer
-        } else {
-            versionCode 1003
-        }
-        versionName "0.27.6"
-        if (System.properties.containsKey('versionNameSuffix')) {
-            versionNameSuffix System.getProperty('versionNameSuffix')
-        }
+        versionCode 996
+        versionName "0.26.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -99,7 +92,6 @@ android {
 
     buildFeatures {
         viewBinding true
-        buildConfig true
     }
 
     packagingOptions {
@@ -120,7 +112,7 @@ ext {
     androidxRoomVersion = '2.6.1'
     androidxWorkVersion = '2.8.1'
 
-    stateSaverVersion = '1.4.1'
+    icepickVersion = '3.2.0'
     exoPlayerVersion = '2.18.7'
     googleAutoServiceVersion = '1.1.1'
     groupieVersion = '2.10.1'
@@ -206,9 +198,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    // WORKAROUND: if you get errors with the NewPipeExtractor dependency, replace `v0.24.3` with
-    // the corresponding commit hash, since JitPack is sometimes buggy
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:9f83b385a'
+    implementation 'com.github.Stypox:NewPipeExtractor:aaf3231fc75d7b4177549fec4aa7e672bfe84015'
     implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
@@ -241,13 +231,11 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:${androidxWorkVersion}"
     implementation "androidx.work:work-rxjava3:${androidxWorkVersion}"
     implementation 'com.google.android.material:material:1.11.0'
-    implementation "androidx.webkit:webkit:1.9.0"
 
 /** Third-party libraries **/
     // Instance state boilerplate elimination
-    implementation 'com.github.livefront:bridge:v2.0.2'
-    implementation "com.evernote:android-state:$stateSaverVersion"
-    kapt "com.evernote:android-state-processor:$stateSaverVersion"
+    implementation "frankiesardo:icepick:${icepickVersion}"
+    kapt "frankiesardo:icepick-processor:${icepickVersion}"
 
     // HTML parser
     implementation "org.jsoup:jsoup:1.17.2"
@@ -294,7 +282,7 @@ dependencies {
     implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
 
     // Date and time formatting
-    implementation "org.ocpsoft.prettytime:prettytime:5.0.8.Final"
+    implementation "org.ocpsoft.prettytime:prettytime:5.0.7.Final"
 
 /** Debugging **/
     // Memory leak detection

app/proguard-rules.pro

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

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

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

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

@@ -13,8 +13,6 @@ import org.junit.Assert.assertNull
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.schabi.newpipe.database.playlist.model.PlaylistEntity
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity
 import org.schabi.newpipe.extractor.ServiceList
 import org.schabi.newpipe.extractor.stream.StreamType
 
@@ -24,17 +22,13 @@ class DatabaseMigrationTest {
         private const val DEFAULT_SERVICE_ID = 0
         private const val DEFAULT_URL = "https://www.youtube.com/watch?v=cDphUib5iG4"
         private const val DEFAULT_TITLE = "Test Title"
-        private const val DEFAULT_NAME = "Test Name"
         private val DEFAULT_TYPE = StreamType.VIDEO_STREAM
         private const val DEFAULT_DURATION = 480L
         private const val DEFAULT_UPLOADER_NAME = "Uploader Test"
         private const val DEFAULT_THUMBNAIL = "https://example.com/example.jpg"
 
-        private const val DEFAULT_SECOND_SERVICE_ID = 1
+        private const val DEFAULT_SECOND_SERVICE_ID = 0
         private const val DEFAULT_SECOND_URL = "https://www.youtube.com/watch?v=ncQU6iBn5Fc"
-
-        private const val DEFAULT_THIRD_SERVICE_ID = 2
-        private const val DEFAULT_THIRD_URL = "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
     }
 
     @get:Rule
@@ -121,13 +115,6 @@ class DatabaseMigrationTest {
             Migrations.MIGRATION_7_8
         )
 
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME,
-            Migrations.DB_VER_9,
-            true,
-            Migrations.MIGRATION_8_9
-        )
-
         val migratedDatabaseV3 = getMigratedDatabase()
         val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst()
 
@@ -211,11 +198,6 @@ class DatabaseMigrationTest {
             true, Migrations.MIGRATION_7_8
         )
 
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME, Migrations.DB_VER_9,
-            true, Migrations.MIGRATION_8_9
-        )
-
         val migratedDatabaseV8 = getMigratedDatabase()
         val listFromDB = migratedDatabaseV8.searchHistoryDAO().all.blockingFirst()
 
@@ -225,94 +207,6 @@ class DatabaseMigrationTest {
         assertNotEquals(listFromDB[0].serviceId, listFromDB[1].serviceId)
     }
 
-    @Test
-    fun migrateDatabaseFrom8to9() {
-        val databaseInV8 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_8)
-
-        val localUid1: Long
-        val localUid2: Long
-        val remoteUid1: Long
-        val remoteUid2: Long
-        databaseInV8.run {
-            localUid1 = insert(
-                "playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("name", DEFAULT_NAME + "1")
-                    put("is_thumbnail_permanent", false)
-                    put("thumbnail_stream_id", -1)
-                }
-            )
-            localUid2 = insert(
-                "playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("name", DEFAULT_NAME + "2")
-                    put("is_thumbnail_permanent", false)
-                    put("thumbnail_stream_id", -1)
-                }
-            )
-            delete(
-                "playlists", "uid = ?",
-                Array(1) { localUid1 }
-            )
-            remoteUid1 = insert(
-                "remote_playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", DEFAULT_SERVICE_ID)
-                    put("url", DEFAULT_URL)
-                }
-            )
-            remoteUid2 = insert(
-                "remote_playlists", SQLiteDatabase.CONFLICT_FAIL,
-                ContentValues().apply {
-                    put("service_id", DEFAULT_SECOND_SERVICE_ID)
-                    put("url", DEFAULT_SECOND_URL)
-                }
-            )
-            delete(
-                "remote_playlists", "uid = ?",
-                Array(1) { remoteUid2 }
-            )
-            close()
-        }
-
-        testHelper.runMigrationsAndValidate(
-            AppDatabase.DATABASE_NAME,
-            Migrations.DB_VER_9,
-            true,
-            Migrations.MIGRATION_8_9
-        )
-
-        val migratedDatabaseV9 = getMigratedDatabase()
-        var localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
-        var remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
-
-        assertEquals(1, localListFromDB.size)
-        assertEquals(localUid2, localListFromDB[0].uid)
-        assertEquals(-1, localListFromDB[0].displayIndex)
-        assertEquals(1, remoteListFromDB.size)
-        assertEquals(remoteUid1, remoteListFromDB[0].uid)
-        assertEquals(-1, remoteListFromDB[0].displayIndex)
-
-        val localUid3 = migratedDatabaseV9.playlistDAO().insert(
-            PlaylistEntity(DEFAULT_NAME + "3", false, -1, -1)
-        )
-        val remoteUid3 = migratedDatabaseV9.playlistRemoteDAO().insert(
-            PlaylistRemoteEntity(
-                DEFAULT_THIRD_SERVICE_ID, DEFAULT_NAME, DEFAULT_THIRD_URL,
-                DEFAULT_THUMBNAIL, DEFAULT_UPLOADER_NAME, -1, 10
-            )
-        )
-
-        localListFromDB = migratedDatabaseV9.playlistDAO().all.blockingFirst()
-        remoteListFromDB = migratedDatabaseV9.playlistRemoteDAO().all.blockingFirst()
-        assertEquals(2, localListFromDB.size)
-        assertEquals(localUid3, localListFromDB[1].uid)
-        assertEquals(-1, localListFromDB[1].displayIndex)
-        assertEquals(2, remoteListFromDB.size)
-        assertEquals(remoteUid3, remoteListFromDB[1].uid)
-        assertEquals(-1, remoteListFromDB[1].displayIndex)
-    }
-
     private fun getMigratedDatabase(): AppDatabase {
         val database: AppDatabase = Room.databaseBuilder(
             ApplicationProvider.getApplicationContext(),

app/src/main/AndroidManifest.xml

@@ -64,9 +64,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService"/>
-            </intent-filter>
         </service>
 
         <activity
@@ -370,7 +367,6 @@
                 <data android:host="tilvids.com" />
                 <data android:host="video.lqdn.fr" />
                 <data android:host="video.ploud.fr" />
-                <data android:host="subscribeto.me" />
 
                 <data android:pathPrefix="/videos/" /> <!-- it contains playlists -->
                 <data android:pathPrefix="/w/" /> <!-- short video URLs -->
@@ -427,10 +423,5 @@
         <meta-data
             android:name="com.samsung.android.multidisplay.keep_process_alive"
             android:value="true" />
-        <!-- Android Auto -->
-        <meta-data android:name="com.google.android.gms.car.application"
-            android:resource="@xml/automotive_app_desc" />
-        <meta-data android:name="com.google.android.gms.car.notification.SmallIcon"
-            android:resource="@mipmap/ic_launcher" />
     </application>
 </manifest>

app/src/main/assets/po_token.html

@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"><head><title></title><script>
-/**
- * Factory method to create and load a BotGuardClient instance.
- * @param options - Configuration options for the BotGuardClient.
- * @returns A promise that resolves to a loaded BotGuardClient instance.
- */
-function loadBotGuard(challengeData) {
-  this.vm = this[challengeData.globalName];
-  this.program = challengeData.program;
-  this.vmFunctions = {};
-  this.syncSnapshotFunction = null;
-
-  if (!this.vm)
-    throw new Error('[BotGuardClient]: VM not found in the global object');
-
-  if (!this.vm.a)
-    throw new Error('[BotGuardClient]: Could not load program');
-
-  const vmFunctionsCallback = function (
-    asyncSnapshotFunction,
-    shutdownFunction,
-    passEventFunction,
-    checkCameraFunction
-  ) {
-    this.vmFunctions = {
-      asyncSnapshotFunction: asyncSnapshotFunction,
-      shutdownFunction: shutdownFunction,
-      passEventFunction: passEventFunction,
-      checkCameraFunction: checkCameraFunction
-    };
-  };
-
-  this.syncSnapshotFunction = this.vm.a(this.program, vmFunctionsCallback, true, this.userInteractionElement, function () {/** no-op */ }, [ [], [] ])[0]
-
-  // an asynchronous function runs in the background and it will eventually call
-  // `vmFunctionsCallback`, however we need to manually tell JavaScript to pass
-  // control to the things running in the background by interrupting this async
-  // function in any way, e.g. with a delay of 1ms. The loop is most probably not
-  // needed but is there just because.
-  return new Promise(function (resolve, reject) {
-    i = 0
-    refreshIntervalId = setInterval(function () {
-      if (!!this.vmFunctions.asyncSnapshotFunction) {
-        resolve(this)
-        clearInterval(refreshIntervalId);
-      }
-      if (i >= 10000) {
-        reject("asyncSnapshotFunction is null even after 10 seconds")
-        clearInterval(refreshIntervalId);
-      }
-      i += 1;
-    }, 1);
-  })
-}
-
-/**
- * Takes a snapshot asynchronously.
- * @returns The snapshot result.
- * @example
- * ```ts
- * const result = await botguard.snapshot({
- *   contentBinding: {
- *     c: "a=6&a2=10&b=SZWDwKVIuixOp7Y4euGTgwckbJA&c=1729143849&d=1&t=7200&c1a=1&c6a=1&c6b=1&hh=HrMb5mRWTyxGJphDr0nW2Oxonh0_wl2BDqWuLHyeKLo",
- *     e: "ENGAGEMENT_TYPE_VIDEO_LIKE",
- *     encryptedVideoId: "P-vC09ZJcnM"
- *    }
- * });
- *
- * console.log(result);
- * ```
- */
-function snapshot(args) {
-  return new Promise(function (resolve, reject) {
-    if (!this.vmFunctions.asyncSnapshotFunction)
-      return reject(new Error('[BotGuardClient]: Async snapshot function not found'));
-
-    this.vmFunctions.asyncSnapshotFunction(function (response) { resolve(response) }, [
-      args.contentBinding,
-      args.signedTimestamp,
-      args.webPoSignalOutput,
-      args.skipPrivacyBuffer
-    ]);
-  });
-}
-
-function runBotGuard(challengeData) {
-  const interpreterJavascript = challengeData.interpreterJavascript.privateDoNotAccessOrElseSafeScriptWrappedValue;
-
-  if (interpreterJavascript) {
-    new Function(interpreterJavascript)();
-  } else throw new Error('Could not load VM');
-
-  const webPoSignalOutput = [];
-  return loadBotGuard({
-    globalName: challengeData.globalName,
-    globalObj: this,
-    program: challengeData.program
-  }).then(function (botguard) {
-    return botguard.snapshot({ webPoSignalOutput: webPoSignalOutput })
-  }).then(function (botguardResponse) {
-    return { webPoSignalOutput: webPoSignalOutput, botguardResponse: botguardResponse }
-  })
-}
-
-function obtainPoToken(webPoSignalOutput, integrityToken, identifier) {
-  const getMinter = webPoSignalOutput[0];
-
-  if (!getMinter)
-    throw new Error('PMD:Undefined');
-
-  const mintCallback = getMinter(integrityToken);
-
-  if (!(mintCallback instanceof Function))
-    throw new Error('APF:Failed');
-
-  const result = mintCallback(identifier);
-
-  if (!result)
-    throw new Error('YNJ:Undefined');
-
-  if (!(result instanceof Uint8Array))
-    throw new Error('ODM:Invalid');
-
-  return result;
-}
-</script></head><body></body></html>

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

@@ -17,17 +17,14 @@ import org.acra.config.CoreConfigurationBuilder;
 import org.schabi.newpipe.error.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.downloader.Downloader;
-import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.settings.NewPipeSettings;
-import org.schabi.newpipe.util.BridgeStateSaverInitializer;
 import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.image.ImageStrategy;
 import org.schabi.newpipe.util.image.PicassoHelper;
+import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.image.PreferredImageQuality;
-import org.schabi.newpipe.util.potoken.PoTokenProviderImpl;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -104,7 +101,6 @@ public class App extends Application {
             Localization.getPreferredContentCountry(this));
         Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
 
-        BridgeStateSaverInitializer.init(this);
         StateSaver.init(this);
         initNotificationChannels();
 
@@ -120,8 +116,6 @@ public class App extends Application {
                 && prefs.getBoolean(getString(R.string.show_image_indicators_key), false));
 
         configureRxJavaErrorHandler();
-
-        YoutubeStreamExtractor.setPoTokenProvider(PoTokenProviderImpl.INSTANCE);
     }
 
     @Override

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

@@ -10,9 +10,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
-
+import icepick.Icepick;
+import icepick.State;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
@@ -49,7 +48,7 @@ public abstract class BaseFragment extends Fragment {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
         super.onCreate(savedInstanceState);
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
         if (savedInstanceState != null) {
             onRestoreInstanceState(savedInstanceState);
         }
@@ -71,7 +70,7 @@ public abstract class BaseFragment extends Fragment {
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
     protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {

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

@@ -29,7 +29,7 @@ import okhttp3.ResponseBody;
 
 public final class DownloaderImpl extends Downloader {
     public static final String USER_AGENT =
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0";
+            "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";
@@ -137,8 +137,7 @@ public final class DownloaderImpl extends Downloader {
         }
 
         final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
-                .method(httpMethod, requestBody)
-                .url(url)
+                .method(httpMethod, requestBody).url(url)
                 .addHeader("User-Agent", USER_AGENT);
 
         final String cookies = getCookies(url);
@@ -146,33 +145,38 @@ public final class DownloaderImpl extends Downloader {
             requestBuilder.addHeader("Cookie", cookies);
         }
 
-        headers.forEach((headerName, headerValueList) -> {
-            requestBuilder.removeHeader(headerName);
-            headerValueList.forEach(headerValue ->
-                    requestBuilder.addHeader(headerName, headerValue));
-        });
+        for (final Map.Entry<String, List<String>> pair : headers.entrySet()) {
+            final String headerName = pair.getKey();
+            final List<String> headerValueList = pair.getValue();
 
-        try (
-                okhttp3.Response response = client.newCall(requestBuilder.build()).execute()
-        ) {
-            if (response.code() == 429) {
-                throw new ReCaptchaException("reCaptcha Challenge requested", url);
-            }
-
-            String responseBodyToReturn = null;
-            try (ResponseBody body = response.body()) {
-                if (body != null) {
-                    responseBodyToReturn = body.string();
+            if (headerValueList.size() > 1) {
+                requestBuilder.removeHeader(headerName);
+                for (final String headerValue : headerValueList) {
+                    requestBuilder.addHeader(headerName, headerValue);
                 }
+            } else if (headerValueList.size() == 1) {
+                requestBuilder.header(headerName, headerValueList.get(0));
             }
 
-            final String latestUrl = response.request().url().toString();
-            return new Response(
-                    response.code(),
-                    response.message(),
-                    response.headers().toMultimap(),
-                    responseBodyToReturn,
-                    latestUrl);
         }
+
+        final okhttp3.Response response = client.newCall(requestBuilder.build()).execute();
+
+        if (response.code() == 429) {
+            response.close();
+
+            throw new ReCaptchaException("reCaptcha Challenge requested", url);
+        }
+
+        final ResponseBody body = response.body();
+        String responseBodyToReturn = null;
+
+        if (body != null) {
+            responseBodyToReturn = body.string();
+        }
+
+        final String latestUrl = response.request().url().toString();
+        return new Response(response.code(), response.message(), response.headers().toMultimap(),
+                responseBodyToReturn, latestUrl);
     }
 }

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

@@ -92,7 +92,6 @@ import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.views.FocusOverlayView;
 
 import java.util.ArrayList;
@@ -121,8 +120,7 @@ public class MainActivity extends AppCompatActivity {
     private static final int ITEM_ID_DOWNLOADS = -4;
     private static final int ITEM_ID_HISTORY = -5;
     private static final int ITEM_ID_SETTINGS = 0;
-    private static final int ITEM_ID_DONATION = 1;
-    private static final int ITEM_ID_ABOUT = 2;
+    private static final int ITEM_ID_ABOUT = 1;
 
     private static final int ORDER = 0;
 
@@ -264,10 +262,6 @@ public class MainActivity extends AppCompatActivity {
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
                 .setIcon(R.drawable.ic_settings);
-        drawerLayoutBinding.navigation.getMenu()
-                .add(R.id.menu_options_about_group, ITEM_ID_DONATION, ORDER,
-                        R.string.donation_title)
-                .setIcon(R.drawable.volunteer_activism_ic);
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
                 .setIcon(R.drawable.ic_info_outline);
@@ -343,9 +337,6 @@ public class MainActivity extends AppCompatActivity {
             case ITEM_ID_SETTINGS:
                 NavigationHelper.openSettings(this);
                 break;
-            case ITEM_ID_DONATION:
-                ShareUtils.openUrlInBrowser(this, getString(R.string.donation_url));
-                break;
             case ITEM_ID_ABOUT:
                 NavigationHelper.openAbout(this);
                 break;
@@ -848,8 +839,7 @@ public class MainActivity extends AppCompatActivity {
                 @Override
                 public void onReceive(final Context context, final Intent intent) {
                     if (Objects.equals(intent.getAction(),
-                            VideoDetailFragment.ACTION_PLAYER_STARTED)
-                            && PlayerHolder.getInstance().isPlayerOpen()) {
+                            VideoDetailFragment.ACTION_PLAYER_STARTED)) {
                         openMiniPlayerIfMissing();
                         // At this point the player is added 100%, we can unregister. Other actions
                         // are useless since the fragment will not be removed after that.
@@ -861,10 +851,6 @@ public class MainActivity extends AppCompatActivity {
             final IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(VideoDetailFragment.ACTION_PLAYER_STARTED);
             registerReceiver(broadcastReceiver, intentFilter);
-
-            // If the PlayerHolder is not bound yet, but the service is running, try to bind to it.
-            // Once the connection is established, the ACTION_PLAYER_STARTED will be sent.
-            PlayerHolder.getInstance().tryBindIfNeeded(this);
         }
     }
 
@@ -938,5 +924,4 @@ public class MainActivity extends AppCompatActivity {
         return sheetState == BottomSheetBehavior.STATE_HIDDEN
                 || sheetState == BottomSheetBehavior.STATE_COLLAPSED;
     }
-
 }

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

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

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

@@ -41,9 +41,6 @@ import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
-
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
 import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
@@ -101,6 +98,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 
+import icepick.Icepick;
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
@@ -153,7 +152,7 @@ public class RouterActivity extends AppCompatActivity {
         getWindow().setAttributes(params);
 
         super.onCreate(savedInstanceState);
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
         // FragmentManager will take care to recreate (Playlist|Download)Dialog when screen rotates
         // We used to .setOnDismissListener(dialog -> finish()); when creating these DialogFragments
@@ -198,7 +197,7 @@ public class RouterActivity extends AppCompatActivity {
     @Override
     protected void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
     @Override

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

@@ -138,12 +138,8 @@ class AboutActivity : AppCompatActivity() {
                 "https://github.com/lisawray/groupie", StandardLicenses.MIT
             ),
             SoftwareComponent(
-                "Android-State", "2018", "Evernote",
-                "https://github.com/Evernote/android-state", StandardLicenses.EPL1
-            ),
-            SoftwareComponent(
-                "Bridge", "2021", "Livefront",
-                "https://github.com/livefront/bridge", StandardLicenses.APACHE2
+                "Icepick", "2015", "Frankie Sardo",
+                "https://github.com/frankiesardo/icepick", StandardLicenses.EPL1
             ),
             SoftwareComponent(
                 "Jsoup", "2009 - 2020", "Jonathan Hedley",

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

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

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

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

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

@@ -3,8 +3,6 @@ package org.schabi.newpipe.database.history.model
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
 import org.schabi.newpipe.database.stream.model.StreamEntity
-import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.util.image.ImageStrategy
 import java.time.OffsetDateTime
 
 data class StreamHistoryEntry(
@@ -29,17 +27,4 @@ data class StreamHistoryEntry(
         return this.streamEntity.uid == other.streamEntity.uid && streamId == other.streamId &&
             accessDate.isEqual(other.accessDate)
     }
-
-    fun toStreamInfoItem(): StreamInfoItem =
-        StreamInfoItem(
-            streamEntity.serviceId,
-            streamEntity.url,
-            streamEntity.title,
-            streamEntity.streamType,
-        ).apply {
-            duration = streamEntity.duration
-            uploaderName = streamEntity.uploader
-            uploaderUrl = streamEntity.uploaderUrl
-            thumbnails = ImageStrategy.dbUrlToImageList(streamEntity.thumbnailUrl)
-        }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.database.playlist.model;
 
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -22,6 +21,7 @@ import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.RE
 
 @Entity(tableName = REMOTE_PLAYLIST_TABLE,
         indices = {
+                @Index(value = {REMOTE_PLAYLIST_NAME}),
                 @Index(value = {REMOTE_PLAYLIST_SERVICE_ID, REMOTE_PLAYLIST_URL}, unique = true)
         })
 public class PlaylistRemoteEntity implements PlaylistLocalItem {
@@ -32,7 +32,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
     public static final String REMOTE_PLAYLIST_URL = "url";
     public static final String REMOTE_PLAYLIST_THUMBNAIL_URL = "thumbnail_url";
     public static final String REMOTE_PLAYLIST_UPLOADER_NAME = "uploader";
-    public static final String REMOTE_PLAYLIST_DISPLAY_INDEX = "display_index";
     public static final String REMOTE_PLAYLIST_STREAM_COUNT = "stream_count";
 
     @PrimaryKey(autoGenerate = true)
@@ -54,9 +53,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
     @ColumnInfo(name = REMOTE_PLAYLIST_UPLOADER_NAME)
     private String uploader;
 
-    @ColumnInfo(name = REMOTE_PLAYLIST_DISPLAY_INDEX)
-    private long displayIndex = -1; // Make sure the new item is on the top
-
     @ColumnInfo(name = REMOTE_PLAYLIST_STREAM_COUNT)
     private Long streamCount;
 
@@ -71,19 +67,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
         this.streamCount = streamCount;
     }
 
-    @Ignore
-    public PlaylistRemoteEntity(final int serviceId, final String name, final String url,
-                                final String thumbnailUrl, final String uploader,
-                                final long displayIndex, final Long streamCount) {
-        this.serviceId = serviceId;
-        this.name = name;
-        this.url = url;
-        this.thumbnailUrl = thumbnailUrl;
-        this.uploader = uploader;
-        this.displayIndex = displayIndex;
-        this.streamCount = streamCount;
-    }
-
     @Ignore
     public PlaylistRemoteEntity(final PlaylistInfo info) {
         this(info.getServiceId(), info.getName(), info.getUrl(),
@@ -110,7 +93,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
                 && TextUtils.equals(getUploader(), info.getUploaderName());
     }
 
-    @Override
     public long getUid() {
         return uid;
     }
@@ -135,8 +117,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
         this.name = name;
     }
 
-    @Nullable
-    @Override
     public String getThumbnailUrl() {
         return thumbnailUrl;
     }
@@ -161,16 +141,6 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
         this.uploader = uploader;
     }
 
-    @Override
-    public long getDisplayIndex() {
-        return displayIndex;
-    }
-
-    @Override
-    public void setDisplayIndex(final long displayIndex) {
-        this.displayIndex = displayIndex;
-    }
-
     public Long getStreamCount() {
         return streamCount;
     }

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.database.subscription;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -96,12 +95,11 @@ public class SubscriptionEntity {
         this.name = name;
     }
 
-    @Nullable
     public String getAvatarUrl() {
         return avatarUrl;
     }
 
-    public void setAvatarUrl(@Nullable final String avatarUrl) {
+    public void setAvatarUrl(final String avatarUrl) {
         this.avatarUrl = avatarUrl;
     }
 

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

@@ -39,8 +39,6 @@ import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
 import com.nononsenseapps.filepicker.Utils;
 
 import org.schabi.newpipe.MainActivity;
@@ -61,8 +59,6 @@ import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard;
 import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
 import org.schabi.newpipe.streams.io.StoredFileHelper;
-import org.schabi.newpipe.util.AudioTrackAdapter;
-import org.schabi.newpipe.util.AudioTrackAdapter.AudioTracksWrapper;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
@@ -71,6 +67,8 @@ import org.schabi.newpipe.util.SecondaryStreamHelper;
 import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
+import org.schabi.newpipe.util.AudioTrackAdapter;
+import org.schabi.newpipe.util.AudioTrackAdapter.AudioTracksWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.File;
@@ -81,6 +79,8 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 
+import icepick.Icepick;
+import icepick.State;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import us.shandian.giga.get.MissionRecoveryInfo;
 import us.shandian.giga.postprocessing.Postprocessing;
@@ -214,7 +214,7 @@ public class DownloadDialog extends DialogFragment
         context = getContext();
 
         setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
         this.audioTrackAdapter = new AudioTrackAdapter(wrappedAudioTracks);
         this.subtitleStreamsAdapter = new StreamItemAdapter<>(wrappedSubtitleStreams);
@@ -372,7 +372,7 @@ public class DownloadDialog extends DialogFragment
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
 
@@ -859,19 +859,20 @@ public class DownloadDialog extends DialogFragment
             return;
         }
 
-        // Check for free storage space
-        final long freeSpace = mainStorage.getFreeStorageSpace();
-        if (freeSpace <= size) {
-            Toast.makeText(context, getString(R.
-                    string.error_insufficient_storage), Toast.LENGTH_LONG).show();
-            // move the user to storage setting tab
-            final Intent storageSettingsIntent = new Intent(Settings.
-                    ACTION_INTERNAL_STORAGE_SETTINGS);
-            if (storageSettingsIntent.resolveActivity(context.getPackageManager())
-                    != null) {
-                startActivity(storageSettingsIntent);
+        // Check for free memory space (for api 24 and up)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            final long freeSpace = mainStorage.getFreeMemory();
+            if (freeSpace <= size) {
+                Toast.makeText(context, getString(R.
+                        string.error_insufficient_storage), Toast.LENGTH_LONG).show();
+                // move the user to storage setting tab
+                final Intent storageSettingsIntent = new Intent(Settings.
+                        ACTION_INTERNAL_STORAGE_SETTINGS);
+                if (storageSettingsIntent.resolveActivity(context.getPackageManager()) != null) {
+                    startActivity(storageSettingsIntent);
+                }
+                return;
             }
-            return;
         }
 
         // check for existing file with the same name

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

@@ -1,13 +1,11 @@
-package org.schabi.newpipe.error;
+package org.schabi.newpipe.error
 
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import org.acra.ReportField;
-import org.acra.data.CrashReportData;
-import org.acra.sender.ReportSender;
-import org.schabi.newpipe.R;
+import android.content.Context
+import org.acra.ReportField
+import org.acra.data.CrashReportData
+import org.acra.sender.ReportSender
+import org.schabi.newpipe.R
+import org.schabi.newpipe.error.ErrorUtil.Companion.openActivity
 
 /*
  * Created by Christian Schabesberger  on 13.09.16.
@@ -28,16 +26,19 @@ import org.schabi.newpipe.R;
  * You should have received a copy of the GNU General Public License
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
+class AcraReportSender : ReportSender {
+    override fun send(context: Context, errorContent: CrashReportData) {
 
-public class AcraReportSender implements ReportSender {
-
-    @Override
-    public void send(@NonNull final Context context, @NonNull final CrashReportData report) {
-        ErrorUtil.openActivity(context, new ErrorInfo(
-                new String[]{report.getString(ReportField.STACK_TRACE)},
+        openActivity(
+            context,
+            ErrorInfo(
+                errorContent.getString(ReportField.STACK_TRACE)?.let { arrayOf(it) }
+                    ?: emptyArray(),
                 UserAction.UI_ERROR,
                 ErrorInfo.SERVICE_NONE,
                 "ACRA report",
-                R.string.app_ui_crash));
+                R.string.app_ui_crash
+            )
+        )
     }
 }

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

@@ -1,44 +0,0 @@
-package org.schabi.newpipe.error;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-import com.google.auto.service.AutoService;
-
-import org.acra.config.CoreConfiguration;
-import org.acra.sender.ReportSender;
-import org.acra.sender.ReportSenderFactory;
-import org.schabi.newpipe.App;
-
-/*
- * Created by Christian Schabesberger on 13.09.16.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * AcraReportSenderFactory.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * Used by ACRA in {@link App}.initAcra() as the factory for report senders.
- */
-@AutoService(ReportSenderFactory.class)
-public class AcraReportSenderFactory implements ReportSenderFactory {
-    @NonNull
-    public ReportSender create(@NonNull final Context context,
-                               @NonNull final CoreConfiguration config) {
-        return new AcraReportSender();
-    }
-}

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

@@ -1,327 +0,0 @@
-package org.schabi.newpipe.error;
-
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.IntentCompat;
-
-import com.grack.nanojson.JsonWriter;
-
-import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.ActivityErrorBinding;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-/*
- * Created by Christian Schabesberger on 24.10.15.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ErrorActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 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();
-    // BUNDLE TAGS
-    public static final String ERROR_INFO = "error_info";
-
-    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";
-
-    private ErrorInfo errorInfo;
-    private String currentTimeStamp;
-
-    private ActivityErrorBinding activityErrorBinding;
-
-
-    ////////////////////////////////////////////////////////////////////////
-    // Activity lifecycle
-    ////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        assureCorrectAppLanguage(this);
-        super.onCreate(savedInstanceState);
-
-        ThemeHelper.setDayNightMode(this);
-        ThemeHelper.setTheme(this);
-
-        activityErrorBinding = ActivityErrorBinding.inflate(getLayoutInflater());
-        setContentView(activityErrorBinding.getRoot());
-
-        final Intent intent = getIntent();
-
-        setSupportActionBar(activityErrorBinding.toolbarLayout.toolbar);
-
-        final ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(R.string.error_report_title);
-            actionBar.setDisplayShowTitleEnabled(true);
-        }
-
-        errorInfo = IntentCompat.getParcelableExtra(intent, ERROR_INFO, ErrorInfo.class);
-
-        // important add guru meditation
-        addGuruMeditation();
-        // print current time, as zoned ISO8601 timestamp
-        final ZonedDateTime now = ZonedDateTime.now();
-        currentTimeStamp = now.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-
-        activityErrorBinding.errorReportEmailButton.setOnClickListener(v ->
-                openPrivacyPolicyDialog(this, "EMAIL"));
-
-        activityErrorBinding.errorReportCopyButton.setOnClickListener(v ->
-                ShareUtils.copyToClipboard(this, buildMarkdown()));
-
-        activityErrorBinding.errorReportGitHubButton.setOnClickListener(v ->
-                openPrivacyPolicyDialog(this, "GITHUB"));
-
-        // normal bugreport
-        buildInfo(errorInfo);
-        activityErrorBinding.errorMessageView.setText(errorInfo.getMessageStringId());
-        activityErrorBinding.errorView.setText(formErrorText(errorInfo.getStackTraces()));
-
-        // print stack trace once again for debugging:
-        for (final String e : errorInfo.getStackTraces()) {
-            Log.e(TAG, e);
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        final MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.error_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-            case R.id.menu_item_share_error:
-                ShareUtils.shareText(getApplicationContext(),
-                        getString(R.string.error_report_title), buildJson());
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private void openPrivacyPolicyDialog(final Context context, final String action) {
-        new AlertDialog.Builder(context)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setTitle(R.string.privacy_policy_title)
-                .setMessage(R.string.start_accept_privacy_policy)
-                .setCancelable(false)
-                .setNeutralButton(R.string.read_privacy_policy, (dialog, which) ->
-                        ShareUtils.openUrlInApp(context,
-                                context.getString(R.string.privacy_policy_url)))
-                .setPositiveButton(R.string.accept, (dialog, which) -> {
-                    if (action.equals("EMAIL")) { // send on email
-                        final Intent i = new Intent(Intent.ACTION_SENDTO)
-                                .setData(Uri.parse("mailto:")) // only email apps should handle this
-                                .putExtra(Intent.EXTRA_EMAIL, new String[]{ERROR_EMAIL_ADDRESS})
-                                .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT
-                                        + getString(R.string.app_name) + " "
-                                        + BuildConfig.VERSION_NAME)
-                                .putExtra(Intent.EXTRA_TEXT, buildJson());
-                        ShareUtils.openIntentInApp(context, i);
-                    } else if (action.equals("GITHUB")) { // open the NewPipe issue page on GitHub
-                        ShareUtils.openUrlInApp(this, ERROR_GITHUB_ISSUE_URL);
-                    }
-                })
-                .setNegativeButton(R.string.decline, null)
-                .show();
-    }
-
-    private String formErrorText(final String[] el) {
-        final String separator = "-------------------------------------";
-        return Arrays.stream(el)
-                .collect(Collectors.joining(separator + "\n", separator + "\n", separator));
-    }
-
-    private void buildInfo(final ErrorInfo info) {
-        String text = "";
-
-        activityErrorBinding.errorInfoLabelsView.setText(getString(R.string.info_labels)
-                .replace("\\n", "\n"));
-
-        text += getUserActionString(info.getUserAction()) + "\n"
-                + info.getRequest() + "\n"
-                + getContentLanguageString() + "\n"
-                + getContentCountryString() + "\n"
-                + getAppLanguage() + "\n"
-                + info.getServiceName() + "\n"
-                + currentTimeStamp + "\n"
-                + getPackageName() + "\n"
-                + BuildConfig.VERSION_NAME + "\n"
-                + getOsString();
-
-        activityErrorBinding.errorInfosView.setText(text);
-    }
-
-    private String buildJson() {
-        try {
-            return JsonWriter.string()
-                    .object()
-                    .value("user_action", getUserActionString(errorInfo.getUserAction()))
-                    .value("request", errorInfo.getRequest())
-                    .value("content_language", getContentLanguageString())
-                    .value("content_country", getContentCountryString())
-                    .value("app_language", getAppLanguage())
-                    .value("service", errorInfo.getServiceName())
-                    .value("package", getPackageName())
-                    .value("version", BuildConfig.VERSION_NAME)
-                    .value("os", getOsString())
-                    .value("time", currentTimeStamp)
-                    .array("exceptions", Arrays.asList(errorInfo.getStackTraces()))
-                    .value("user_comment", activityErrorBinding.errorCommentBox.getText()
-                            .toString())
-                    .end()
-                    .done();
-        } catch (final Throwable e) {
-            Log.e(TAG, "Error while erroring: Could not build json");
-            e.printStackTrace();
-        }
-
-        return "";
-    }
-
-    private String buildMarkdown() {
-        try {
-            final StringBuilder htmlErrorReport = new StringBuilder();
-
-            final String userComment = activityErrorBinding.errorCommentBox.getText().toString();
-            if (!userComment.isEmpty()) {
-                htmlErrorReport.append(userComment).append("\n");
-            }
-
-            // basic error info
-            htmlErrorReport
-                    .append("## Exception")
-                    .append("\n* __User Action:__ ")
-                        .append(getUserActionString(errorInfo.getUserAction()))
-                    .append("\n* __Request:__ ").append(errorInfo.getRequest())
-                    .append("\n* __Content Country:__ ").append(getContentCountryString())
-                    .append("\n* __Content Language:__ ").append(getContentLanguageString())
-                    .append("\n* __App Language:__ ").append(getAppLanguage())
-                    .append("\n* __Service:__ ").append(errorInfo.getServiceName())
-                    .append("\n* __Timestamp:__ ").append(currentTimeStamp)
-                    .append("\n* __Package:__ ").append(getPackageName())
-                    .append("\n* __Service:__ ").append(errorInfo.getServiceName())
-                    .append("\n* __Version:__ ").append(BuildConfig.VERSION_NAME)
-                    .append("\n* __OS:__ ").append(getOsString()).append("\n");
-
-
-            // Collapse all logs to a single paragraph when there are more than one
-            // to keep the GitHub issue clean.
-            if (errorInfo.getStackTraces().length > 1) {
-                htmlErrorReport
-                        .append("<details><summary><b>Exceptions (")
-                        .append(errorInfo.getStackTraces().length)
-                        .append(")</b></summary><p>\n");
-            }
-
-            // add the logs
-            for (int i = 0; i < errorInfo.getStackTraces().length; i++) {
-                htmlErrorReport.append("<details><summary><b>Crash log ");
-                if (errorInfo.getStackTraces().length > 1) {
-                    htmlErrorReport.append(i + 1);
-                }
-                htmlErrorReport.append("</b>")
-                        .append("</summary><p>\n")
-                        .append("\n```\n").append(errorInfo.getStackTraces()[i]).append("\n```\n")
-                        .append("</details>\n");
-            }
-
-            // make sure to close everything
-            if (errorInfo.getStackTraces().length > 1) {
-                htmlErrorReport.append("</p></details>\n");
-            }
-            htmlErrorReport.append("<hr>\n");
-            return htmlErrorReport.toString();
-        } catch (final Throwable e) {
-            Log.e(TAG, "Error while erroring: Could not build markdown");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    private String getUserActionString(final UserAction userAction) {
-        if (userAction == null) {
-            return "Your description is in another castle.";
-        } else {
-            return userAction.getMessage();
-        }
-    }
-
-    private String getContentCountryString() {
-        return Localization.getPreferredContentCountry(this).getCountryCode();
-    }
-
-    private String getContentLanguageString() {
-        return Localization.getPreferredLocalization(this).getLocalizationCode();
-    }
-
-    private String getAppLanguage() {
-        return Localization.getAppLocale(getApplicationContext()).toString();
-    }
-
-    private String getOsString() {
-        final String osBase = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                ? Build.VERSION.BASE_OS : "Android";
-        return System.getProperty("os.name")
-                + " " + (osBase.isEmpty() ? "Android" : osBase)
-                + " " + Build.VERSION.RELEASE
-                + " - " + Build.VERSION.SDK_INT;
-    }
-
-    private void addGuruMeditation() {
-        //just an easter egg
-        String text = activityErrorBinding.errorSorryView.getText().toString();
-        text += "\n" + getString(R.string.guru_meditation);
-        activityErrorBinding.errorSorryView.setText(text);
-    }
-}

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

@@ -0,0 +1,353 @@
+package org.schabi.newpipe.error
+
+import android.app.Activity
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.IntentCompat
+import com.grack.nanojson.JsonWriter
+import org.schabi.newpipe.BuildConfig
+import org.schabi.newpipe.MainActivity
+import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.ActivityErrorBinding
+import org.schabi.newpipe.util.Localization
+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 java.util.stream.Collectors
+
+/*
+ * Created by Christian Schabesberger on 24.10.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ErrorActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/**
+ * This activity is used to show error details and allow reporting them in various ways. Use [ ][ErrorUtil.openActivity] to correctly open this activity.
+ */
+class ErrorActivity : AppCompatActivity() {
+    private lateinit var errorInfo: ErrorInfo
+    private lateinit var currentTimeStamp: String
+    private lateinit var activityErrorBinding: ActivityErrorBinding
+
+    // //////////////////////////////////////////////////////////////////////
+    // Activity lifecycle
+    // //////////////////////////////////////////////////////////////////////
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Localization.assureCorrectAppLanguage(this)
+        super.onCreate(savedInstanceState)
+        ThemeHelper.setDayNightMode(this)
+        ThemeHelper.setTheme(this)
+        activityErrorBinding = ActivityErrorBinding.inflate(
+            layoutInflater
+        )
+        setContentView(activityErrorBinding.root)
+        val intent = intent
+        setSupportActionBar(activityErrorBinding.toolbarLayout.toolbar)
+        val actionBar = supportActionBar
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true)
+            actionBar.setTitle(R.string.error_report_title)
+            actionBar.setDisplayShowTitleEnabled(true)
+        }
+        errorInfo = IntentCompat.getParcelableExtra(intent, ERROR_INFO, ErrorInfo::class.java)!!
+
+        // important add guru meditation
+        addGuruMeditation()
+        currentTimeStamp = CURRENT_TIMESTAMP_FORMATTER.format(LocalDateTime.now())
+        activityErrorBinding.errorReportEmailButton.setOnClickListener { _: View? ->
+            openPrivacyPolicyDialog(
+                this,
+                "EMAIL"
+            )
+        }
+        activityErrorBinding.errorReportCopyButton.setOnClickListener { _: View? ->
+            ShareUtils.copyToClipboard(
+                this,
+                buildMarkdown()
+            )
+        }
+        activityErrorBinding.errorReportGitHubButton.setOnClickListener { _: View? ->
+            openPrivacyPolicyDialog(
+                this,
+                "GITHUB"
+            )
+        }
+
+        // normal bugreport
+        buildInfo(errorInfo)
+        activityErrorBinding.errorMessageView.setText(errorInfo.messageStringId)
+        activityErrorBinding.errorView.text = formErrorText(errorInfo.stackTraces)
+
+        // print stack trace once again for debugging:
+        for (e in errorInfo.stackTraces) {
+            Log.e(TAG, e)
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.error_menu, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+
+            R.id.menu_item_share_error -> {
+                ShareUtils.shareText(
+                    applicationContext,
+                    getString(R.string.error_report_title), buildJson()
+                )
+                true
+            }
+
+            else -> false
+        }
+    }
+
+    private fun openPrivacyPolicyDialog(context: Context, action: String) {
+        AlertDialog.Builder(context)
+            .setIcon(android.R.drawable.ic_dialog_alert)
+            .setTitle(R.string.privacy_policy_title)
+            .setMessage(R.string.start_accept_privacy_policy)
+            .setCancelable(false)
+            .setNeutralButton(R.string.read_privacy_policy) { _: DialogInterface?, _: Int ->
+                ShareUtils.openUrlInApp(
+                    context,
+                    context.getString(R.string.privacy_policy_url)
+                )
+            }
+            .setPositiveButton(R.string.accept) { _: DialogInterface?, _: Int ->
+                if (action == "EMAIL") { // send on email
+                    val i = Intent(Intent.ACTION_SENDTO)
+                        .setData(Uri.parse("mailto:")) // only email apps should handle this
+                        .putExtra(Intent.EXTRA_EMAIL, arrayOf(ERROR_EMAIL_ADDRESS))
+                        .putExtra(
+                            Intent.EXTRA_SUBJECT,
+                            ERROR_EMAIL_SUBJECT +
+                                getString(R.string.app_name) + " " +
+                                BuildConfig.VERSION_NAME
+                        )
+                        .putExtra(Intent.EXTRA_TEXT, buildJson())
+                    ShareUtils.openIntentInApp(context, i)
+                } else if (action == "GITHUB") { // open the NewPipe issue page on GitHub
+                    ShareUtils.openUrlInApp(this, ERROR_GITHUB_ISSUE_URL)
+                }
+            }
+            .setNegativeButton(R.string.decline, null)
+            .show()
+    }
+
+    private fun formErrorText(el: Array<String>): String {
+        val separator = "-------------------------------------"
+        return Arrays.stream(el)
+            .collect(
+                Collectors.joining(
+                    """
+    $separator
+    
+                    """.trimIndent(),
+                    """
+     $separator
+     
+                    """.trimIndent(),
+                    separator
+                )
+            )
+    }
+
+    private fun buildInfo(info: ErrorInfo) {
+        var text = ""
+        activityErrorBinding.errorInfoLabelsView.text = getString(R.string.info_labels)
+            .replace("\\n", "\n")
+        text += """
+            ${getUserActionString(info.userAction)}
+            ${info.request}
+            $contentLanguageString
+            $contentCountryString
+            $appLanguage
+            ${info.serviceName}
+            $currentTimeStamp
+            $packageName
+            ${BuildConfig.VERSION_NAME}
+            $osString
+        """.trimIndent()
+        activityErrorBinding.errorInfosView.text = text
+    }
+
+    private fun buildJson(): String {
+        try {
+            return JsonWriter.string()
+                .`object`()
+                .value("user_action", getUserActionString(errorInfo.userAction))
+                .value("request", errorInfo.request)
+                .value("content_language", contentLanguageString)
+                .value("content_country", contentCountryString)
+                .value("app_language", appLanguage)
+                .value("service", errorInfo.serviceName)
+                .value("package", packageName)
+                .value("version", BuildConfig.VERSION_NAME)
+                .value("os", osString)
+                .value("time", currentTimeStamp)
+                .array("exceptions", listOf(*errorInfo.stackTraces))
+                .value(
+                    "user_comment",
+                    activityErrorBinding.errorCommentBox.text
+                        .toString()
+                )
+                .end()
+                .done()
+        } catch (e: Throwable) {
+            Log.e(TAG, "Error while erroring: Could not build json")
+            e.printStackTrace()
+        }
+        return ""
+    }
+
+    private fun buildMarkdown(): String {
+        return try {
+            val htmlErrorReport = StringBuilder()
+            val userComment = activityErrorBinding.errorCommentBox.text.toString()
+            if (userComment.isNotEmpty()) {
+                htmlErrorReport.append(userComment).append("\n")
+            }
+
+            // basic error info
+            htmlErrorReport
+                .append("## Exception")
+                .append("\n* __User Action:__ ")
+                .append(getUserActionString(errorInfo.userAction))
+                .append("\n* __Request:__ ").append(errorInfo.request)
+                .append("\n* __Content Country:__ ").append(contentCountryString)
+                .append("\n* __Content Language:__ ").append(contentLanguageString)
+                .append("\n* __App Language:__ ").append(appLanguage)
+                .append("\n* __Service:__ ").append(errorInfo.serviceName)
+                .append("\n* __Version:__ ").append(BuildConfig.VERSION_NAME)
+                .append("\n* __OS:__ ").append(osString).append("\n")
+
+            // Collapse all logs to a single paragraph when there are more than one
+            // to keep the GitHub issue clean.
+            if (errorInfo.stackTraces.size > 1) {
+                htmlErrorReport
+                    .append("<details><summary><b>Exceptions (")
+                    .append(errorInfo.stackTraces.size)
+                    .append(")</b></summary><p>\n")
+            }
+
+            // add the logs
+            for (i in errorInfo.stackTraces.indices) {
+                htmlErrorReport.append("<details><summary><b>Crash log ")
+                if (errorInfo.stackTraces.size > 1) {
+                    htmlErrorReport.append(i + 1)
+                }
+                htmlErrorReport.append("</b>")
+                    .append("</summary><p>\n")
+                    .append("\n```\n").append(errorInfo.stackTraces[i]).append("\n```\n")
+                    .append("</details>\n")
+            }
+
+            // make sure to close everything
+            if (errorInfo.stackTraces.size > 1) {
+                htmlErrorReport.append("</p></details>\n")
+            }
+            htmlErrorReport.append("<hr>\n")
+            htmlErrorReport.toString()
+        } catch (e: Throwable) {
+            Log.e(TAG, "Error while erroring: Could not build markdown")
+            e.printStackTrace()
+            ""
+        }
+    }
+
+    private fun getUserActionString(userAction: UserAction?): String {
+        return userAction?.message ?: "Your description is in another castle."
+    }
+
+    private val contentCountryString: String
+        get() = Localization.getPreferredContentCountry(this).countryCode
+    private val contentLanguageString: String
+        get() = Localization.getPreferredLocalization(this).localizationCode
+    private val appLanguage: String
+        get() = Localization.getAppLocale(applicationContext).toString()
+    private val osString: String
+        get() {
+            val osBase =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) Build.VERSION.BASE_OS else "Android"
+            return (
+                (System.getProperty("os.name") ?: "unknown operating system (os.name not set)") +
+                    " " + (osBase.ifEmpty { "Android" }) +
+                    " " + Build.VERSION.RELEASE +
+                    " - " + Build.VERSION.SDK_INT
+                )
+        }
+
+    private fun addGuruMeditation() {
+        // just an easter egg
+        var text = activityErrorBinding.errorSorryView.text.toString()
+        text += """
+            
+            ${getString(R.string.guru_meditation)}
+        """.trimIndent()
+        activityErrorBinding.errorSorryView.text = text
+    }
+
+    companion object {
+        // LOG TAGS
+        val TAG = ErrorActivity::class.java.toString()
+
+        // BUNDLE TAGS
+        const val ERROR_INFO = "error_info"
+        const val ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org"
+        const val ERROR_EMAIL_SUBJECT = "Exception in "
+        const val ERROR_GITHUB_ISSUE_URL = "https://github.com/TeamNewPipe/NewPipe/issues"
+        val CURRENT_TIMESTAMP_FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+
+        /**
+         * Get the checked activity.
+         *
+         * @param returnActivity the activity to return to
+         * @return the casted return activity or null
+         */
+        @JvmStatic
+        fun getReturnActivity(returnActivity: Class<*>?): Class<out Activity?>? {
+            var checkedReturnActivity: Class<out Activity?>? = null
+            if (returnActivity != null) {
+                checkedReturnActivity = if (Activity::class.java.isAssignableFrom(returnActivity)) {
+                    returnActivity.asSubclass(Activity::class.java)
+                } else {
+                    MainActivity::class.java
+                }
+            }
+            return checkedReturnActivity
+        }
+    }
+}

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

@@ -150,7 +150,7 @@ class ErrorPanelHelper(
         errorActionButton.setOnClickListener(listener)
     }
 
-    fun showAndSetOpenInBrowserButtonAction(
+    private fun showAndSetOpenInBrowserButtonAction(
         errorInfo: ErrorInfo
     ) {
         errorOpenInBrowserButton.isVisible = true

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

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

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

@@ -1,233 +0,0 @@
-package org.schabi.newpipe.error;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.content.SharedPreferences;
-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;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.NavUtils;
-import androidx.preference.PreferenceManager;
-
-import org.schabi.newpipe.DownloaderImpl;
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.ActivityRecaptchaBinding;
-import org.schabi.newpipe.extractor.utils.Utils;
-import org.schabi.newpipe.util.ThemeHelper;
-
-/*
- * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * ReCaptchaActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-public class ReCaptchaActivity extends AppCompatActivity {
-    public static final int RECAPTCHA_REQUEST = 10;
-    public static final String RECAPTCHA_URL_EXTRA = "recaptcha_url_extra";
-    public static final String TAG = ReCaptchaActivity.class.toString();
-    public static final String YT_URL = "https://www.youtube.com";
-    public static final String RECAPTCHA_COOKIES_KEY = "recaptcha_cookies";
-
-    public static String sanitizeRecaptchaUrl(@Nullable final String url) {
-        if (url == null || url.trim().isEmpty()) {
-            return YT_URL; // YouTube is the most likely service to have thrown a recaptcha
-        } else {
-            // remove "pbj=1" parameter from YouYube urls, as it makes the page JSON and not HTML
-            return url.replace("&pbj=1", "").replace("pbj=1&", "").replace("?pbj=1", "");
-        }
-    }
-
-    private ActivityRecaptchaBinding recaptchaBinding;
-    private String foundCookies = "";
-
-    @SuppressLint("SetJavaScriptEnabled")
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        ThemeHelper.setTheme(this);
-        super.onCreate(savedInstanceState);
-
-        recaptchaBinding = ActivityRecaptchaBinding.inflate(getLayoutInflater());
-        setContentView(recaptchaBinding.getRoot());
-        setSupportActionBar(recaptchaBinding.toolbar);
-
-        final String url = sanitizeRecaptchaUrl(getIntent().getStringExtra(RECAPTCHA_URL_EXTRA));
-        // set return to Cancel by default
-        setResult(RESULT_CANCELED);
-
-        // enable Javascript
-        final WebSettings webSettings = recaptchaBinding.reCaptchaWebView.getSettings();
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setUserAgentString(DownloaderImpl.USER_AGENT);
-
-        recaptchaBinding.reCaptchaWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(final WebView view,
-                                                    final WebResourceRequest request) {
-                if (MainActivity.DEBUG) {
-                    Log.d(TAG, "shouldOverrideUrlLoading: url=" + request.getUrl().toString());
-                }
-
-                handleCookiesFromUrl(request.getUrl().toString());
-                return false;
-            }
-
-            @Override
-            public void onPageFinished(final WebView view, final String url) {
-                super.onPageFinished(view, url);
-                handleCookiesFromUrl(url);
-            }
-        });
-
-        // cleaning cache, history and cookies from webView
-        recaptchaBinding.reCaptchaWebView.clearCache(true);
-        recaptchaBinding.reCaptchaWebView.clearHistory();
-        CookieManager.getInstance().removeAllCookies(null);
-
-        recaptchaBinding.reCaptchaWebView.loadUrl(url);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_recaptcha, menu);
-
-        final ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(false);
-            actionBar.setTitle(R.string.title_activity_recaptcha);
-            actionBar.setSubtitle(R.string.subtitle_activity_recaptcha);
-        }
-
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        saveCookiesAndFinish();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        if (item.getItemId() == R.id.menu_item_done) {
-            saveCookiesAndFinish();
-            return true;
-        }
-        return false;
-    }
-
-    private void saveCookiesAndFinish() {
-        // try to get cookies of unclosed page
-        handleCookiesFromUrl(recaptchaBinding.reCaptchaWebView.getUrl());
-        if (MainActivity.DEBUG) {
-            Log.d(TAG, "saveCookiesAndFinish: foundCookies=" + foundCookies);
-        }
-
-        if (!foundCookies.isEmpty()) {
-            // save cookies to preferences
-            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
-                    getApplicationContext());
-            final String key = getApplicationContext().getString(R.string.recaptcha_cookies_key);
-            prefs.edit().putString(key, foundCookies).apply();
-
-            // give cookies to Downloader class
-            DownloaderImpl.getInstance().setCookie(RECAPTCHA_COOKIES_KEY, foundCookies);
-            setResult(RESULT_OK);
-        }
-
-        // Navigate to blank page (unloads youtube to prevent background playback)
-        recaptchaBinding.reCaptchaWebView.loadUrl("about:blank");
-
-        final Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        NavUtils.navigateUpTo(this, intent);
-    }
-
-
-    private void handleCookiesFromUrl(@Nullable final String url) {
-        if (MainActivity.DEBUG) {
-            Log.d(TAG, "handleCookiesFromUrl: url=" + (url == null ? "null" : url));
-        }
-
-        if (url == null) {
-            return;
-        }
-
-        final String cookies = CookieManager.getInstance().getCookie(url);
-        handleCookies(cookies);
-
-        // sometimes cookies are inside the url
-        final int abuseStart = url.indexOf("google_abuse=");
-        if (abuseStart != -1) {
-            final int abuseEnd = url.indexOf("+path");
-
-            try {
-                handleCookies(Utils.decodeUrlUtf8(url.substring(abuseStart + 13, abuseEnd)));
-            } catch (final StringIndexOutOfBoundsException e) {
-                if (MainActivity.DEBUG) {
-                    Log.e(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
-                            + abuseStart + " and ending at " + abuseEnd + " for url " + url, e);
-                }
-            }
-        }
-    }
-
-    private void handleCookies(@Nullable final String cookies) {
-        if (MainActivity.DEBUG) {
-            Log.d(TAG, "handleCookies: cookies=" + (cookies == null ? "null" : cookies));
-        }
-
-        if (cookies == null) {
-            return;
-        }
-
-        addYoutubeCookies(cookies);
-        // add here methods to extract cookies for other services
-    }
-
-    private void addYoutubeCookies(@NonNull final String cookies) {
-        if (cookies.contains("s_gl=") || cookies.contains("goojf=")
-                || cookies.contains("VISITOR_INFO1_LIVE=")
-                || cookies.contains("GOOGLE_ABUSE_EXEMPTION=")) {
-            // youtube seems to also need the other cookies:
-            addCookie(cookies);
-        }
-    }
-
-    private void addCookie(final String cookie) {
-        if (foundCookies.contains(cookie)) {
-            return;
-        }
-
-        if (foundCookies.isEmpty() || foundCookies.endsWith("; ")) {
-            foundCookies += cookie;
-        } else if (foundCookies.endsWith(";")) {
-            foundCookies += " " + cookie;
-        } else {
-            foundCookies += "; " + cookie;
-        }
-    }
-}

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

@@ -0,0 +1,227 @@
+package org.schabi.newpipe.error
+
+import android.annotation.SuppressLint
+import android.content.Intent
+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.WebView
+import android.webkit.WebViewClient
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.NavUtils
+import androidx.preference.PreferenceManager
+import org.schabi.newpipe.DownloaderImpl
+import org.schabi.newpipe.MainActivity
+import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.ActivityRecaptchaBinding
+import org.schabi.newpipe.extractor.utils.Utils
+import org.schabi.newpipe.util.ThemeHelper
+import java.io.UnsupportedEncodingException
+
+/*
+ * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ReCaptchaActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class ReCaptchaActivity : AppCompatActivity() {
+    private lateinit var recaptchaBinding: ActivityRecaptchaBinding
+    private var foundCookies = ""
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        ThemeHelper.setTheme(this)
+        super.onCreate(savedInstanceState)
+        recaptchaBinding = ActivityRecaptchaBinding.inflate(
+            layoutInflater
+        )
+        setContentView(recaptchaBinding.root)
+        setSupportActionBar(recaptchaBinding.toolbar)
+        val url = sanitizeRecaptchaUrl(intent.getStringExtra(RECAPTCHA_URL_EXTRA))
+        // set return to Cancel by default
+        setResult(RESULT_CANCELED)
+
+        // enable Javascript
+        val webSettings = recaptchaBinding.reCaptchaWebView.settings
+        webSettings.javaScriptEnabled = true
+        webSettings.userAgentString = DownloaderImpl.USER_AGENT
+        recaptchaBinding.reCaptchaWebView.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(
+                view: WebView,
+                request: WebResourceRequest
+            ): Boolean {
+                if (MainActivity.DEBUG) {
+                    Log.d(TAG, "shouldOverrideUrlLoading: url=" + request.url.toString())
+                }
+                handleCookiesFromUrl(request.url.toString())
+                return false
+            }
+
+            override fun onPageFinished(view: WebView, url: String) {
+                super.onPageFinished(view, url)
+                handleCookiesFromUrl(url)
+            }
+        }
+
+        // cleaning cache, history and cookies from webView
+        recaptchaBinding.reCaptchaWebView.clearCache(true)
+        recaptchaBinding.reCaptchaWebView.clearHistory()
+        CookieManager.getInstance().removeAllCookies(null)
+        recaptchaBinding.reCaptchaWebView.loadUrl(url)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_recaptcha, menu)
+        val actionBar = supportActionBar
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(false)
+            actionBar.setTitle(R.string.title_activity_recaptcha)
+            actionBar.setSubtitle(R.string.subtitle_activity_recaptcha)
+        }
+        return true
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun onBackPressed() {
+        saveCookiesAndFinish()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.menu_item_done) {
+            saveCookiesAndFinish()
+            return true
+        }
+        return false
+    }
+
+    private fun saveCookiesAndFinish() {
+        // try to get cookies of unclosed page
+        handleCookiesFromUrl(recaptchaBinding.reCaptchaWebView.url)
+        if (MainActivity.DEBUG) {
+            Log.d(TAG, "saveCookiesAndFinish: foundCookies=$foundCookies")
+        }
+        if (foundCookies.isNotEmpty()) {
+            // save cookies to preferences
+            val prefs = PreferenceManager.getDefaultSharedPreferences(
+                applicationContext
+            )
+            val key = applicationContext.getString(R.string.recaptcha_cookies_key)
+            prefs.edit().putString(key, foundCookies).apply()
+
+            // give cookies to Downloader class
+            DownloaderImpl.getInstance().setCookie(RECAPTCHA_COOKIES_KEY, foundCookies)
+            setResult(RESULT_OK)
+        }
+
+        // Navigate to blank page (unloads youtube to prevent background playback)
+        recaptchaBinding.reCaptchaWebView.loadUrl("about:blank")
+        val intent = Intent(this, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        NavUtils.navigateUpTo(this, intent)
+    }
+
+    private fun handleCookiesFromUrl(url: String?) {
+        if (MainActivity.DEBUG) {
+            Log.d(TAG, "handleCookiesFromUrl: url=" + (url ?: "null"))
+        }
+        if (url == null) {
+            return
+        }
+        val cookies = CookieManager.getInstance().getCookie(url)
+        handleCookies(cookies)
+
+        // sometimes cookies are inside the url
+        val abuseStart = url.indexOf("google_abuse=")
+        if (abuseStart != -1) {
+            val abuseEnd = url.indexOf("+path")
+            try {
+                var abuseCookie: String? = url.substring(abuseStart + 13, abuseEnd)
+                abuseCookie = Utils.decodeUrlUtf8(abuseCookie)
+                handleCookies(abuseCookie)
+            } catch (e: UnsupportedEncodingException) {
+                if (MainActivity.DEBUG) {
+                    e.printStackTrace()
+                    Log.d(
+                        TAG,
+                        "handleCookiesFromUrl: invalid google abuse starting at " +
+                            abuseStart + " and ending at " + abuseEnd + " for url " + url
+                    )
+                }
+            } catch (e: StringIndexOutOfBoundsException) {
+                if (MainActivity.DEBUG) {
+                    e.printStackTrace()
+                    Log.d(
+                        TAG,
+                        "handleCookiesFromUrl: invalid google abuse starting at " +
+                            abuseStart + " and ending at " + abuseEnd + " for url " + url
+                    )
+                }
+            }
+        }
+    }
+
+    private fun handleCookies(cookies: String?) {
+        if (MainActivity.DEBUG) {
+            Log.d(TAG, "handleCookies: cookies=" + (cookies ?: "null"))
+        }
+        if (cookies == null) {
+            return
+        }
+        addYoutubeCookies(cookies)
+        // add here methods to extract cookies for other services
+    }
+
+    private fun addYoutubeCookies(cookies: String) {
+        if (cookies.contains("s_gl=") || cookies.contains("goojf=") ||
+            cookies.contains("VISITOR_INFO1_LIVE=") ||
+            cookies.contains("GOOGLE_ABUSE_EXEMPTION=")
+        ) {
+            // youtube seems to also need the other cookies:
+            addCookie(cookies)
+        }
+    }
+
+    private fun addCookie(cookie: String) {
+        if (foundCookies.contains(cookie)) {
+            return
+        }
+        foundCookies += if (foundCookies.isEmpty() || foundCookies.endsWith("; ")) {
+            cookie
+        } else if (foundCookies.endsWith(";")) {
+            " $cookie"
+        } else {
+            "; $cookie"
+        }
+    }
+
+    companion object {
+        const val RECAPTCHA_REQUEST = 10
+        const val RECAPTCHA_URL_EXTRA = "recaptcha_url_extra"
+        val TAG = ReCaptchaActivity::class.java.toString()
+        const val YT_URL = "https://www.youtube.com"
+        const val RECAPTCHA_COOKIES_KEY = "recaptcha_cookies"
+        fun sanitizeRecaptchaUrl(url: String?): String {
+            return if (url == null || url.trim { it <= ' ' }.isEmpty()) {
+                YT_URL // YouTube is the most likely service to have thrown a recaptcha
+            } else {
+                // remove "pbj=1" parameter from YouYube urls, as it makes the page JSON and not HTML
+                url.replace("&pbj=1", "").replace("pbj=1&", "").replace("?pbj=1", "")
+            }
+        }
+    }
+}

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

@@ -1,46 +0,0 @@
-package org.schabi.newpipe.error;
-
-/**
- * The user actions that can cause an error.
- */
-public enum UserAction {
-    USER_REPORT("user report"),
-    UI_ERROR("ui error"),
-    DATABASE_IMPORT_EXPORT("database import or export"),
-    SUBSCRIPTION_CHANGE("subscription change"),
-    SUBSCRIPTION_UPDATE("subscription update"),
-    SUBSCRIPTION_GET("get subscription"),
-    SUBSCRIPTION_IMPORT_EXPORT("subscription import or export"),
-    LOAD_IMAGE("load image"),
-    SOMETHING_ELSE("something else"),
-    SEARCHED("searched"),
-    GET_SUGGESTIONS("get suggestions"),
-    REQUESTED_STREAM("requested stream"),
-    REQUESTED_CHANNEL("requested channel"),
-    REQUESTED_PLAYLIST("requested playlist"),
-    REQUESTED_KIOSK("requested kiosk"),
-    REQUESTED_COMMENTS("requested comments"),
-    REQUESTED_COMMENT_REPLIES("requested comment replies"),
-    REQUESTED_FEED("requested feed"),
-    REQUESTED_BOOKMARK("bookmark"),
-    DELETE_FROM_HISTORY("delete from history"),
-    PLAY_STREAM("play stream"),
-    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"),
-    OPEN_INFO_ITEM_DIALOG("open info item dialog");
-
-    private final String message;
-
-    UserAction(final String message) {
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}

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

@@ -0,0 +1,32 @@
+package org.schabi.newpipe.error
+
+/**
+ * The user actions that can cause an error.
+ */
+enum class UserAction(val message: String) {
+    USER_REPORT("user report"), UI_ERROR("ui error"), SUBSCRIPTION_CHANGE("subscription change"), SUBSCRIPTION_UPDATE(
+        "subscription update"
+    ),
+    SUBSCRIPTION_GET("get subscription"), SUBSCRIPTION_IMPORT_EXPORT("subscription import or export"), LOAD_IMAGE(
+        "load image"
+    ),
+    SOMETHING_ELSE("something else"), SEARCHED("searched"), GET_SUGGESTIONS("get suggestions"), REQUESTED_STREAM(
+        "requested stream"
+    ),
+    REQUESTED_CHANNEL("requested channel"), REQUESTED_PLAYLIST("requested playlist"), REQUESTED_KIOSK(
+        "requested kiosk"
+    ),
+    REQUESTED_COMMENTS("requested comments"), REQUESTED_COMMENT_REPLIES("requested comment replies"), REQUESTED_FEED(
+        "requested feed"
+    ),
+    REQUESTED_BOOKMARK("bookmark"), DELETE_FROM_HISTORY("delete from history"), PLAY_STREAM("play stream"), 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"
+    ),
+    OPEN_INFO_ITEM_DIALOG("open info item dialog")
+}

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

@@ -13,8 +13,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.fragment.app.Fragment;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -24,6 +22,8 @@ import org.schabi.newpipe.util.InfoCache;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import icepick.State;
+
 public abstract class BaseStateFragment<I> extends BaseFragment implements ViewContract<I> {
     @State
     protected AtomicBoolean wasLoading = new AtomicBoolean();
@@ -134,7 +134,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         hideErrorPanel();
     }
 
-    @Override
     public void showEmptyState() {
         isLoading.set(false);
         if (emptyStateView != null) {

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

@@ -220,7 +220,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     public void commitPlaylistTabs() {
         pagerAdapter.getLocalPlaylistFragments()
                 .stream()
-                .forEach(LocalPlaylistFragment::saveImmediate);
+                .forEach(LocalPlaylistFragment::commitChanges);
     }
 
     private void updateTabLayoutPosition() {
@@ -245,10 +245,10 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         // change the background and icon color of the tab layout:
         // service-colored at the top, app-background-colored at the bottom
         tabLayout.setBackgroundColor(ThemeHelper.resolveColorFromAttr(requireContext(),
-                bottom ? android.R.attr.windowBackground : R.attr.colorPrimary));
+                bottom ? R.attr.colorSecondary : R.attr.colorPrimary));
 
         @ColorInt final int iconColor = bottom
-                ? ThemeHelper.resolveColorFromAttr(requireContext(), android.R.attr.colorAccent)
+                ? ThemeHelper.resolveColorFromAttr(requireContext(), R.attr.colorAccent)
                 : Color.WHITE;
         tabLayout.setTabRippleColor(ColorStateList.valueOf(iconColor).withAlpha(32));
         tabLayout.setTabIconTint(ColorStateList.valueOf(iconColor));
@@ -282,7 +282,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
          * Keep reference to LocalPlaylistFragments, because their data can be modified by the user
          * during runtime and changes are not committed immediately. However, in some cases,
          * the changes need to be committed immediately by calling
-         * {@link LocalPlaylistFragment#saveImmediate()}.
+         * {@link LocalPlaylistFragment#commitChanges()}.
          * The fragments are removed when {@link LocalPlaylistFragment#onDestroy()} is called.
          */
         private final List<LocalPlaylistFragment> localPlaylistFragments = new ArrayList<>();

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

@@ -11,8 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.stream.Description;
@@ -21,6 +19,8 @@ import org.schabi.newpipe.util.Localization;
 
 import java.util.List;
 
+import icepick.State;
+
 public class DescriptionFragment extends BaseDescriptionFragment {
 
     @State
@@ -30,10 +30,6 @@ public class DescriptionFragment extends BaseDescriptionFragment {
         this.streamInfo = streamInfo;
     }
 
-    public DescriptionFragment() {
-        // keep empty constructor for State when resuming fragment from memory
-    }
-
 
     @Nullable
     @Override

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

@@ -56,7 +56,6 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.material.appbar.AppBarLayout;
@@ -128,6 +127,7 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -236,14 +236,11 @@ public final class VideoDetailFragment
     // Service management
     //////////////////////////////////////////////////////////////////////////*/
     @Override
-    public void onServiceConnected(@NonNull final PlayerService connectedPlayerService) {
-        playerService = connectedPlayerService;
-    }
-
-    @Override
-    public void onPlayerConnected(@NonNull final Player connectedPlayer,
-                                  final boolean playAfterConnect) {
+    public void onServiceConnected(final Player connectedPlayer,
+                                   final PlayerService connectedPlayerService,
+                                   final boolean playAfterConnect) {
         player = connectedPlayer;
+        playerService = connectedPlayerService;
 
         // It will do nothing if the player is not in fullscreen mode
         hideSystemUiIfNeeded();
@@ -275,29 +272,22 @@ public final class VideoDetailFragment
         updateOverlayPlayQueueButtonVisibility();
     }
 
-    @Override
-    public void onPlayerDisconnected() {
-        player = null;
-        // the binding could be null at this point, if the app is finishing
-        if (binding != null) {
-            restoreDefaultBrightness();
-        }
-    }
-
     @Override
     public void onServiceDisconnected() {
         playerService = null;
+        player = null;
+        restoreDefaultBrightness();
     }
 
 
     /*////////////////////////////////////////////////////////////////////////*/
 
     public static VideoDetailFragment getInstance(final int serviceId,
-                                                  @Nullable final String url,
+                                                  @Nullable final String videoUrl,
                                                   @NonNull final String name,
                                                   @Nullable final PlayQueue queue) {
         final VideoDetailFragment instance = new VideoDetailFragment();
-        instance.setInitialData(serviceId, url, name, queue);
+        instance.setInitialData(serviceId, videoUrl, name, queue);
         return instance;
     }
 
@@ -492,7 +482,7 @@ public final class VideoDetailFragment
 
                 // commit previous pending changes to database
                 if (fragment instanceof LocalPlaylistFragment) {
-                    ((LocalPlaylistFragment) fragment).saveImmediate();
+                    ((LocalPlaylistFragment) fragment).commitChanges();
                 } else if (fragment instanceof MainFragment) {
                     ((MainFragment) fragment).commitPlaylistTabs();
                 }
@@ -1746,7 +1736,7 @@ public final class VideoDetailFragment
         playQueue = queue;
         if (DEBUG) {
             Log.d(TAG, "onQueueUpdate() called with: serviceId = ["
-                    + serviceId + "], url = [" + url + "], name = ["
+                    + serviceId + "], videoUrl = [" + url + "], name = ["
                     + title + "], playQueue = [" + playQueue + "]");
         }
 
@@ -1858,16 +1848,13 @@ public final class VideoDetailFragment
 
     @Override
     public void onServiceStopped() {
-        // the binding could be null at this point, if the app is finishing
-        if (binding != null) {
-            setOverlayPlayPauseImage(false);
-            if (currentInfo != null) {
-                updateOverlayData(currentInfo.getName(),
-                        currentInfo.getUploaderName(),
-                        currentInfo.getThumbnails());
-            }
-            updateOverlayPlayQueueButtonVisibility();
+        setOverlayPlayPauseImage(false);
+        if (currentInfo != null) {
+            updateOverlayData(currentInfo.getName(),
+                    currentInfo.getUploaderName(),
+                    currentInfo.getThumbnails());
         }
+        updateOverlayPlayQueueButtonVisibility();
     }
 
     @Override

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

@@ -9,8 +9,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
@@ -26,6 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -144,7 +143,7 @@ public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInf
         currentWorker = loadResult(forceLoad)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((@NonNull final L result) -> {
+                .subscribe((@NonNull L result) -> {
                     isLoading.set(false);
                     currentInfo = result;
                     currentNextPage = result.getNextPage();

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

@@ -10,8 +10,6 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
@@ -22,6 +20,8 @@ import org.schabi.newpipe.util.Localization;
 
 import java.util.List;
 
+import icepick.State;
+
 public class ChannelAboutFragment extends BaseDescriptionFragment {
     @State
     protected ChannelInfo channelInfo;
@@ -30,9 +30,6 @@ public class ChannelAboutFragment extends BaseDescriptionFragment {
         this.channelInfo = channelInfo;
     }
 
-    public ChannelAboutFragment() {
-        // keep empty constructor for State when resuming fragment from memory
-    }
 
     @Override
     protected void initViews(final View rootView, final Bundle savedInstanceState) {

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

@@ -22,10 +22,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.view.MenuProvider;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -51,15 +49,16 @@ import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.StateSaver;
-import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.image.ImageStrategy;
 import org.schabi.newpipe.util.image.PicassoHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -100,7 +99,6 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     private MenuItem menuRssButton;
     private MenuItem menuNotifyButton;
     private SubscriptionEntity channelSubscription;
-    private MenuProvider menuProvider;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -123,62 +121,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        menuProvider = new MenuProvider() {
-            @Override
-            public void onCreateMenu(@NonNull final Menu menu,
-                                     @NonNull final MenuInflater inflater) {
-                inflater.inflate(R.menu.menu_channel, menu);
-
-                if (DEBUG) {
-                    Log.d(TAG, "onCreateOptionsMenu() called with: "
-                            + "menu = [" + menu + "], inflater = [" + inflater + "]");
-                }
-
-            }
-
-            @Override
-            public void onPrepareMenu(@NonNull final Menu menu) {
-                menuRssButton = menu.findItem(R.id.menu_item_rss);
-                menuNotifyButton = menu.findItem(R.id.menu_item_notify);
-                updateRssButton();
-                updateNotifyButton(channelSubscription);
-            }
-
-            @Override
-            public boolean onMenuItemSelected(@NonNull final MenuItem item) {
-                switch (item.getItemId()) {
-                    case R.id.menu_item_notify:
-                        final boolean value = !item.isChecked();
-                        item.setEnabled(false);
-                        setNotify(value);
-                        break;
-                    case R.id.action_settings:
-                        NavigationHelper.openSettings(requireContext());
-                        break;
-                    case R.id.menu_item_rss:
-                        if (currentInfo != null) {
-                            ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
-                        }
-                        break;
-                    case R.id.menu_item_openInBrowser:
-                        if (currentInfo != null) {
-                            ShareUtils.openUrlInBrowser(requireContext(),
-                                    currentInfo.getOriginalUrl());
-                        }
-                        break;
-                    case R.id.menu_item_share:
-                        if (currentInfo != null) {
-                            ShareUtils.shareText(requireContext(), name,
-                                    currentInfo.getOriginalUrl(), currentInfo.getAvatars());
-                        }
-                        break;
-                    default:
-                        return false;
-                }
-                return true;
-            }
-        };
-        activity.addMenuProvider(menuProvider);
+        setHasOptionsMenu(true);
     }
 
     @Override
@@ -240,16 +183,73 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
         }
         disposables.clear();
         binding = null;
-        activity.removeMenuProvider(menuProvider);
-        menuProvider = null;
     }
 
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull final Menu menu,
+                                    @NonNull final MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_channel, menu);
+
+        if (DEBUG) {
+            Log.d(TAG, "onCreateOptionsMenu() called with: "
+                    + "menu = [" + menu + "], inflater = [" + inflater + "]");
+        }
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(@NonNull final Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        menuRssButton = menu.findItem(R.id.menu_item_rss);
+        menuNotifyButton = menu.findItem(R.id.menu_item_notify);
+        updateNotifyButton(channelSubscription);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_item_notify:
+                final boolean value = !item.isChecked();
+                item.setEnabled(false);
+                setNotify(value);
+                break;
+            case R.id.action_settings:
+                NavigationHelper.openSettings(requireContext());
+                break;
+            case R.id.menu_item_rss:
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInApp(requireContext(), currentInfo.getFeedUrl());
+                }
+                break;
+            case R.id.menu_item_openInBrowser:
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInBrowser(requireContext(), currentInfo.getOriginalUrl());
+                }
+                break;
+            case R.id.menu_item_share:
+                if (currentInfo != null) {
+                    ShareUtils.shareText(requireContext(), name, currentInfo.getOriginalUrl(),
+                            currentInfo.getAvatars());
+                }
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+
     /*//////////////////////////////////////////////////////////////////////////
     // Channel Subscription
     //////////////////////////////////////////////////////////////////////////*/
 
     private void monitorSubscription(final ChannelInfo info) {
-        final Consumer<Throwable> onError = (final Throwable throwable) -> {
+        final Consumer<Throwable> onError = (Throwable throwable) -> {
             animate(binding.channelSubscribeButton, false, 100);
             showSnackBarError(new ErrorInfo(throwable, UserAction.SUBSCRIPTION_GET,
                     "Get subscription status", currentInfo));
@@ -284,14 +284,14 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     }
 
     private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription) {
-        return (@NonNull final Object o) -> {
+        return (@NonNull Object o) -> {
             subscriptionManager.insertSubscription(subscription);
             return o;
         };
     }
 
     private Function<Object, Object> mapOnUnsubscribe(final SubscriptionEntity subscription) {
-        return (@NonNull final Object o) -> {
+        return (@NonNull Object o) -> {
             subscriptionManager.deleteSubscription(subscription);
             return o;
         };
@@ -318,7 +318,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     }
 
     private Disposable monitorSubscribeButton(final Function<Object, Object> action) {
-        final Consumer<Object> onNext = (@NonNull final Object o) -> {
+        final Consumer<Object> onNext = (@NonNull Object o) -> {
             if (DEBUG) {
                 Log.d(TAG, "Changed subscription status to this channel!");
             }
@@ -338,7 +338,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     }
 
     private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor(final ChannelInfo info) {
-        return (final List<SubscriptionEntity> subscriptionEntities) -> {
+        return (List<SubscriptionEntity> subscriptionEntities) -> {
             if (DEBUG) {
                 Log.d(TAG, "subscriptionManager.subscriptionTable.doOnNext() called with: "
                         + "subscriptionEntities = [" + subscriptionEntities + "]");
@@ -408,13 +408,6 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
         animate(binding.channelSubscribeButton, true, 100, AnimationType.LIGHT_SCALE_AND_ALPHA);
     }
 
-    private void updateRssButton() {
-        if (menuRssButton == null || currentInfo == null) {
-            return;
-        }
-        menuRssButton.setVisible(!TextUtils.isEmpty(currentInfo.getFeedUrl()));
-    }
-
     private void updateNotifyButton(@Nullable final SubscriptionEntity subscription) {
         if (menuNotifyButton == null) {
             return;
@@ -617,7 +610,9 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
             binding.subChannelAvatarView.setVisibility(View.VISIBLE);
         }
 
-        updateRssButton();
+        if (menuRssButton != null) {
+            menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
+        }
 
         channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {

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

@@ -9,8 +9,6 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.error.UserAction;
@@ -34,12 +32,13 @@ import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import icepick.State;
 import io.reactivex.rxjava3.core.Single;
 
 public class ChannelTabFragment extends BaseListInfoFragment<InfoItem, ChannelTabInfo>
         implements PlaylistControlViewHolder {
 
-    // states must be protected and not private for State being able to access them
+    // states must be protected and not private for IcePick being able to access them
     @State
     protected ListLinkHandler tabHandler;
     @State
@@ -157,7 +156,6 @@ public class ChannelTabFragment extends BaseListInfoFragment<InfoItem, ChannelTa
         }
     }
 
-    @Override
     public PlayQueue getPlayQueue() {
         final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
                 .filter(StreamInfoItem.class::isInstance)

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

@@ -12,8 +12,6 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.text.HtmlCompat;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.CommentRepliesHeaderBinding;
 import org.schabi.newpipe.error.UserAction;
@@ -40,8 +38,7 @@ public final class CommentRepliesFragment
 
     public static final String TAG = CommentRepliesFragment.class.getSimpleName();
 
-    @State
-    CommentsInfoItem commentsInfoItem; // the comment to show replies of
+    private CommentsInfoItem commentsInfoItem; // the comment to show replies of
     private final CompositeDisposable disposables = new CompositeDisposable();
 
 

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

@@ -11,8 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
@@ -31,6 +29,7 @@ import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.Localization;
 
+import icepick.State;
 import io.reactivex.rxjava3.core.Single;
 
 /**

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

@@ -352,7 +352,6 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
             });
             ellipsizer.setContent(description);
             headerBinding.playlistDescriptionReadMore.setOnClickListener(v -> ellipsizer.toggle());
-            headerBinding.playlistDescription.setOnClickListener(v -> ellipsizer.toggle());
         } else {
             headerBinding.playlistDescription.setVisibility(View.GONE);
             headerBinding.playlistDescriptionReadMore.setVisibility(View.GONE);
@@ -507,7 +506,7 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
                 Localization.concatenateStrings(
                     Localization.localizeStreamCount(activity, streamCount),
                     Localization.getDurationString(playlistOverallDurationSeconds,
-                            isDurationComplete, true))
+                            isDurationComplete))
             );
         }
     }

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

@@ -40,8 +40,6 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.FragmentSearchBinding;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -79,6 +77,7 @@ import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
@@ -551,7 +550,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             }
         });
 
-        searchEditText.setOnFocusChangeListener((final View v, final boolean hasFocus) -> {
+        searchEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
             if (DEBUG) {
                 Log.d(TAG, "onFocusChange() called with: "
                         + "v = [" + v + "], hasFocus = [" + hasFocus + "]");
@@ -612,7 +611,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         };
         searchEditText.addTextChangedListener(textWatcher);
         searchEditText.setOnEditorActionListener(
-                (final TextView v, final int actionId, final KeyEvent event) -> {
+                (TextView v, int actionId, KeyEvent event) -> {
                     if (DEBUG) {
                         Log.d(TAG, "onEditorAction() called with: v = [" + v + "], "
                                 + "actionId = [" + actionId + "], event = [" + event + "]");

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

@@ -10,7 +10,6 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.R;
@@ -19,10 +18,8 @@ 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.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.ItemViewMode;
-import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
 import org.schabi.newpipe.ktx.ViewUtils;
 
 import java.io.Serializable;
@@ -176,27 +173,4 @@ public class RelatedItemsFragment extends BaseListInfoFragment<InfoItem, Related
         }
         return mode;
     }
-
-    @Override
-    protected void showInfoItemDialog(final StreamInfoItem item) {
-        // Try and attach the InfoItemDialog to the parent fragment of the RelatedItemsFragment
-        // so that its context is not lost when the RelatedItemsFragment is reinitialized,
-        // e.g. when a new stream is loaded in a parent VideoDetailFragment.
-        final Fragment parentFragment = getParentFragment();
-        if (parentFragment != null) {
-            try {
-                new InfoItemDialog.Builder(
-                        parentFragment.getActivity(),
-                        parentFragment.getContext(),
-                        parentFragment,
-                        item
-                ).create().show();
-            } catch (final IllegalArgumentException e) {
-                InfoItemDialog.Builder.reportErrorDuringInitialization(e, item);
-            }
-        } else {
-            super.showInfoItemDialog(item);
-        }
-    }
-
 }

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

@@ -113,10 +113,7 @@ public enum StreamDialogDefaultEntry {
     DOWNLOAD(R.string.download, (fragment, item) ->
             fetchStreamInfoAndSaveToDatabase(fragment.requireContext(), item.getServiceId(),
                     item.getUrl(), info -> {
-                        // Ensure the fragment is attached and its state hasn't been saved to avoid
-                        // showing dialog during lifecycle changes or when the activity is paused,
-                        // e.g. by selecting the download option and opening a different fragment.
-                        if (fragment.isAdded() && !fragment.isStateSaved()) {
+                        if (fragment.getContext() != null) {
                             final DownloadDialog downloadDialog =
                                     new DownloadDialog(fragment.requireContext(), info);
                             downloadDialog.show(fragment.getChildFragmentManager(),

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

@@ -1,13 +1,9 @@
 package org.schabi.newpipe.info_list.holder;
 
 import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
-import static org.schabi.newpipe.util.text.TouchUtils.getOffsetForHorizontalLine;
 
-import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -29,6 +25,7 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.image.ImageStrategy;
 import org.schabi.newpipe.util.image.PicassoHelper;
+import org.schabi.newpipe.util.text.CommentTextOnTouchListener;
 import org.schabi.newpipe.util.text.TextEllipsizer;
 
 public class CommentInfoItemHolder extends InfoItemHolder {
@@ -131,26 +128,7 @@ public class CommentInfoItemHolder extends InfoItemHolder {
         textEllipsizer.ellipsize();
 
         //noinspection ClickableViewAccessibility
-        itemContentView.setOnTouchListener((v, event) -> {
-            final CharSequence text = itemContentView.getText();
-            if (text instanceof Spanned buffer) {
-                final int action = event.getAction();
-
-                if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
-                    final int offset = getOffsetForHorizontalLine(itemContentView, event);
-                    final var links = buffer.getSpans(offset, offset, ClickableSpan.class);
-
-                    if (links.length != 0) {
-                        if (action == MotionEvent.ACTION_UP) {
-                            links[0].onClick(itemContentView);
-                        }
-                        // we handle events that intersect links, so return true
-                        return true;
-                    }
-                }
-            }
-            return false;
-        });
+        itemContentView.setOnTouchListener(CommentTextOnTouchListener.INSTANCE);
 
         itemView.setOnClickListener(view -> {
             textEllipsizer.toggle();

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

@@ -7,16 +7,3 @@ import androidx.core.os.BundleCompat
 inline fun <reified T : Parcelable> Bundle.parcelableArrayList(key: String?): ArrayList<T>? {
     return BundleCompat.getParcelableArrayList(this, key, T::class.java)
 }
-
-fun Bundle?.toDebugString(): String {
-    if (this == null) {
-        return "null"
-    }
-    val string = StringBuilder("Bundle{")
-    for (key in this.keySet()) {
-        @Suppress("DEPRECATION") // we want this[key] to return items of any type
-        string.append(" ").append(key).append(" => ").append(this[key]).append(";")
-    }
-    string.append(" }")
-    return string.toString()
-}

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

@@ -1,7 +0,0 @@
-package org.schabi.newpipe.ktx
-
-import android.content.SharedPreferences
-
-fun SharedPreferences.getStringSafe(key: String, defValue: String): String {
-    return getString(key, null) ?: defValue
-}

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

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

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

@@ -1,13 +1,10 @@
 package org.schabi.newpipe.local.bookmark;
 
-import static org.schabi.newpipe.local.bookmark.MergedPlaylistManager.getMergedOrderedPlaylists;
-
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.text.InputType;
 import android.util.Log;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,10 +13,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.evernote.android.state.State;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -34,44 +27,29 @@ import org.schabi.newpipe.databinding.DialogEditTextBinding;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.local.BaseLocalListFragment;
-import org.schabi.newpipe.local.holder.LocalBookmarkPlaylistItemHolder;
-import org.schabi.newpipe.local.holder.RemoteBookmarkPlaylistItemHolder;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
-import org.schabi.newpipe.util.debounce.DebounceSavable;
-import org.schabi.newpipe.util.debounce.DebounceSaver;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistLocalItem>, Void>
-        implements DebounceSavable {
-
-    private static final int MINIMUM_INITIAL_DRAG_VELOCITY = 12;
+public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistLocalItem>, Void> {
     @State
-    Parcelable itemsListState;
+    protected Parcelable itemsListState;
 
     private Subscription databaseSubscription;
     private CompositeDisposable disposables = new CompositeDisposable();
     private LocalPlaylistManager localPlaylistManager;
     private RemotePlaylistManager remotePlaylistManager;
-    private ItemTouchHelper itemTouchHelper;
-
-    /* Have the bookmarked playlists been fully loaded from db */
-    private AtomicBoolean isLoadingComplete;
-
-    /* Gives enough time to avoid interrupting user sorting operations */
-    @Nullable
-    private DebounceSaver debounceSaver;
-
-    private List<Pair<Long, LocalItem.LocalItemType>> deletedItems;
 
     ///////////////////////////////////////////////////////////////////////////
     // Fragment LifeCycle - Creation
@@ -87,11 +65,6 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         localPlaylistManager = new LocalPlaylistManager(database);
         remotePlaylistManager = new RemotePlaylistManager(database);
         disposables = new CompositeDisposable();
-
-        isLoadingComplete = new AtomicBoolean();
-        debounceSaver = new DebounceSaver(3000, this);
-
-        deletedItems = new ArrayList<>();
     }
 
     @Nullable
@@ -118,20 +91,10 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     // Fragment LifeCycle - Views
     ///////////////////////////////////////////////////////////////////////////
 
-    @Override
-    protected void initViews(final View rootView, final Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
-
-        itemListAdapter.setUseItemHandle(true);
-    }
-
     @Override
     protected void initListeners() {
         super.initListeners();
 
-        itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
-        itemTouchHelper.attachToRecyclerView(itemsList);
-
         itemListAdapter.setSelectedListener(new OnClickGesture<>() {
             @Override
             public void selected(final LocalItem selectedItem) {
@@ -139,7 +102,7 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
 
                 if (selectedItem instanceof PlaylistMetadataEntry) {
                     final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
-                    NavigationHelper.openLocalPlaylistFragment(fragmentManager, entry.getUid(),
+                    NavigationHelper.openLocalPlaylistFragment(fragmentManager, entry.uid,
                             entry.name);
 
                 } else if (selectedItem instanceof PlaylistRemoteEntity) {
@@ -160,14 +123,6 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
                     showRemoteDeleteDialog((PlaylistRemoteEntity) selectedItem);
                 }
             }
-
-            @Override
-            public void drag(final LocalItem selectedItem,
-                             final RecyclerView.ViewHolder viewHolder) {
-                if (itemTouchHelper != null) {
-                    itemTouchHelper.startDrag(viewHolder);
-                }
-            }
         });
     }
 
@@ -179,13 +134,8 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     public void startLoading(final boolean forceLoad) {
         super.startLoading(forceLoad);
 
-        if (debounceSaver != null) {
-            disposables.add(debounceSaver.getDebouncedSaver());
-            debounceSaver.setNoChangesToSave();
-        }
-        isLoadingComplete.set(false);
-
-        getMergedOrderedPlaylists(localPlaylistManager, remotePlaylistManager)
+        Flowable.combineLatest(localPlaylistManager.getPlaylists(),
+                remotePlaylistManager.getPlaylists(), PlaylistLocalItem::merge)
                 .onBackpressureLatest()
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(getPlaylistsSubscriber());
@@ -199,9 +149,6 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     public void onPause() {
         super.onPause();
         itemsListState = itemsList.getLayoutManager().onSaveInstanceState();
-
-        // Save on exit
-        saveImmediate();
     }
 
     @Override
@@ -216,27 +163,19 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         }
 
         databaseSubscription = null;
-        itemTouchHelper = null;
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (debounceSaver != null) {
-            debounceSaver.getDebouncedSaveSignal().onComplete();
-        }
         if (disposables != null) {
             disposables.dispose();
         }
 
-        debounceSaver = null;
         disposables = null;
         localPlaylistManager = null;
         remotePlaylistManager = null;
         itemsListState = null;
-
-        isLoadingComplete = null;
-        deletedItems = null;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -244,12 +183,10 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
     ///////////////////////////////////////////////////////////////////////////
 
     private Subscriber<List<PlaylistLocalItem>> getPlaylistsSubscriber() {
-        return new Subscriber<>() {
+        return new Subscriber<List<PlaylistLocalItem>>() {
             @Override
             public void onSubscribe(final Subscription s) {
                 showLoading();
-                isLoadingComplete.set(false);
-
                 if (databaseSubscription != null) {
                     databaseSubscription.cancel();
                 }
@@ -259,10 +196,7 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
 
             @Override
             public void onNext(final List<PlaylistLocalItem> subscriptions) {
-                if (debounceSaver == null || !debounceSaver.getIsModified()) {
-                    handleResult(subscriptions);
-                    isLoadingComplete.set(true);
-                }
+                handleResult(subscriptions);
                 if (databaseSubscription != null) {
                     databaseSubscription.request(1);
                 }
@@ -275,8 +209,7 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
             }
 
             @Override
-            public void onComplete() {
-            }
+            public void onComplete() { }
         };
     }
 
@@ -311,183 +244,12 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         }
     }
 
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playlist Metadata Manipulation
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void changeLocalPlaylistName(final long id, final String name) {
-        if (localPlaylistManager == null) {
-            return;
-        }
-
-        if (DEBUG) {
-            Log.d(TAG, "Updating playlist id=[" + id + "] "
-                    + "with new name=[" + name + "] items");
-        }
-
-        final Disposable disposable = localPlaylistManager.renamePlaylist(id, name)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(longs -> { /*Do nothing on success*/ }, throwable -> showError(
-                        new ErrorInfo(throwable,
-                                UserAction.REQUESTED_BOOKMARK,
-                                "Changing playlist name")));
-        disposables.add(disposable);
-    }
-
-    private void deleteItem(final PlaylistLocalItem item) {
-        if (itemListAdapter == null) {
-            return;
-        }
-        itemListAdapter.removeItem(item);
-
-        if (item instanceof PlaylistMetadataEntry) {
-            deletedItems.add(new Pair<>(item.getUid(),
-                    LocalItem.LocalItemType.PLAYLIST_LOCAL_ITEM));
-        } else if (item instanceof PlaylistRemoteEntity) {
-            deletedItems.add(new Pair<>(item.getUid(),
-                    LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM));
-        }
-
-        if (debounceSaver != null) {
-            debounceSaver.setHasChangesToSave();
-            saveImmediate();
-        }
-    }
-
-    @Override
-    public void saveImmediate() {
-        if (itemListAdapter == null) {
-            return;
-        }
-
-        // List must be loaded and modified in order to save
-        if (isLoadingComplete == null || debounceSaver == null
-                || !isLoadingComplete.get() || !debounceSaver.getIsModified()) {
-            return;
-        }
-
-        final List<LocalItem> items = itemListAdapter.getItemsList();
-        final List<PlaylistMetadataEntry> localItemsUpdate = new ArrayList<>();
-        final List<Long> localItemsDeleteUid = new ArrayList<>();
-        final List<PlaylistRemoteEntity> remoteItemsUpdate = new ArrayList<>();
-        final List<Long> remoteItemsDeleteUid = new ArrayList<>();
-
-        // Calculate display index
-        for (int i = 0; i < items.size(); i++) {
-            final LocalItem item = items.get(i);
-
-            if (item instanceof PlaylistMetadataEntry
-                    && ((PlaylistMetadataEntry) item).getDisplayIndex() != i) {
-                ((PlaylistMetadataEntry) item).setDisplayIndex(i);
-                localItemsUpdate.add((PlaylistMetadataEntry) item);
-            } else if (item instanceof PlaylistRemoteEntity
-                    && ((PlaylistRemoteEntity) item).getDisplayIndex() != i) {
-                ((PlaylistRemoteEntity) item).setDisplayIndex(i);
-                remoteItemsUpdate.add((PlaylistRemoteEntity) item);
-            }
-        }
-
-        // Find deleted items
-        for (final Pair<Long, LocalItem.LocalItemType> item : deletedItems) {
-            if (item.second.equals(LocalItem.LocalItemType.PLAYLIST_LOCAL_ITEM)) {
-                localItemsDeleteUid.add(item.first);
-            } else if (item.second.equals(LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM)) {
-                remoteItemsDeleteUid.add(item.first);
-            }
-        }
-
-        deletedItems.clear();
-
-        // 1. Update local playlists
-        // 2. Update remote playlists
-        // 3. Set NoChangesToSave
-        disposables.add(localPlaylistManager.updatePlaylists(localItemsUpdate, localItemsDeleteUid)
-                .mergeWith(remotePlaylistManager.updatePlaylists(
-                        remoteItemsUpdate, remoteItemsDeleteUid))
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(() -> {
-                            if (debounceSaver != null) {
-                                debounceSaver.setNoChangesToSave();
-                            }
-                        },
-                        throwable -> showError(new ErrorInfo(throwable,
-                                UserAction.REQUESTED_BOOKMARK, "Saving playlist"))
-                ));
-
-    }
-
-    private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
-        // if adding grid layout, also include ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT
-        // with an `if (shouldUseGridLayout()) ...`
-        return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
-                ItemTouchHelper.ACTION_STATE_IDLE) {
-            @Override
-            public int interpolateOutOfBoundsScroll(@NonNull final RecyclerView recyclerView,
-                                                    final int viewSize,
-                                                    final int viewSizeOutOfBounds,
-                                                    final int totalSize,
-                                                    final long msSinceStartScroll) {
-                final int standardSpeed = super.interpolateOutOfBoundsScroll(recyclerView,
-                        viewSize, viewSizeOutOfBounds, totalSize, msSinceStartScroll);
-                final int minimumAbsVelocity = Math.max(MINIMUM_INITIAL_DRAG_VELOCITY,
-                        Math.abs(standardSpeed));
-                return minimumAbsVelocity * (int) Math.signum(viewSizeOutOfBounds);
-            }
-
-            @Override
-            public boolean onMove(@NonNull final RecyclerView recyclerView,
-                                  @NonNull final RecyclerView.ViewHolder source,
-                                  @NonNull final RecyclerView.ViewHolder target) {
-
-                // Allow swap LocalBookmarkPlaylistItemHolder and RemoteBookmarkPlaylistItemHolder.
-                if (itemListAdapter == null
-                        || source.getItemViewType() != target.getItemViewType()
-                        && !(
-                        (
-                                (source instanceof LocalBookmarkPlaylistItemHolder)
-                                        || (source instanceof RemoteBookmarkPlaylistItemHolder)
-                        )
-                                && (
-                                (target instanceof LocalBookmarkPlaylistItemHolder)
-                                        || (target instanceof RemoteBookmarkPlaylistItemHolder)
-                        ))
-                ) {
-                    return false;
-                }
-
-                final int sourceIndex = source.getBindingAdapterPosition();
-                final int targetIndex = target.getBindingAdapterPosition();
-                final boolean isSwapped = itemListAdapter.swapItems(sourceIndex, targetIndex);
-                if (isSwapped && debounceSaver != null) {
-                    debounceSaver.setHasChangesToSave();
-                }
-                return isSwapped;
-            }
-
-            @Override
-            public boolean isLongPressDragEnabled() {
-                return false;
-            }
-
-            @Override
-            public boolean isItemViewSwipeEnabled() {
-                return false;
-            }
-
-            @Override
-            public void onSwiped(@NonNull final RecyclerView.ViewHolder viewHolder,
-                                 final int swipeDir) {
-                // Do nothing.
-            }
-        };
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // Utils
     ///////////////////////////////////////////////////////////////////////////
 
     private void showRemoteDeleteDialog(final PlaylistRemoteEntity item) {
-        showDeleteDialog(item.getName(), item);
+        showDeleteDialog(item.getName(), remotePlaylistManager.deletePlaylist(item.getUid()));
     }
 
     private void showLocalDialog(final PlaylistMetadataEntry selectedItem) {
@@ -495,7 +257,7 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         final String delete = getString(R.string.delete);
         final String unsetThumbnail = getString(R.string.unset_playlist_thumbnail);
         final boolean isThumbnailPermanent = localPlaylistManager
-                .getIsPlaylistThumbnailPermanent(selectedItem.getUid());
+                .getIsPlaylistThumbnailPermanent(selectedItem.uid);
 
         final ArrayList<String> items = new ArrayList<>();
         items.add(rename);
@@ -508,12 +270,13 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
             if (items.get(index).equals(rename)) {
                 showRenameDialog(selectedItem);
             } else if (items.get(index).equals(delete)) {
-                showDeleteDialog(selectedItem.name, selectedItem);
+                showDeleteDialog(selectedItem.name,
+                        localPlaylistManager.deletePlaylist(selectedItem.uid));
             } else if (isThumbnailPermanent && items.get(index).equals(unsetThumbnail)) {
                 final long thumbnailStreamId = localPlaylistManager
-                        .getAutomaticPlaylistThumbnailStreamId(selectedItem.getUid());
+                        .getAutomaticPlaylistThumbnailStreamId(selectedItem.uid);
                 localPlaylistManager
-                        .changePlaylistThumbnail(selectedItem.getUid(), thumbnailStreamId, false)
+                        .changePlaylistThumbnail(selectedItem.uid, thumbnailStreamId, false)
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe();
             }
@@ -535,13 +298,13 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
                 .setView(dialogBinding.getRoot())
                 .setPositiveButton(R.string.rename_playlist, (dialog, which) ->
                         changeLocalPlaylistName(
-                                selectedItem.getUid(),
+                                selectedItem.uid,
                                 dialogBinding.dialogEditText.getText().toString()))
                 .setNegativeButton(R.string.cancel, null)
                 .show();
     }
 
-    private void showDeleteDialog(final String name, final PlaylistLocalItem item) {
+    private void showDeleteDialog(final String name, final Single<Integer> deleteReactor) {
         if (activity == null || disposables == null) {
             return;
         }
@@ -550,8 +313,35 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
                 .setTitle(name)
                 .setMessage(R.string.delete_playlist_prompt)
                 .setCancelable(true)
-                .setPositiveButton(R.string.delete, (dialog, i) -> deleteItem(item))
+                .setPositiveButton(R.string.delete, (dialog, i) ->
+                        disposables.add(deleteReactor
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(ignored -> { /*Do nothing on success*/ }, throwable ->
+                                        showError(new ErrorInfo(throwable,
+                                                UserAction.REQUESTED_BOOKMARK,
+                                                "Deleting playlist")))))
                 .setNegativeButton(R.string.cancel, null)
                 .show();
     }
+
+    private void changeLocalPlaylistName(final long id, final String name) {
+        if (localPlaylistManager == null) {
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "Updating playlist id=[" + id + "] "
+                    + "with new name=[" + name + "] items");
+        }
+
+        localPlaylistManager.renamePlaylist(id, name);
+        final Disposable disposable = localPlaylistManager.renamePlaylist(id, name)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(longs -> { /*Do nothing on success*/ }, throwable -> showError(
+                        new ErrorInfo(throwable,
+                                UserAction.REQUESTED_BOOKMARK,
+                                "Changing playlist name")));
+        disposables.add(disposable);
+    }
 }
+

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

@@ -1,95 +0,0 @@
-package org.schabi.newpipe.local.bookmark;
-
-import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
-import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
-import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import io.reactivex.rxjava3.core.Flowable;
-
-/**
- * Takes care of remote and local playlists at once, hence "merged".
- */
-public final class MergedPlaylistManager {
-
-    private MergedPlaylistManager() {
-    }
-
-    public static Flowable<List<PlaylistLocalItem>> getMergedOrderedPlaylists(
-            final LocalPlaylistManager localPlaylistManager,
-            final RemotePlaylistManager remotePlaylistManager) {
-        return Flowable.combineLatest(
-                localPlaylistManager.getPlaylists(),
-                remotePlaylistManager.getPlaylists(),
-                MergedPlaylistManager::merge
-        );
-    }
-
-    /**
-     * Merge localPlaylists and remotePlaylists by the display index.
-     * If two items have the same display index, sort them in {@code CASE_INSENSITIVE_ORDER}.
-     *
-     * @param localPlaylists  local playlists, already sorted by display index
-     * @param remotePlaylists remote playlists, already sorted by display index
-     * @return merged playlists
-     */
-    public static List<PlaylistLocalItem> merge(
-            final List<PlaylistMetadataEntry> localPlaylists,
-            final List<PlaylistRemoteEntity> remotePlaylists) {
-
-        // This algorithm is similar to the merge operation in merge sort.
-        final List<PlaylistLocalItem> result = new ArrayList<>(
-                localPlaylists.size() + remotePlaylists.size());
-        final List<PlaylistLocalItem> itemsWithSameIndex = new ArrayList<>();
-
-        int i = 0;
-        int j = 0;
-        while (i < localPlaylists.size()) {
-            while (j < remotePlaylists.size()) {
-                if (remotePlaylists.get(j).getDisplayIndex()
-                        <= localPlaylists.get(i).getDisplayIndex()) {
-                    addItem(result, remotePlaylists.get(j), itemsWithSameIndex);
-                    j++;
-                } else {
-                    break;
-                }
-            }
-            addItem(result, localPlaylists.get(i), itemsWithSameIndex);
-            i++;
-        }
-        while (j < remotePlaylists.size()) {
-            addItem(result, remotePlaylists.get(j), itemsWithSameIndex);
-            j++;
-        }
-        addItemsWithSameIndex(result, itemsWithSameIndex);
-
-        return result;
-    }
-
-    private static void addItem(final List<PlaylistLocalItem> result,
-                                final PlaylistLocalItem item,
-                                final List<PlaylistLocalItem> itemsWithSameIndex) {
-        if (!itemsWithSameIndex.isEmpty()
-                && itemsWithSameIndex.get(0).getDisplayIndex() != item.getDisplayIndex()) {
-            // The new item has a different display index, add previous items with same
-            // index to the result.
-            addItemsWithSameIndex(result, itemsWithSameIndex);
-            itemsWithSameIndex.clear();
-        }
-        itemsWithSameIndex.add(item);
-    }
-
-    private static void addItemsWithSameIndex(final List<PlaylistLocalItem> result,
-                                              final List<PlaylistLocalItem> itemsWithSameIndex) {
-        Collections.sort(itemsWithSameIndex,
-                Comparator.comparing(PlaylistLocalItem::getOrderingName,
-                        Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
-        result.addAll(itemsWithSameIndex);
-    }
-}

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

@@ -155,15 +155,14 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
 
         final Toast successToast = Toast.makeText(getContext(), toastText, Toast.LENGTH_SHORT);
 
-        playlistDisposables.add(manager.appendToPlaylist(playlist.getUid(), streams)
+        playlistDisposables.add(manager.appendToPlaylist(playlist.uid, streams)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(ignored -> {
                     successToast.show();
 
-                    if (playlist.thumbnailUrl != null
-                            && playlist.thumbnailUrl.equals(PlaylistEntity.DEFAULT_THUMBNAIL)) {
+                    if (playlist.thumbnailUrl.equals(PlaylistEntity.DEFAULT_THUMBNAIL)) {
                         playlistDisposables.add(manager
-                                .changePlaylistThumbnail(playlist.getUid(), streams.get(0).getUid(),
+                                .changePlaylistThumbnail(playlist.uid, streams.get(0).getUid(),
                                         false)
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(ignore -> successToast.show()));

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

@@ -44,11 +44,11 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.evernote.android.state.State
 import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.Item
 import com.xwray.groupie.OnItemClickListener
 import com.xwray.groupie.OnItemLongClickListener
+import icepick.State
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -549,7 +549,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
 
             var typeface = Typeface.DEFAULT
             var backgroundSupplier = { ctx: Context ->
-                resolveDrawable(ctx, android.R.attr.selectableItemBackground)
+                resolveDrawable(ctx, R.attr.selectableItemBackground)
             }
             if (doCheck) {
                 // If the uploadDate is null or true we should highlight the item
@@ -562,7 +562,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
                         LayerDrawable(
                             arrayOf(
                                 resolveDrawable(ctx, R.attr.dashed_border),
-                                resolveDrawable(ctx, android.R.attr.selectableItemBackground)
+                                resolveDrawable(ctx, R.attr.selectableItemBackground)
                             )
                         )
                     }

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

@@ -17,10 +17,8 @@ import org.schabi.newpipe.database.subscription.NotificationMode
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
 import org.schabi.newpipe.extractor.Info
 import org.schabi.newpipe.extractor.NewPipe
-import org.schabi.newpipe.extractor.ServiceList
 import org.schabi.newpipe.extractor.feed.FeedInfo
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.ktx.getStringSafe
 import org.schabi.newpipe.local.feed.FeedDatabaseManager
 import org.schabi.newpipe.local.subscription.SubscriptionManager
 import org.schabi.newpipe.util.ChannelTabHelper
@@ -71,10 +69,12 @@ class FeedLoadManager(private val context: Context) {
         val outdatedThreshold = if (ignoreOutdatedThreshold) {
             OffsetDateTime.now(ZoneOffset.UTC)
         } else {
-            val thresholdOutdatedSeconds = defaultSharedPreferences.getStringSafe(
-                context.getString(R.string.feed_update_threshold_key),
-                context.getString(R.string.feed_update_threshold_default_value)
-            ).toInt()
+            val thresholdOutdatedSeconds = (
+                defaultSharedPreferences.getString(
+                    context.getString(R.string.feed_update_threshold_key),
+                    context.getString(R.string.feed_update_threshold_default_value)
+                ) ?: context.getString(R.string.feed_update_threshold_default_value)
+                ).toInt()
             OffsetDateTime.now(ZoneOffset.UTC).minusSeconds(thresholdOutdatedSeconds.toLong())
         }
 
@@ -91,10 +91,6 @@ class FeedLoadManager(private val context: Context) {
             else -> feedDatabaseManager.outdatedSubscriptionsForGroup(groupId, outdatedThreshold)
         }
 
-        // like `currentProgress`, but counts the number of YouTube extractions that have begun, so
-        // they can be properly throttled every once in a while (see doOnNext below)
-        val youtubeExtractionCount = AtomicInteger()
-
         return outdatedSubscriptions
             .take(1)
             .doOnNext {
@@ -110,15 +106,6 @@ class FeedLoadManager(private val context: Context) {
             .observeOn(Schedulers.io())
             .flatMap { Flowable.fromIterable(it) }
             .takeWhile { !cancelSignal.get() }
-            .doOnNext { subscriptionEntity ->
-                // throttle YouTube extractions once every BATCH_SIZE to avoid being rate limited
-                if (subscriptionEntity.serviceId == ServiceList.YouTube.serviceId) {
-                    val previousCount = youtubeExtractionCount.getAndIncrement()
-                    if (previousCount != 0 && previousCount % BATCH_SIZE == 0) {
-                        Thread.sleep(DELAY_BETWEEN_BATCHES_MILLIS.random())
-                    }
-                }
-            }
             .parallel(PARALLEL_EXTRACTIONS, PARALLEL_EXTRACTIONS * 2)
             .runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2)
             .filter { !cancelSignal.get() }
@@ -342,19 +329,7 @@ class FeedLoadManager(private val context: Context) {
         /**
          * How many extractions will be running in parallel.
          */
-        private const val PARALLEL_EXTRACTIONS = 3
-
-        /**
-         * How many YouTube extractions to perform before waiting [DELAY_BETWEEN_BATCHES_MILLIS]
-         * to avoid being rate limited
-         */
-        private const val BATCH_SIZE = 50
-
-        /**
-         * Wait a random delay in this range once every [BATCH_SIZE] YouTube extractions to avoid
-         * being rate limited
-         */
-        private val DELAY_BETWEEN_BATCHES_MILLIS = (6000L..12000L)
+        private const val PARALLEL_EXTRACTIONS = 6
 
         /**
          * Number of items to buffer to mass-insert in the database.

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

@@ -18,7 +18,7 @@ data class FeedUpdateInfo(
     @NotificationMode
     val notificationMode: Int,
     val name: String,
-    val avatarUrl: String?,
+    val avatarUrl: String,
     val url: String,
     val serviceId: Int,
     // description and subscriberCount are null if the constructor info is from the fast feed method

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

@@ -15,7 +15,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewbinding.ViewBinding;
 
-import com.evernote.android.state.State;
 import com.google.android.material.snackbar.Snackbar;
 
 import org.reactivestreams.Subscriber;
@@ -46,6 +45,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -332,6 +332,10 @@ public class StatisticsPlaylistFragment
                             StreamDialogDefaultEntry.DELETE,
                             (f, i) -> deleteEntry(
                                     Math.max(itemListAdapter.getItemsList().indexOf(item), 0)))
+                    .setAction(
+                            StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND,
+                            (f, i) -> NavigationHelper.playOnBackgroundPlayer(
+                                    context, getPlayQueueStartingAt(item), true))
                     .create()
                     .show();
         } catch (final IllegalArgumentException e) {
@@ -364,7 +368,6 @@ public class StatisticsPlaylistFragment
         }
     }
 
-    @Override
     public PlayQueue getPlayQueue() {
         return getPlayQueue(0);
     }

app/src/main/java/org/schabi/newpipe/local/holder/LocalBookmarkPlaylistItemHolder.java

@@ -1,54 +0,0 @@
-package org.schabi.newpipe.local.holder;
-
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
-import org.schabi.newpipe.local.LocalItemBuilder;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-
-import java.time.format.DateTimeFormatter;
-
-public class LocalBookmarkPlaylistItemHolder extends LocalPlaylistItemHolder {
-    private final View itemHandleView;
-
-    public LocalBookmarkPlaylistItemHolder(final LocalItemBuilder infoItemBuilder,
-                                           final ViewGroup parent) {
-        this(infoItemBuilder, R.layout.list_playlist_bookmark_item, parent);
-    }
-
-    LocalBookmarkPlaylistItemHolder(final LocalItemBuilder infoItemBuilder, final int layoutId,
-                                    final ViewGroup parent) {
-        super(infoItemBuilder, layoutId, parent);
-        itemHandleView = itemView.findViewById(R.id.itemHandle);
-    }
-
-    @Override
-    public void updateFromItem(final LocalItem localItem,
-                               final HistoryRecordManager historyRecordManager,
-                               final DateTimeFormatter dateTimeFormatter) {
-        if (!(localItem instanceof PlaylistMetadataEntry)) {
-            return;
-        }
-        final PlaylistMetadataEntry item = (PlaylistMetadataEntry) localItem;
-
-        itemHandleView.setOnTouchListener(getOnTouchListener(item));
-
-        super.updateFromItem(localItem, historyRecordManager, dateTimeFormatter);
-    }
-
-    private View.OnTouchListener getOnTouchListener(final PlaylistMetadataEntry item) {
-        return (view, motionEvent) -> {
-            view.performClick();
-            if (itemBuilder != null && itemBuilder.getOnItemSelectedListener() != null
-                    && motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
-                itemBuilder.getOnItemSelectedListener().drag(item,
-                        LocalBookmarkPlaylistItemHolder.this);
-            }
-            return false;
-        };
-    }
-}

app/src/main/java/org/schabi/newpipe/local/holder/RemoteBookmarkPlaylistItemHolder.java

@@ -1,54 +0,0 @@
-package org.schabi.newpipe.local.holder;
-
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
-import org.schabi.newpipe.local.LocalItemBuilder;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-
-import java.time.format.DateTimeFormatter;
-
-public class RemoteBookmarkPlaylistItemHolder extends RemotePlaylistItemHolder {
-    private final View itemHandleView;
-
-    public RemoteBookmarkPlaylistItemHolder(final LocalItemBuilder infoItemBuilder,
-                                            final ViewGroup parent) {
-        this(infoItemBuilder, R.layout.list_playlist_bookmark_item, parent);
-    }
-
-    RemoteBookmarkPlaylistItemHolder(final LocalItemBuilder infoItemBuilder, final int layoutId,
-                                     final ViewGroup parent) {
-        super(infoItemBuilder, layoutId, parent);
-        itemHandleView = itemView.findViewById(R.id.itemHandle);
-    }
-
-    @Override
-    public void updateFromItem(final LocalItem localItem,
-                               final HistoryRecordManager historyRecordManager,
-                               final DateTimeFormatter dateTimeFormatter) {
-        if (!(localItem instanceof PlaylistRemoteEntity)) {
-            return;
-        }
-        final PlaylistRemoteEntity item = (PlaylistRemoteEntity) localItem;
-
-        itemHandleView.setOnTouchListener(getOnTouchListener(item));
-
-        super.updateFromItem(localItem, historyRecordManager, dateTimeFormatter);
-    }
-
-    private View.OnTouchListener getOnTouchListener(final PlaylistRemoteEntity item) {
-        return (view, motionEvent) -> {
-            view.performClick();
-            if (itemBuilder != null && itemBuilder.getOnItemSelectedListener() != null
-                    && motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
-                itemBuilder.getOnItemSelectedListener().drag(item,
-                        RemoteBookmarkPlaylistItemHolder.this);
-            }
-            return false;
-        };
-    }
-}

app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java

@@ -14,7 +14,6 @@ import org.schabi.newpipe.util.ServiceHelper;
 import java.time.format.DateTimeFormatter;
 
 public class RemotePlaylistItemHolder extends PlaylistItemHolder {
-
     public RemotePlaylistItemHolder(final LocalItemBuilder infoItemBuilder,
                                     final ViewGroup parent) {
         super(infoItemBuilder, parent);

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

@@ -26,8 +26,6 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
 
-import com.evernote.android.state.State;
-
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.NewPipeDatabase;
@@ -55,25 +53,27 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.PlayButtonHelper;
-import org.schabi.newpipe.util.debounce.DebounceSavable;
-import org.schabi.newpipe.util.debounce.DebounceSaver;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
+import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistStreamEntry>, Void>
-        implements PlaylistControlViewHolder, DebounceSavable {
-
+        implements PlaylistControlViewHolder {
+    /** Save the list 10 seconds after the last change occurred. */
+    private static final long SAVE_DEBOUNCE_MILLIS = 10000;
     private static final int MINIMUM_INITIAL_DRAG_VELOCITY = 12;
     @State
     protected Long playlistId;
@@ -90,12 +90,13 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     private LocalPlaylistManager playlistManager;
     private Subscription databaseSubscription;
 
+    private PublishSubject<Long> debouncedSaveSignal;
     private CompositeDisposable disposables;
 
     /** Whether the playlist has been fully loaded from db. */
     private AtomicBoolean isLoadingComplete;
-    /** Used to debounce saving playlist edits to disk. */
-    private DebounceSaver debounceSaver;
+    /** Whether the playlist has been modified (e.g. items reordered or deleted) */
+    private AtomicBoolean isModified;
     /** Flag to prevent simultaneous rewrites of the playlist. */
     private boolean isRewritingPlaylist = false;
 
@@ -120,11 +121,12 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         playlistManager = new LocalPlaylistManager(NewPipeDatabase.getInstance(requireContext()));
+        debouncedSaveSignal = PublishSubject.create();
 
         disposables = new CompositeDisposable();
 
         isLoadingComplete = new AtomicBoolean();
-        debounceSaver = new DebounceSaver(this);
+        isModified = new AtomicBoolean();
     }
 
     @Override
@@ -164,6 +166,17 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         return headerBinding;
     }
 
+    /**
+     * <p>Commit changes immediately if the playlist has been modified.</p>
+     *  Delete operations and other modifications will be committed to ensure that the database
+     *  is up to date, e.g. when the user adds the just deleted stream from another fragment.
+     */
+    public void commitChanges() {
+        if (isModified != null && isModified.get()) {
+            saveImmediate();
+        }
+    }
+
     @Override
     protected void initListeners() {
         super.initListeners();
@@ -230,13 +243,10 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         if (disposables != null) {
             disposables.clear();
         }
-
-        if (debounceSaver != null) {
-            disposables.add(debounceSaver.getDebouncedSaver());
-            debounceSaver.setNoChangesToSave();
-        }
+        disposables.add(getDebouncedSaver());
 
         isLoadingComplete.set(false);
+        isModified.set(false);
 
         playlistManager.getPlaylistStreams(playlistId)
                 .onBackpressureLatest()
@@ -294,8 +304,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (debounceSaver != null) {
-            debounceSaver.getDebouncedSaveSignal().onComplete();
+        if (debouncedSaveSignal != null) {
+            debouncedSaveSignal.onComplete();
         }
         if (disposables != null) {
             disposables.dispose();
@@ -304,11 +314,12 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             tabsPagerAdapter.getLocalPlaylistFragments().remove(this);
         }
 
-        debounceSaver = null;
+        debouncedSaveSignal = null;
         playlistManager = null;
         disposables = null;
 
         isLoadingComplete = null;
+        isModified = null;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -332,7 +343,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             @Override
             public void onNext(final List<PlaylistStreamEntry> streams) {
                 // Skip handling the result after it has been modified
-                if (debounceSaver == null || !debounceSaver.getIsModified()) {
+                if (isModified == null || !isModified.get()) {
                     handleResult(streams);
                     isLoadingComplete.set(true);
                 }
@@ -484,7 +495,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
                     itemListAdapter.clearStreamItemList();
                     itemListAdapter.addItems(itemsToKeep);
-                    debounceSaver.setHasChangesToSave();
+                    saveChanges();
 
                     if (thumbnailVideoRemoved) {
                         updateThumbnailUrl();
@@ -655,7 +666,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                     itemListAdapter.clearStreamItemList();
                     itemListAdapter.addItems(itemsToKeep);
                     setStreamCountAndOverallDuration(itemListAdapter.getItemsList());
-                    debounceSaver.setHasChangesToSave();
+                    saveChanges();
 
                     hideLoading();
                     isRewritingPlaylist = false;
@@ -674,23 +685,41 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         }
 
         setStreamCountAndOverallDuration(itemListAdapter.getItemsList());
-        debounceSaver.setHasChangesToSave();
+        saveChanges();
     }
 
-    /**
-     * <p>Commit changes immediately if the playlist has been modified.</p>
-     *  Delete operations and other modifications will be committed to ensure that the database
-     *  is up to date, e.g. when the user adds the just deleted stream from another fragment.
-     */
-    @Override
-    public void saveImmediate() {
+    private void saveChanges() {
+        if (isModified == null || debouncedSaveSignal == null) {
+            return;
+        }
+
+        isModified.set(true);
+        debouncedSaveSignal.onNext(System.currentTimeMillis());
+    }
+
+    private Disposable getDebouncedSaver() {
+        if (debouncedSaveSignal == null) {
+            return Disposable.empty();
+        }
+
+        return debouncedSaveSignal
+                .debounce(SAVE_DEBOUNCE_MILLIS, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(ignored -> saveImmediate(), throwable ->
+                        showError(new ErrorInfo(throwable, UserAction.SOMETHING_ELSE,
+                                "Debounced saver")));
+    }
+
+    private void saveImmediate() {
         if (playlistManager == null || itemListAdapter == null) {
             return;
         }
 
         // List must be loaded and modified in order to save
-        if (isLoadingComplete == null || debounceSaver == null
-                || !isLoadingComplete.get() || !debounceSaver.getIsModified()) {
+        if (isLoadingComplete == null || isModified == null
+                || !isLoadingComplete.get() || !isModified.get()) {
+            Log.w(TAG, "Attempting to save playlist when local playlist "
+                    + "is not loaded or not modified: playlist id=[" + playlistId + "]");
             return;
         }
 
@@ -711,8 +740,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         () -> {
-                            if (debounceSaver != null) {
-                                debounceSaver.setNoChangesToSave();
+                            if (isModified != null) {
+                                isModified.set(false);
                             }
                         },
                         throwable -> showError(new ErrorInfo(throwable,
@@ -755,7 +784,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                 final int targetIndex = target.getBindingAdapterPosition();
                 final boolean isSwapped = itemListAdapter.swapItems(sourceIndex, targetIndex);
                 if (isSwapped) {
-                    debounceSaver.setHasChangesToSave();
+                    saveChanges();
                 }
                 return isSwapped;
             }
@@ -838,13 +867,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             headerBinding.playlistStreamCount.setText(
                     Localization.concatenateStrings(
                             Localization.localizeStreamCount(activity, streamCount),
-                            Localization.getDurationString(playlistOverallDurationSeconds,
-                                                            true, true))
+                            Localization.getDurationString(playlistOverallDurationSeconds))
             );
         }
     }
 
-    @Override
     public PlayQueue getPlayQueue() {
         return getPlayQueue(0);
     }

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

@@ -19,6 +19,7 @@ import java.util.List;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class LocalPlaylistManager {
@@ -42,13 +43,10 @@ public class LocalPlaylistManager {
             return Maybe.empty();
         }
 
-        // Save to the database directly.
-        // Make sure the new playlist is always on the top of bookmark.
-        // The index will be reassigned to non-negative number in BookmarkFragment.
         return Maybe.fromCallable(() -> database.runInTransaction(() -> {
                     final List<Long> streamIds = streamTable.upsertAll(streams);
                     final PlaylistEntity newPlaylist = new PlaylistEntity(name, false,
-                            streamIds.get(0), -1);
+                            streamIds.get(0));
 
                     return insertJoinEntities(playlistTable.insert(newPlaylist),
                             streamIds, 0);
@@ -91,20 +89,8 @@ public class LocalPlaylistManager {
         })).subscribeOn(Schedulers.io());
     }
 
-    public Completable updatePlaylists(final List<PlaylistMetadataEntry> updateItems,
-                                       final List<Long> deletedItems) {
-        final List<PlaylistEntity> items = new ArrayList<>(updateItems.size());
-        for (final PlaylistMetadataEntry item : updateItems) {
-            items.add(new PlaylistEntity(item));
-        }
-        return Completable.fromRunnable(() -> database.runInTransaction(() -> {
-            for (final Long uid : deletedItems) {
-                playlistTable.deletePlaylist(uid);
-            }
-            for (final PlaylistEntity item : items) {
-                playlistTable.upsertPlaylist(item);
-            }
-        })).subscribeOn(Schedulers.io());
+    public Flowable<List<PlaylistMetadataEntry>> getPlaylists() {
+        return playlistStreamTable.getPlaylistMetadata().subscribeOn(Schedulers.io());
     }
 
     public Flowable<List<PlaylistStreamEntry>> getDistinctPlaylistStreams(final long playlistId) {
@@ -124,14 +110,15 @@ public class LocalPlaylistManager {
                 .subscribeOn(Schedulers.io());
     }
 
-    public Flowable<List<PlaylistMetadataEntry>> getPlaylists() {
-        return playlistStreamTable.getPlaylistMetadata().subscribeOn(Schedulers.io());
-    }
-
     public Flowable<List<PlaylistStreamEntry>> getPlaylistStreams(final long playlistId) {
         return playlistStreamTable.getOrderedStreamsOf(playlistId).subscribeOn(Schedulers.io());
     }
 
+    public Single<Integer> deletePlaylist(final long playlistId) {
+        return Single.fromCallable(() -> playlistTable.deletePlaylist(playlistId))
+                .subscribeOn(Schedulers.io());
+    }
+
     public Maybe<Integer> renamePlaylist(final long playlistId, final String name) {
         return modifyPlaylist(playlistId, name, THUMBNAIL_ID_LEAVE_UNCHANGED, false);
     }

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

@@ -7,27 +7,20 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 
 import java.util.List;
 
-import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class RemotePlaylistManager {
 
-    private final AppDatabase database;
     private final PlaylistRemoteDAO playlistRemoteTable;
 
     public RemotePlaylistManager(final AppDatabase db) {
-        database = db;
         playlistRemoteTable = db.playlistRemoteDAO();
     }
 
     public Flowable<List<PlaylistRemoteEntity>> getPlaylists() {
-        return playlistRemoteTable.getPlaylists().subscribeOn(Schedulers.io());
-    }
-
-    public Flowable<PlaylistRemoteEntity> getPlaylist(final long playlistId) {
-        return playlistRemoteTable.getPlaylist(playlistId).subscribeOn(Schedulers.io());
+        return playlistRemoteTable.getAll().subscribeOn(Schedulers.io());
     }
 
     public Flowable<List<PlaylistRemoteEntity>> getPlaylist(final PlaylistInfo info) {
@@ -40,18 +33,6 @@ public class RemotePlaylistManager {
                 .subscribeOn(Schedulers.io());
     }
 
-    public Completable updatePlaylists(final List<PlaylistRemoteEntity> updateItems,
-                                       final List<Long> deletedItems) {
-        return Completable.fromRunnable(() -> database.runInTransaction(() -> {
-            for (final Long uid: deletedItems) {
-                playlistRemoteTable.deletePlaylist(uid);
-            }
-            for (final PlaylistRemoteEntity item: updateItems) {
-                playlistRemoteTable.upsert(item);
-            }
-        })).subscribeOn(Schedulers.io());
-    }
-
     public Single<Long> onBookmark(final PlaylistInfo playlistInfo) {
         return Single.fromCallable(() -> {
             final PlaylistRemoteEntity playlist = new PlaylistRemoteEntity(playlistInfo);

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

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.local.subscription;
 
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,11 +10,13 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
-
 import org.schabi.newpipe.R;
 
+import icepick.Icepick;
+import icepick.State;
+
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public class ImportConfirmationDialog extends DialogFragment {
     @State
     protected Intent resultServiceIntent;
@@ -57,12 +57,12 @@ public class ImportConfirmationDialog extends DialogFragment {
             throw new IllegalStateException("Result intent is null");
         }
 
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
     }
 
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 }

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

@@ -20,11 +20,11 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
-import com.evernote.android.state.State
 import com.xwray.groupie.Group
 import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.Section
 import com.xwray.groupie.viewbinding.GroupieViewHolder
+import icepick.State
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity.Companion.GROUP_ALL_ID

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

@@ -100,9 +100,7 @@ class SubscriptionManager(context: Context) {
         val subscriptionEntity = subscriptionTable.getSubscription(info.uid)
 
         subscriptionEntity.name = info.name
-
-        // some services do not provide an avatar URL
-        info.avatarUrl?.let { subscriptionEntity.avatarUrl = it }
+        subscriptionEntity.avatarUrl = info.avatarUrl
 
         // these two fields are null if the feed info was fetched using the fast feed method
         info.description?.let { subscriptionEntity.description = it }

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

@@ -27,8 +27,6 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.core.text.util.LinkifyCompat;
 
-import com.evernote.android.state.State;
-
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -46,6 +44,8 @@ import org.schabi.newpipe.util.ServiceHelper;
 import java.util.Collections;
 import java.util.List;
 
+import icepick.State;
+
 public class SubscriptionsImportFragment extends BaseFragment {
     @State
     int currentServiceId = Constants.NO_SERVICE_ID;

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

@@ -18,11 +18,11 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.evernote.android.state.State
-import com.livefront.bridge.Bridge
 import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.OnItemClickListener
 import com.xwray.groupie.Section
+import icepick.Icepick
+import icepick.State
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.databinding.DialogFeedGroupCreateBinding
@@ -78,7 +78,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Bridge.restoreInstanceState(this, savedInstanceState)
+        Icepick.restoreInstanceState(this, savedInstanceState)
 
         setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()))
         groupId = arguments?.getLong(KEY_GROUP_ID, NO_GROUP_SELECTED) ?: NO_GROUP_SELECTED
@@ -114,7 +114,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         iconsListState = feedGroupCreateBinding.iconSelector.layoutManager?.onSaveInstanceState()
         subscriptionsListState = feedGroupCreateBinding.subscriptionsSelectorList.layoutManager?.onSaveInstanceState()
 
-        Bridge.saveInstanceState(this, outState)
+        Icepick.saveInstanceState(this, outState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

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

@@ -11,10 +11,10 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.evernote.android.state.State
-import com.livefront.bridge.Bridge
 import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.TouchCallback
+import icepick.Icepick
+import icepick.State
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.databinding.DialogFeedGroupReorderBinding
@@ -23,6 +23,10 @@ import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewMo
 import org.schabi.newpipe.local.subscription.item.FeedGroupReorderItem
 import org.schabi.newpipe.util.ThemeHelper
 import java.util.Collections
+import kotlin.collections.ArrayList
+import kotlin.collections.List
+import kotlin.collections.map
+import kotlin.collections.sortedBy
 
 class FeedGroupReorderDialog : DialogFragment() {
     private var _binding: DialogFeedGroupReorderBinding? = null
@@ -38,7 +42,7 @@ class FeedGroupReorderDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Bridge.restoreInstanceState(this, savedInstanceState)
+        Icepick.restoreInstanceState(this, savedInstanceState)
 
         setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()))
     }
@@ -76,7 +80,7 @@ class FeedGroupReorderDialog : DialogFragment() {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        Bridge.saveInstanceState(this, outState)
+        Icepick.saveInstanceState(this, outState)
     }
 
     private fun handleGroups(list: List<FeedGroupEntity>) {

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java

@@ -76,10 +76,7 @@ public class SubscriptionsExportService extends BaseImportExportService {
 
         try {
             outFile = new StoredFileHelper(this, path, "application/json");
-            // truncate the file before writing to it, otherwise if the new content is smaller than
-            // the previous file size, the file will retain part of the previous content and be
-            // corrupted
-            outputStream = new SharpOutputStream(outFile.openAndTruncateStream());
+            outputStream = new SharpOutputStream(outFile.getStream());
         } catch (final IOException e) {
             handleError(e);
             return START_NOT_STICKY;

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

@@ -183,10 +183,7 @@ public final class PlayQueueActivity extends AppCompatActivity
     ////////////////////////////////////////////////////////////////////////////
 
     private void bind() {
-        // Note: this code should not really exist, and PlayerHolder should be used instead, but
-        // it will be rewritten when NewPlayer will replace the current player.
         final Intent bindIntent = new Intent(this, PlayerService.class);
-        bindIntent.setAction(PlayerService.BIND_PLAYER_HOLDER_ACTION);
         final boolean success = bindService(bindIntent, serviceConnection, BIND_AUTO_CREATE);
         if (!success) {
             unbindService(serviceConnection);
@@ -224,7 +221,7 @@ public final class PlayQueueActivity extends AppCompatActivity
                 Log.d(TAG, "Player service is connected");
 
                 if (service instanceof PlayerService.LocalBinder) {
-                    player = ((PlayerService.LocalBinder) service).getService().getPlayer();
+                    player = ((PlayerService.LocalBinder) service).getPlayer();
                 }
 
                 if (player == null || player.getPlayQueue() == null || player.exoPlayerIsNull()) {
@@ -572,16 +569,16 @@ public final class PlayQueueActivity extends AppCompatActivity
     private void onPlayModeChanged(final int repeatMode, final boolean shuffled) {
         switch (repeatMode) {
             case com.google.android.exoplayer2.Player.REPEAT_MODE_OFF:
-                queueControlBinding.controlRepeat.setImageResource(
-                        com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_off);
+                queueControlBinding.controlRepeat
+                        .setImageResource(R.drawable.exo_controls_repeat_off);
                 break;
             case com.google.android.exoplayer2.Player.REPEAT_MODE_ONE:
-                queueControlBinding.controlRepeat.setImageResource(
-                        com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_one);
+                queueControlBinding.controlRepeat
+                        .setImageResource(R.drawable.exo_controls_repeat_one);
                 break;
             case com.google.android.exoplayer2.Player.REPEAT_MODE_ALL:
-                queueControlBinding.controlRepeat.setImageResource(
-                        com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_all);
+                queueControlBinding.controlRepeat
+                        .setImageResource(R.drawable.exo_controls_repeat_all);
                 break;
         }
 

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

@@ -55,7 +55,6 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
-import android.support.v4.media.session.MediaSessionCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 
@@ -72,7 +71,6 @@ import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player.PositionInfo;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.text.CueGroup;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -271,16 +269,7 @@ public final class Player implements PlaybackListener, Listener {
     //////////////////////////////////////////////////////////////////////////*/
     //region Constructor
 
-    /**
-     * @param service the service this player resides in
-     * @param mediaSession used to build the {@link MediaSessionPlayerUi}, lives in the service and
-     *                     could possibly be reused with multiple player instances
-     * @param sessionConnector used to build the {@link MediaSessionPlayerUi}, lives in the service
-     *                         and could possibly be reused with multiple player instances
-     */
-    public Player(@NonNull final PlayerService service,
-                  @NonNull final MediaSessionCompat mediaSession,
-                  @NonNull final MediaSessionConnector sessionConnector) {
+    public Player(@NonNull final PlayerService service) {
         this.service = service;
         context = service;
         prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -313,7 +302,7 @@ public final class Player implements PlaybackListener, Listener {
         // notification ui in the UIs list, since the notification depends on the media session in
         // PlayerUi#initPlayer(), and UIs.call() guarantees UI order is preserved.
         UIs = new PlayerUiList(
-                new MediaSessionPlayerUi(this, mediaSession, sessionConnector),
+                new MediaSessionPlayerUi(this),
                 new NotificationPlayerUi(this)
         );
     }
@@ -473,6 +462,7 @@ public final class Player implements PlaybackListener, Listener {
         if (oldPlayerType != playerType && playQueue != null) {
             // If playerType changes from one to another we should reload the player
             // (to disable/enable video stream or to set quality)
+            setRecovery();
             reloadPlayQueueManager();
         }
 
@@ -657,7 +647,7 @@ public final class Player implements PlaybackListener, Listener {
             Log.d(TAG, "onPlaybackShutdown() called");
         }
         // destroys the service, which in turn will destroy the player
-        service.destroyPlayerAndStopService();
+        service.stopService();
     }
 
     public void smoothStopForImmediateReusing() {
@@ -729,7 +719,7 @@ public final class Player implements PlaybackListener, Listener {
                 pause();
                 break;
             case ACTION_CLOSE:
-                service.destroyPlayerAndStopService();
+                service.stopService();
                 break;
             case ACTION_PLAY_PAUSE:
                 playPause();
@@ -1386,19 +1376,6 @@ public final class Player implements PlaybackListener, Listener {
     public void onCues(@NonNull final CueGroup cueGroup) {
         UIs.call(playerUi -> playerUi.onCues(cueGroup.cues));
     }
-
-    /**
-     * To be called when the {@code PlaybackPreparer} set in the {@link MediaSessionConnector}
-     * receives an {@code onPrepare()} call. This function allows restoring the default behavior
-     * that would happen if there was no playback preparer set, i.e. to just call
-     * {@code player.prepare()}. You can find the default behavior in `onPlay()` inside the
-     * {@link MediaSessionConnector} file.
-     */
-    public void onPrepare() {
-        if (!exoPlayerIsNull()) {
-            simpleExoPlayer.prepare();
-        }
-    }
     //endregion
 
 

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

@@ -21,142 +21,75 @@ package org.schabi.newpipe.player;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
+import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
-import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.media.MediaBrowserCompat;
-import android.support.v4.media.session.MediaSessionCompat;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ServiceCompat;
-import androidx.media.MediaBrowserServiceCompat;
-
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
-
-import org.schabi.newpipe.ktx.BundleKt;
-import org.schabi.newpipe.player.mediabrowser.MediaBrowserImpl;
-import org.schabi.newpipe.player.mediabrowser.MediaBrowserPlaybackPreparer;
 import org.schabi.newpipe.player.mediasession.MediaSessionPlayerUi;
 import org.schabi.newpipe.player.notification.NotificationPlayerUi;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.function.Consumer;
 
 
 /**
  * One service for all players.
  */
-public final class PlayerService extends MediaBrowserServiceCompat {
+public final class PlayerService extends Service {
     private static final String TAG = PlayerService.class.getSimpleName();
     private static final boolean DEBUG = Player.DEBUG;
 
-    public static final String SHOULD_START_FOREGROUND_EXTRA = "should_start_foreground_extra";
-    public static final String BIND_PLAYER_HOLDER_ACTION = "bind_player_holder_action";
-
-    // These objects are used to cleanly separate the Service implementation (in this file) and the
-    // media browser and playback preparer implementations. At the moment the playback preparer is
-    // only used in conjunction with the media browser.
-    private MediaBrowserImpl mediaBrowserImpl;
-    private MediaBrowserPlaybackPreparer mediaBrowserPlaybackPreparer;
-
-    // these are instantiated in onCreate() as per
-    // https://developer.android.com/training/cars/media#browser_workflow
-    private MediaSessionCompat mediaSession;
-    private MediaSessionConnector sessionConnector;
-
-    @Nullable
     private Player player;
 
     private final IBinder mBinder = new PlayerService.LocalBinder(this);
 
-    /**
-     * The parameter taken by this {@link Consumer} can be null to indicate the player is being
-     * stopped.
-     */
-    @Nullable
-    private Consumer<Player> onPlayerStartedOrStopped = null;
 
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
 
-    //region Service lifecycle
     @Override
     public void onCreate() {
-        super.onCreate();
-
         if (DEBUG) {
             Log.d(TAG, "onCreate() called");
         }
         assureCorrectAppLanguage(this);
         ThemeHelper.setTheme(this);
 
-        mediaBrowserImpl = new MediaBrowserImpl(this, this::notifyChildrenChanged);
-
-        // see https://developer.android.com/training/cars/media#browser_workflow
-        mediaSession = new MediaSessionCompat(this, "MediaSessionPlayerServ");
-        setSessionToken(mediaSession.getSessionToken());
-        sessionConnector = new MediaSessionConnector(mediaSession);
-        sessionConnector.setMetadataDeduplicationEnabled(true);
-
-        mediaBrowserPlaybackPreparer = new MediaBrowserPlaybackPreparer(
-                this,
-                sessionConnector::setCustomErrorMessage,
-                () -> sessionConnector.setCustomErrorMessage(null),
-                (playWhenReady) -> {
-                    if (player != null) {
-                        player.onPrepare();
-                    }
-                }
-        );
-        sessionConnector.setPlaybackPreparer(mediaBrowserPlaybackPreparer);
-
-        // Note: you might be tempted to create the player instance and call startForeground here,
-        // but be aware that the Android system might start the service just to perform media
-        // queries. In those cases creating a player instance is a waste of resources, and calling
-        // startForeground means creating a useless empty notification. In case it's really needed
-        // the player instance can be created here, but startForeground() should definitely not be
-        // called here unless the service is actually starting in the foreground, to avoid the
-        // useless notification.
+        player = new Player(this);
+        /*
+        Create the player notification and start immediately the service in foreground,
+        otherwise if nothing is played or initializing the player and its components (especially
+        loading stream metadata) takes a lot of time, the app would crash on Android 8+ as the
+        service would never be put in the foreground while we said to the system we would do so
+         */
+        player.UIs().get(NotificationPlayerUi.class)
+                .ifPresent(NotificationPlayerUi::createNotificationAndStartForeground);
     }
 
     @Override
     public int onStartCommand(final Intent intent, final int flags, final int startId) {
         if (DEBUG) {
             Log.d(TAG, "onStartCommand() called with: intent = [" + intent
-                    + "], extras = [" + BundleKt.toDebugString(intent.getExtras())
                     + "], flags = [" + flags + "], startId = [" + startId + "]");
         }
 
-        // All internal NewPipe intents used to interact with the player, that are sent to the
-        // PlayerService using startForegroundService(), will have SHOULD_START_FOREGROUND_EXTRA,
-        // to ensure startForeground() is called (otherwise Android will force-crash the app).
-        if (intent.getBooleanExtra(SHOULD_START_FOREGROUND_EXTRA, false)) {
-            final boolean playerWasNull = (player == null);
-            if (playerWasNull) {
-                // make sure the player exists, in case the service was resumed
-                player = new Player(this, mediaSession, sessionConnector);
-            }
-
-            // Be sure that the player notification is set and the service is started in foreground,
-            // otherwise, the app may crash on Android 8+ as the service would never be put in the
-            // foreground while we said to the system we would do so. The service is always
-            // requested to be started in foreground, so always creating a notification if there is
-            // no one already and starting the service in foreground should not create any issues.
-            // If the service is already started in foreground, requesting it to be started
-            // shouldn't do anything.
+        /*
+        Be sure that the player notification is set and the service is started in foreground,
+        otherwise, the app may crash on Android 8+ as the service would never be put in the
+        foreground while we said to the system we would do so
+        The service is always requested to be started in foreground, so always creating a
+        notification if there is no one already and starting the service in foreground should
+        not create any issues
+        If the service is already started in foreground, requesting it to be started shouldn't
+        do anything
+         */
+        if (player != null) {
             player.UIs().get(NotificationPlayerUi.class)
                     .ifPresent(NotificationPlayerUi::createNotificationAndStartForeground);
-
-            if (playerWasNull && onPlayerStartedOrStopped != null) {
-                // notify that a new player was created (but do it after creating the foreground
-                // notification just to make sure we don't incur, due to slowness, in
-                // "Context.startForegroundService() did not then call Service.startForeground()")
-                onPlayerStartedOrStopped.accept(player);
-            }
         }
 
         if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())
@@ -167,7 +100,7 @@ public final class PlayerService extends MediaBrowserServiceCompat {
             Stop the service in this case, which will be removed from the foreground and its
             notification cancelled in its destruction
              */
-            destroyPlayerAndStopService();
+            stopSelf();
             return START_NOT_STICKY;
         }
 
@@ -209,84 +142,29 @@ public final class PlayerService extends MediaBrowserServiceCompat {
         if (DEBUG) {
             Log.d(TAG, "destroy() called");
         }
-        super.onDestroy();
-
         cleanup();
-
-        mediaBrowserPlaybackPreparer.dispose();
-        mediaSession.release();
-        mediaBrowserImpl.dispose();
     }
 
     private void cleanup() {
         if (player != null) {
-            if (onPlayerStartedOrStopped != null) {
-                // notify that the player is being destroyed
-                onPlayerStartedOrStopped.accept(null);
-            }
             player.destroy();
             player = null;
         }
-
-        // Should already be handled by MediaSessionPlayerUi, but just to be sure.
-        mediaSession.setActive(false);
-
-        // Should already be handled by NotificationUtil.cancelNotificationAndStopForeground() in
-        // NotificationPlayerUi, but let's make sure that the foreground service is stopped.
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE);
     }
 
-    /**
-     * Destroys the player and allows the player instance to be garbage collected. Sets the media
-     * session to inactive. Stops the foreground service and removes the player notification
-     * associated with it. Tries to stop the {@link PlayerService} completely, but this step will
-     * have no effect in case some service connection still uses the service (e.g. the Android Auto
-     * system accesses the media browser even when no player is running).
-     */
-    public void destroyPlayerAndStopService() {
-        if (DEBUG) {
-            Log.d(TAG, "destroyPlayerAndStopService() called");
-        }
-
+    public void stopService() {
         cleanup();
-
-        // This only really stops the service if there are no other service connections (see docs):
-        // for example the (Android Auto) media browser binder will block stopService().
-        // This is why we also stopForeground() above, to make sure the notification is removed.
-        // If we were to call stopSelf(), then the service would be surely stopped (regardless of
-        // other service connections), but this would be a waste of resources since the service
-        // would be immediately restarted by those same connections to perform the queries.
-        stopService(new Intent(this, PlayerService.class));
+        stopSelf();
     }
 
     @Override
     protected void attachBaseContext(final Context base) {
         super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(base));
     }
-    //endregion
 
-    //region Bind
     @Override
     public IBinder onBind(final Intent intent) {
-        if (DEBUG) {
-            Log.d(TAG, "onBind() called with: intent = [" + intent
-                    + "], extras = [" + BundleKt.toDebugString(intent.getExtras()) + "]");
-        }
-
-        if (BIND_PLAYER_HOLDER_ACTION.equals(intent.getAction())) {
-            // Note that this binder might be reused multiple times while the service is alive, even
-            // after unbind() has been called: https://stackoverflow.com/a/8794930 .
-            return mBinder;
-
-        } else if (MediaBrowserServiceCompat.SERVICE_INTERFACE.equals(intent.getAction())) {
-            // MediaBrowserService also uses its own binder, so for actions related to the media
-            // browser service, pass the onBind to the superclass.
-            return super.onBind(intent);
-
-        } else {
-            // This is an unknown request, avoid returning any binder to not leak objects.
-            return null;
-        }
+        return mBinder;
     }
 
     public static class LocalBinder extends Binder {
@@ -299,52 +177,9 @@ public final class PlayerService extends MediaBrowserServiceCompat {
         public PlayerService getService() {
             return playerService.get();
         }
-    }
 
-    /**
-     * @return the current active player instance. May be null, since the player service can outlive
-     * the player e.g. to respond to Android Auto media browser queries.
-     */
-    @Nullable
-    public Player getPlayer() {
-        return player;
-    }
-
-    /**
-     * Sets the listener that will be called when the player is started or stopped. If a
-     * {@code null} listener is passed, then the current listener will be unset. The parameter taken
-     * by the {@link Consumer} can be null to indicate that the player is stopping.
-     * @param listener the listener to set or unset
-     */
-    public void setPlayerListener(@Nullable final Consumer<Player> listener) {
-        this.onPlayerStartedOrStopped = listener;
-        if (listener != null) {
-            // if there is no player, then `null` will be sent here, to ensure the state is synced
-            listener.accept(player);
+        public Player getPlayer() {
+            return playerService.get().player;
         }
     }
-    //endregion
-
-    //region Media browser
-    @Override
-    public BrowserRoot onGetRoot(@NonNull final String clientPackageName,
-                                 final int clientUid,
-                                 @Nullable final Bundle rootHints) {
-        // TODO check if the accessing package has permission to view data
-        return mediaBrowserImpl.onGetRoot(clientPackageName, clientUid, rootHints);
-    }
-
-    @Override
-    public void onLoadChildren(@NonNull final String parentId,
-                               @NonNull final Result<List<MediaBrowserCompat.MediaItem>> result) {
-        mediaBrowserImpl.onLoadChildren(parentId, result);
-    }
-
-    @Override
-    public void onSearch(@NonNull final String query,
-                         final Bundle extras,
-                         @NonNull final Result<List<MediaBrowserCompat.MediaItem>> result) {
-        mediaBrowserImpl.onSearch(query, result);
-    }
-    //endregion
 }

app/src/main/java/org/schabi/newpipe/player/datasource/YoutubeHttpDataSource.java

@@ -14,12 +14,10 @@ import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getAndroidUserAgent;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getIosUserAgent;
-import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTvHtml5UserAgent;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isAndroidStreamingUrl;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isIosStreamingUrl;
-import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isTvHtml5StreamingUrl;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isWebStreamingUrl;
-import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isWebEmbeddedPlayerStreamingUrl;
+import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.isTvHtml5SimplyEmbeddedPlayerStreamingUrl;
 import static java.lang.Math.min;
 
 import android.net.Uri;
@@ -272,7 +270,6 @@ public final class YoutubeHttpDataSource extends BaseDataSource implements HttpD
 
     private static final String RN_PARAMETER = "&rn=";
     private static final String YOUTUBE_BASE_URL = "https://www.youtube.com";
-    private static final byte[] POST_BODY = new byte[] {0x78, 0};
 
     private final boolean allowCrossProtocolRedirects;
     private final boolean rangeParameterEnabled;
@@ -661,11 +658,8 @@ public final class YoutubeHttpDataSource extends BaseDataSource implements HttpD
             }
         }
 
-        final boolean isTvHtml5StreamingUrl = isTvHtml5StreamingUrl(requestUrl);
-
         if (isWebStreamingUrl(requestUrl)
-                || isTvHtml5StreamingUrl
-                || isWebEmbeddedPlayerStreamingUrl(requestUrl)) {
+                || isTvHtml5SimplyEmbeddedPlayerStreamingUrl(requestUrl)) {
             httpURLConnection.setRequestProperty(HttpHeaders.ORIGIN, YOUTUBE_BASE_URL);
             httpURLConnection.setRequestProperty(HttpHeaders.REFERER, YOUTUBE_BASE_URL);
             httpURLConnection.setRequestProperty(HttpHeaders.SEC_FETCH_DEST, "empty");
@@ -685,9 +679,6 @@ public final class YoutubeHttpDataSource extends BaseDataSource implements HttpD
         } else if (isIosStreamingUrl) {
             httpURLConnection.setRequestProperty(HttpHeaders.USER_AGENT,
                     getIosUserAgent(null));
-        } else if (isTvHtml5StreamingUrl) {
-            httpURLConnection.setRequestProperty(HttpHeaders.USER_AGENT,
-                    getTvHtml5UserAgent());
         } else {
             // non-mobile user agent
             httpURLConnection.setRequestProperty(HttpHeaders.USER_AGENT, DownloaderImpl.USER_AGENT);
@@ -696,16 +687,22 @@ public final class YoutubeHttpDataSource extends BaseDataSource implements HttpD
         httpURLConnection.setRequestProperty(HttpHeaders.ACCEPT_ENCODING,
                 allowGzip ? "gzip" : "identity");
         httpURLConnection.setInstanceFollowRedirects(followRedirects);
-        // Most clients use POST requests to fetch contents
-        httpURLConnection.setRequestMethod("POST");
-        httpURLConnection.setDoOutput(true);
-        httpURLConnection.setFixedLengthStreamingMode(POST_BODY.length);
-        httpURLConnection.connect();
+        httpURLConnection.setDoOutput(httpBody != null);
 
-        final OutputStream os = httpURLConnection.getOutputStream();
-        os.write(POST_BODY);
-        os.close();
+        // Mobile clients uses POST requests to fetch contents
+        httpURLConnection.setRequestMethod(isAndroidStreamingUrl || isIosStreamingUrl
+                ? "POST"
+                : DataSpec.getStringForHttpMethod(httpMethod));
 
+        if (httpBody != null) {
+            httpURLConnection.setFixedLengthStreamingMode(httpBody.length);
+            httpURLConnection.connect();
+            final OutputStream os = httpURLConnection.getOutputStream();
+            os.write(httpBody);
+            os.close();
+        } else {
+            httpURLConnection.connect();
+        }
         return httpURLConnection;
     }
 

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

@@ -1,48 +1,11 @@
 package org.schabi.newpipe.player.event;
 
-import androidx.annotation.NonNull;
-
 import org.schabi.newpipe.player.PlayerService;
 import org.schabi.newpipe.player.Player;
 
-/**
- * In addition to {@link PlayerServiceEventListener}, provides callbacks for service and player
- * connections and disconnections. "Connected" here means that the service (resp. the
- * player) is running and is bound to {@link org.schabi.newpipe.player.helper.PlayerHolder}.
- * "Disconnected" means that either the service (resp. the player) was stopped completely, or that
- * {@link org.schabi.newpipe.player.helper.PlayerHolder} is not bound.
- */
 public interface PlayerServiceExtendedEventListener extends PlayerServiceEventListener {
-    /**
-     * The player service just connected to {@link org.schabi.newpipe.player.helper.PlayerHolder},
-     * but the player may not be active at this moment, e.g. in case the service is running to
-     * respond to Android Auto media browser queries without playing anything.
-     * {@link #onPlayerConnected(Player, boolean)} will be called right after this function if there
-     * is a player.
-     *
-     * @param playerService the newly connected player service
-     */
-    void onServiceConnected(@NonNull PlayerService playerService);
-
-    /**
-     * The player service is already connected and the player was just started.
-     *
-     * @param player the newly connected or started player
-     * @param playAfterConnect whether to open the video player in the video details fragment
-     */
-    void onPlayerConnected(@NonNull Player player, boolean playAfterConnect);
-
-    /**
-     * The player got disconnected, for one of these reasons: the player is getting closed while
-     * leaving the service open for future media browser queries, the service is stopping
-     * completely, or {@link org.schabi.newpipe.player.helper.PlayerHolder} is unbinding.
-     */
-    void onPlayerDisconnected();
-
-    /**
-     * The service got disconnected from {@link org.schabi.newpipe.player.helper.PlayerHolder},
-     * either because {@link org.schabi.newpipe.player.helper.PlayerHolder} is unbinding or because
-     * the service is stopping completely.
-     */
+    void onServiceConnected(Player player,
+                            PlayerService playerService,
+                            boolean playAfterConnect);
     void onServiceDisconnected();
 }

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

@@ -24,9 +24,6 @@ import androidx.core.math.MathUtils;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.PreferenceManager;
 
-import com.evernote.android.state.State;
-import com.livefront.bridge.Bridge;
-
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.DialogPlaybackParameterBinding;
 import org.schabi.newpipe.player.ui.VideoPlayerUi;
@@ -40,6 +37,9 @@ import java.util.function.DoubleConsumer;
 import java.util.function.DoubleFunction;
 import java.util.function.DoubleSupplier;
 
+import icepick.Icepick;
+import icepick.State;
+
 public class PlaybackParameterDialog extends DialogFragment {
     private static final String TAG = "PlaybackParameterDialog";
 
@@ -135,7 +135,7 @@ public class PlaybackParameterDialog extends DialogFragment {
     @Override
     public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
-        Bridge.saveInstanceState(this, outState);
+        Icepick.saveInstanceState(this, outState);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -146,7 +146,7 @@ public class PlaybackParameterDialog extends DialogFragment {
     @Override
     public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
         assureCorrectAppLanguage(getContext());
-        Bridge.restoreInstanceState(this, savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
         binding = DialogPlaybackParameterBinding.inflate(getLayoutInflater());
         initUI();
@@ -342,14 +342,14 @@ public class PlaybackParameterDialog extends DialogFragment {
         final Map<Boolean, TextView> pitchCtrlModeComponentMapping =
                 getPitchControlModeComponentMappings();
         pitchCtrlModeComponentMapping.forEach((v, textView) -> textView.setBackground(
-                resolveDrawable(requireContext(), android.R.attr.selectableItemBackground)));
+                resolveDrawable(requireContext(), R.attr.selectableItemBackground)));
 
         // Mark the selected textview
         final TextView textView = pitchCtrlModeComponentMapping.get(semitones);
         if (textView != null) {
             textView.setBackground(new LayerDrawable(new Drawable[]{
                     resolveDrawable(requireContext(), R.attr.dashed_border),
-                    resolveDrawable(requireContext(), android.R.attr.selectableItemBackground)
+                    resolveDrawable(requireContext(), R.attr.selectableItemBackground)
             }));
         }
 
@@ -415,14 +415,14 @@ public class PlaybackParameterDialog extends DialogFragment {
         // Bring all textviews into a normal state
         final Map<Double, TextView> stepSiteComponentMapping = getStepSizeComponentMappings();
         stepSiteComponentMapping.forEach((v, textView) -> textView.setBackground(
-                resolveDrawable(requireContext(), android.R.attr.selectableItemBackground)));
+                resolveDrawable(requireContext(), R.attr.selectableItemBackground)));
 
         // Mark the selected textview
         final TextView textView = stepSiteComponentMapping.get(newStepSize);
         if (textView != null) {
             textView.setBackground(new LayerDrawable(new Drawable[]{
                     resolveDrawable(requireContext(), R.attr.dashed_border),
-                    resolveDrawable(requireContext(), android.R.attr.selectableItemBackground)
+                    resolveDrawable(requireContext(), R.attr.selectableItemBackground)
             }));
         }
 

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

@@ -22,10 +22,6 @@ import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.event.PlayerServiceEventListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.util.NavigationHelper;
-
-import java.util.Optional;
-import java.util.function.Consumer;
 
 public final class PlayerHolder {
 
@@ -48,16 +44,7 @@ public final class PlayerHolder {
     private final PlayerServiceConnection serviceConnection = new PlayerServiceConnection();
     private boolean bound;
     @Nullable private PlayerService playerService;
-
-    private Optional<Player> getPlayer() {
-        return Optional.ofNullable(playerService)
-                .flatMap(s -> Optional.ofNullable(s.getPlayer()));
-    }
-
-    private Optional<PlayQueue> getPlayQueue() {
-        // player play queue might be null e.g. while player is starting
-        return getPlayer().flatMap(p -> Optional.ofNullable(p.getPlayQueue()));
-    }
+    @Nullable private Player player;
 
     /**
      * Returns the current {@link PlayerType} of the {@link PlayerService} service,
@@ -67,15 +54,21 @@ public final class PlayerHolder {
      */
     @Nullable
     public PlayerType getType() {
-        return getPlayer().map(Player::getPlayerType).orElse(null);
+        if (player == null) {
+            return null;
+        }
+        return player.getPlayerType();
     }
 
     public boolean isPlaying() {
-        return getPlayer().map(Player::isPlaying).orElse(false);
+        if (player == null) {
+            return false;
+        }
+        return player.isPlaying();
     }
 
     public boolean isPlayerOpen() {
-        return getPlayer().isPresent();
+        return player != null;
     }
 
     /**
@@ -84,7 +77,7 @@ public final class PlayerHolder {
      * @return true only if the player is open and its play queue is ready (i.e. it is not null)
      */
     public boolean isPlayQueueReady() {
-        return getPlayQueue().isPresent();
+        return player != null && player.getPlayQueue() != null;
     }
 
     public boolean isBound() {
@@ -92,11 +85,18 @@ public final class PlayerHolder {
     }
 
     public int getQueueSize() {
-        return getPlayQueue().map(PlayQueue::size).orElse(0);
+        if (player == null || player.getPlayQueue() == null) {
+            // player play queue might be null e.g. while player is starting
+            return 0;
+        }
+        return player.getPlayQueue().size();
     }
 
     public int getQueuePosition() {
-        return getPlayQueue().map(PlayQueue::getIndex).orElse(0);
+        if (player == null || player.getPlayQueue() == null) {
+            return 0;
+        }
+        return player.getPlayQueue().getIndex();
     }
 
     public void setListener(@Nullable final PlayerServiceExtendedEventListener newListener) {
@@ -107,10 +107,9 @@ public final class PlayerHolder {
         }
 
         // Force reload data from service
-        if (playerService != null) {
-            listener.onServiceConnected(playerService);
+        if (player != null) {
+            listener.onServiceConnected(player, playerService, false);
             startPlayerListener();
-            // ^ will call listener.onPlayerConnected() down the line if there is an active player
         }
     }
 
@@ -122,9 +121,6 @@ public final class PlayerHolder {
 
     public void startService(final boolean playAfterConnect,
                              final PlayerServiceExtendedEventListener newListener) {
-        if (DEBUG) {
-            Log.d(TAG, "startService() called with playAfterConnect=" + playAfterConnect);
-        }
         final Context context = getCommonContext();
         setListener(newListener);
         if (bound) {
@@ -134,24 +130,14 @@ public final class PlayerHolder {
         // and NullPointerExceptions inside the service because the service will be
         // bound twice. Prevent it with unbinding first
         unbind(context);
-        final Intent intent = new Intent(context, PlayerService.class);
-        intent.putExtra(PlayerService.SHOULD_START_FOREGROUND_EXTRA, true);
-        ContextCompat.startForegroundService(context, intent);
+        ContextCompat.startForegroundService(context, new Intent(context, PlayerService.class));
         serviceConnection.doPlayAfterConnect(playAfterConnect);
         bind(context);
     }
 
     public void stopService() {
-        if (DEBUG) {
-            Log.d(TAG, "stopService() called");
-        }
-        if (playerService != null) {
-            playerService.destroyPlayerAndStopService();
-        }
         final Context context = getCommonContext();
         unbind(context);
-        // destroyPlayerAndStopService() already runs the next line of code, but run it again just
-        // to make sure to stop the service even if playerService is null by any chance.
         context.stopService(new Intent(context, PlayerService.class));
     }
 
@@ -181,16 +167,11 @@ public final class PlayerHolder {
             final PlayerService.LocalBinder localBinder = (PlayerService.LocalBinder) service;
 
             playerService = localBinder.getService();
+            player = localBinder.getPlayer();
             if (listener != null) {
-                listener.onServiceConnected(playerService);
-                getPlayer().ifPresent(p -> listener.onPlayerConnected(p, playAfterConnect));
+                listener.onServiceConnected(player, playerService, playAfterConnect);
             }
             startPlayerListener();
-            // ^ will call listener.onPlayerConnected() down the line if there is an active player
-
-            // notify the main activity that binding the service has completed, so that it can
-            // open the bottom mini-player
-            NavigationHelper.sendPlayerStartedEvent(localBinder.getService());
         }
     }
 
@@ -198,28 +179,15 @@ public final class PlayerHolder {
         if (DEBUG) {
             Log.d(TAG, "bind() called");
         }
-        // BIND_AUTO_CREATE starts the service if it's not already running
-        bound = bind(context, Context.BIND_AUTO_CREATE);
+
+        final Intent serviceIntent = new Intent(context, PlayerService.class);
+        bound = context.bindService(serviceIntent, serviceConnection,
+                Context.BIND_AUTO_CREATE);
         if (!bound) {
             context.unbindService(serviceConnection);
         }
     }
 
-    public void tryBindIfNeeded(final Context context) {
-        if (!bound) {
-            // flags=0 means the service will not be started if it does not already exist. In this
-            // case the return value is not useful, as a value of "true" does not really indicate
-            // that the service is going to be bound.
-            bind(context, 0);
-        }
-    }
-
-    private boolean bind(final Context context, final int flags) {
-        final Intent serviceIntent = new Intent(context, PlayerService.class);
-        serviceIntent.setAction(PlayerService.BIND_PLAYER_HOLDER_ACTION);
-        return context.bindService(serviceIntent, serviceConnection, flags);
-    }
-
     private void unbind(final Context context) {
         if (DEBUG) {
             Log.d(TAG, "unbind() called");
@@ -230,32 +198,25 @@ public final class PlayerHolder {
             bound = false;
             stopPlayerListener();
             playerService = null;
+            player = null;
             if (listener != null) {
-                listener.onPlayerDisconnected();
                 listener.onServiceDisconnected();
             }
         }
     }
 
     private void startPlayerListener() {
-        if (playerService != null) {
-            // setting the player listener will take care of calling relevant callbacks if the
-            // player in the service is (not) already active, also see playerStateListener below
-            playerService.setPlayerListener(playerStateListener);
+        if (player != null) {
+            player.setFragmentListener(internalListener);
         }
-        getPlayer().ifPresent(p -> p.setFragmentListener(internalListener));
     }
 
     private void stopPlayerListener() {
-        if (playerService != null) {
-            playerService.setPlayerListener(null);
+        if (player != null) {
+            player.removeFragmentListener(internalListener);
         }
-        getPlayer().ifPresent(p -> p.removeFragmentListener(internalListener));
     }
 
-    /**
-     * This listener will be held by the players created by {@link PlayerService}.
-     */
     private final PlayerServiceEventListener internalListener =
             new PlayerServiceEventListener() {
                 @Override
@@ -342,23 +303,4 @@ public final class PlayerHolder {
                     unbind(getCommonContext());
                 }
             };
-
-    /**
-     * This listener will be held by bound {@link PlayerService}s to notify of the player starting
-     * or stopping. This is necessary since the service outlives the player e.g. to answer Android
-     * Auto media browser queries.
-     */
-    private final Consumer<Player> playerStateListener = (@Nullable final Player player) -> {
-        if (listener != null) {
-            if (player == null) {
-                // player.fragmentListener=null is already done by player.stopActivityBinding(),
-                // which is called by player.destroy(), which is in turn called by PlayerService
-                // before setting its player to null
-                listener.onPlayerDisconnected();
-            } else {
-                listener.onPlayerConnected(player, serviceConnection.playAfterConnect);
-                player.setFragmentListener(internalListener);
-            }
-        }
-    };
 }

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserCommon.kt

@@ -1,40 +0,0 @@
-package org.schabi.newpipe.player.mediabrowser
-
-import org.schabi.newpipe.BuildConfig
-import org.schabi.newpipe.extractor.InfoItem.InfoType
-import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
-
-internal const val ID_AUTHORITY = BuildConfig.APPLICATION_ID
-internal const val ID_ROOT = "//$ID_AUTHORITY"
-internal const val ID_BOOKMARKS = "playlists"
-internal const val ID_HISTORY = "history"
-internal const val ID_INFO_ITEM = "item"
-
-internal const val ID_LOCAL = "local"
-internal const val ID_REMOTE = "remote"
-internal const val ID_URL = "url"
-internal const val ID_STREAM = "stream"
-internal const val ID_PLAYLIST = "playlist"
-internal const val ID_CHANNEL = "channel"
-
-internal fun infoItemTypeToString(type: InfoType): String {
-    return when (type) {
-        InfoType.STREAM -> ID_STREAM
-        InfoType.PLAYLIST -> ID_PLAYLIST
-        InfoType.CHANNEL -> ID_CHANNEL
-        else -> throw IllegalStateException("Unexpected value: $type")
-    }
-}
-
-internal fun infoItemTypeFromString(type: String): InfoType {
-    return when (type) {
-        ID_STREAM -> InfoType.STREAM
-        ID_PLAYLIST -> InfoType.PLAYLIST
-        ID_CHANNEL -> InfoType.CHANNEL
-        else -> throw IllegalStateException("Unexpected value: $type")
-    }
-}
-
-internal fun parseError(mediaId: String): ContentNotAvailableException {
-    return ContentNotAvailableException("Failed to parse media ID $mediaId")
-}

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserImpl.kt

@@ -1,399 +0,0 @@
-package org.schabi.newpipe.player.mediabrowser
-
-import android.content.ContentResolver
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.support.v4.media.MediaBrowserCompat
-import android.support.v4.media.MediaDescriptionCompat
-import android.util.Log
-import androidx.annotation.DrawableRes
-import androidx.media.MediaBrowserServiceCompat
-import androidx.media.MediaBrowserServiceCompat.Result
-import androidx.media.utils.MediaConstants
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.schabi.newpipe.MainActivity.DEBUG
-import org.schabi.newpipe.NewPipeDatabase
-import org.schabi.newpipe.R
-import org.schabi.newpipe.database.history.model.StreamHistoryEntry
-import org.schabi.newpipe.database.playlist.PlaylistLocalItem
-import org.schabi.newpipe.database.playlist.PlaylistStreamEntry
-import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity
-import org.schabi.newpipe.extractor.InfoItem
-import org.schabi.newpipe.extractor.InfoItem.InfoType
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem
-import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
-import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem
-import org.schabi.newpipe.extractor.search.SearchInfo
-import org.schabi.newpipe.extractor.stream.StreamInfoItem
-import org.schabi.newpipe.local.bookmark.MergedPlaylistManager
-import org.schabi.newpipe.local.playlist.LocalPlaylistManager
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager
-import org.schabi.newpipe.util.ExtractorHelper
-import org.schabi.newpipe.util.ServiceHelper
-import org.schabi.newpipe.util.image.ImageStrategy
-import java.util.function.Consumer
-
-/**
- * This class is used to cleanly separate the Service implementation (in
- * [org.schabi.newpipe.player.PlayerService]) and the media browser implementation (in this file).
- *
- * @param notifyChildrenChanged takes the parent id of the children that changed
- */
-class MediaBrowserImpl(
-    private val context: Context,
-    notifyChildrenChanged: Consumer<String>, // parentId
-) {
-    private val database = NewPipeDatabase.getInstance(context)
-    private var disposables = CompositeDisposable()
-
-    init {
-        // this will listen to changes in the bookmarks until this MediaBrowserImpl is dispose()d
-        disposables.add(
-            getMergedPlaylists().subscribe { notifyChildrenChanged.accept(ID_BOOKMARKS) }
-        )
-    }
-
-    //region Cleanup
-    fun dispose() {
-        disposables.dispose()
-    }
-    //endregion
-
-    //region onGetRoot
-    fun onGetRoot(
-        clientPackageName: String,
-        clientUid: Int,
-        rootHints: Bundle?
-    ): MediaBrowserServiceCompat.BrowserRoot {
-        if (DEBUG) {
-            Log.d(TAG, "onGetRoot($clientPackageName, $clientUid, $rootHints)")
-        }
-
-        val extras = Bundle()
-        extras.putBoolean(
-            MediaConstants.BROWSER_SERVICE_EXTRAS_KEY_SEARCH_SUPPORTED, true
-        )
-        return MediaBrowserServiceCompat.BrowserRoot(ID_ROOT, extras)
-    }
-    //endregion
-
-    //region onLoadChildren
-    fun onLoadChildren(parentId: String, result: Result<List<MediaBrowserCompat.MediaItem>>) {
-        if (DEBUG) {
-            Log.d(TAG, "onLoadChildren($parentId)")
-        }
-
-        result.detach() // allows sendResult() to happen later
-        disposables.add(
-            onLoadChildren(parentId)
-                .subscribe(
-                    { result.sendResult(it) },
-                    { throwable ->
-                        // null indicates an error, see the docs of MediaSessionCompat.onSearch()
-                        result.sendResult(null)
-                        Log.e(TAG, "onLoadChildren error for parentId=$parentId: $throwable")
-                    }
-                )
-        )
-    }
-
-    private fun onLoadChildren(parentId: String): Single<List<MediaBrowserCompat.MediaItem>> {
-        try {
-            val parentIdUri = Uri.parse(parentId)
-            val path = ArrayList(parentIdUri.pathSegments)
-
-            if (path.isEmpty()) {
-                return Single.just(
-                    listOf(
-                        createRootMediaItem(
-                            ID_BOOKMARKS,
-                            context.resources.getString(R.string.tab_bookmarks_short),
-                            R.drawable.ic_bookmark_white
-                        ),
-                        createRootMediaItem(
-                            ID_HISTORY,
-                            context.resources.getString(R.string.action_history),
-                            R.drawable.ic_history_white
-                        )
-                    )
-                )
-            }
-
-            when (/*val uriType = */path.removeAt(0)) {
-                ID_BOOKMARKS -> {
-                    if (path.isEmpty()) {
-                        return populateBookmarks()
-                    }
-                    if (path.size == 2) {
-                        val localOrRemote = path[0]
-                        val playlistId = path[1].toLong()
-                        if (localOrRemote == ID_LOCAL) {
-                            return populateLocalPlaylist(playlistId)
-                        } else if (localOrRemote == ID_REMOTE) {
-                            return populateRemotePlaylist(playlistId)
-                        }
-                    }
-                    Log.w(TAG, "Unknown playlist URI: $parentId")
-                    throw parseError(parentId)
-                }
-
-                ID_HISTORY -> return populateHistory()
-
-                else -> throw parseError(parentId)
-            }
-        } catch (e: ContentNotAvailableException) {
-            return Single.error(e)
-        }
-    }
-
-    private fun createRootMediaItem(
-        mediaId: String?,
-        folderName: String?,
-        @DrawableRes iconResId: Int
-    ): MediaBrowserCompat.MediaItem {
-        val builder = MediaDescriptionCompat.Builder()
-        builder.setMediaId(mediaId)
-        builder.setTitle(folderName)
-        val resources = context.resources
-        builder.setIconUri(
-            Uri.Builder()
-                .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
-                .authority(resources.getResourcePackageName(iconResId))
-                .appendPath(resources.getResourceTypeName(iconResId))
-                .appendPath(resources.getResourceEntryName(iconResId))
-                .build()
-        )
-
-        val extras = Bundle()
-        extras.putString(
-            MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE,
-            context.getString(R.string.app_name)
-        )
-        builder.setExtras(extras)
-        return MediaBrowserCompat.MediaItem(
-            builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-        )
-    }
-
-    private fun createPlaylistMediaItem(playlist: PlaylistLocalItem): MediaBrowserCompat.MediaItem {
-        val builder = MediaDescriptionCompat.Builder()
-        builder
-            .setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid))
-            .setTitle(playlist.orderingName)
-            .setIconUri(playlist.thumbnailUrl?.let { Uri.parse(it) })
-
-        val extras = Bundle()
-        extras.putString(
-            MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_GROUP_TITLE,
-            context.resources.getString(R.string.tab_bookmarks),
-        )
-        builder.setExtras(extras)
-        return MediaBrowserCompat.MediaItem(
-            builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_BROWSABLE,
-        )
-    }
-
-    private fun createInfoItemMediaItem(item: InfoItem): MediaBrowserCompat.MediaItem? {
-        val builder = MediaDescriptionCompat.Builder()
-        builder.setMediaId(createMediaIdForInfoItem(item))
-            .setTitle(item.name)
-
-        when (item.infoType) {
-            InfoType.STREAM -> builder.setSubtitle((item as StreamInfoItem).uploaderName)
-            InfoType.PLAYLIST -> builder.setSubtitle((item as PlaylistInfoItem).uploaderName)
-            InfoType.CHANNEL -> builder.setSubtitle((item as ChannelInfoItem).description)
-            else -> return null
-        }
-
-        ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
-            builder.setIconUri(Uri.parse(it))
-        }
-
-        return MediaBrowserCompat.MediaItem(
-            builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
-
-    private fun buildMediaId(): Uri.Builder {
-        return Uri.Builder().authority(ID_AUTHORITY)
-    }
-
-    private fun buildPlaylistMediaId(playlistType: String?): Uri.Builder {
-        return buildMediaId()
-            .appendPath(ID_BOOKMARKS)
-            .appendPath(playlistType)
-    }
-
-    private fun buildLocalPlaylistItemMediaId(isRemote: Boolean, playlistId: Long): Uri.Builder {
-        return buildPlaylistMediaId(if (isRemote) ID_REMOTE else ID_LOCAL)
-            .appendPath(playlistId.toString())
-    }
-
-    private fun buildInfoItemMediaId(item: InfoItem): Uri.Builder {
-        return buildMediaId()
-            .appendPath(ID_INFO_ITEM)
-            .appendPath(infoItemTypeToString(item.infoType))
-            .appendPath(item.serviceId.toString())
-            .appendQueryParameter(ID_URL, item.url)
-    }
-
-    private fun createMediaIdForInfoItem(isRemote: Boolean, playlistId: Long): String {
-        return buildLocalPlaylistItemMediaId(isRemote, playlistId)
-            .build().toString()
-    }
-
-    private fun createLocalPlaylistStreamMediaItem(
-        playlistId: Long,
-        item: PlaylistStreamEntry,
-        index: Int,
-    ): MediaBrowserCompat.MediaItem {
-        val builder = MediaDescriptionCompat.Builder()
-        builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index))
-            .setTitle(item.streamEntity.title)
-            .setSubtitle(item.streamEntity.uploader)
-            .setIconUri(Uri.parse(item.streamEntity.thumbnailUrl))
-
-        return MediaBrowserCompat.MediaItem(
-            builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
-
-    private fun createRemotePlaylistStreamMediaItem(
-        playlistId: Long,
-        item: StreamInfoItem,
-        index: Int,
-    ): MediaBrowserCompat.MediaItem {
-        val builder = MediaDescriptionCompat.Builder()
-        builder.setMediaId(createMediaIdForPlaylistIndex(true, playlistId, index))
-            .setTitle(item.name)
-            .setSubtitle(item.uploaderName)
-
-        ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
-            builder.setIconUri(Uri.parse(it))
-        }
-
-        return MediaBrowserCompat.MediaItem(
-            builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
-
-    private fun createMediaIdForPlaylistIndex(
-        isRemote: Boolean,
-        playlistId: Long,
-        index: Int,
-    ): String {
-        return buildLocalPlaylistItemMediaId(isRemote, playlistId)
-            .appendPath(index.toString())
-            .build().toString()
-    }
-
-    private fun createMediaIdForInfoItem(item: InfoItem): String {
-        return buildInfoItemMediaId(item).build().toString()
-    }
-
-    private fun populateHistory(): Single<List<MediaBrowserCompat.MediaItem>> {
-        val history = database.streamHistoryDAO().getHistory().firstOrError()
-        return history.map { items ->
-            items.map { this.createHistoryMediaItem(it) }
-        }
-    }
-
-    private fun createHistoryMediaItem(streamHistoryEntry: StreamHistoryEntry): MediaBrowserCompat.MediaItem {
-        val builder = MediaDescriptionCompat.Builder()
-        val mediaId = buildMediaId()
-            .appendPath(ID_HISTORY)
-            .appendPath(streamHistoryEntry.streamId.toString())
-            .build().toString()
-        builder.setMediaId(mediaId)
-            .setTitle(streamHistoryEntry.streamEntity.title)
-            .setSubtitle(streamHistoryEntry.streamEntity.uploader)
-            .setIconUri(Uri.parse(streamHistoryEntry.streamEntity.thumbnailUrl))
-
-        return MediaBrowserCompat.MediaItem(
-            builder.build(),
-            MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
-
-    private fun getMergedPlaylists(): Flowable<MutableList<PlaylistLocalItem>> {
-        return MergedPlaylistManager.getMergedOrderedPlaylists(
-            LocalPlaylistManager(database),
-            RemotePlaylistManager(database)
-        )
-    }
-
-    private fun populateBookmarks(): Single<List<MediaBrowserCompat.MediaItem>> {
-        val playlists = getMergedPlaylists().firstOrError()
-        return playlists.map { playlist ->
-            playlist.map { this.createPlaylistMediaItem(it) }
-        }
-    }
-
-    private fun populateLocalPlaylist(playlistId: Long): Single<List<MediaBrowserCompat.MediaItem>> {
-        val playlist = LocalPlaylistManager(database).getPlaylistStreams(playlistId).firstOrError()
-        return playlist.map { items ->
-            items.mapIndexed { index, item ->
-                createLocalPlaylistStreamMediaItem(playlistId, item, index)
-            }
-        }
-    }
-
-    private fun populateRemotePlaylist(playlistId: Long): Single<List<MediaBrowserCompat.MediaItem>> {
-        return RemotePlaylistManager(database).getPlaylist(playlistId).firstOrError()
-            .flatMap { ExtractorHelper.getPlaylistInfo(it.serviceId, it.url, false) }
-            .map {
-                // ignore it.errors, i.e. ignore errors about specific items, since there would
-                // be no way to show the error properly in Android Auto anyway
-                it.relatedItems.mapIndexed { index, item ->
-                    createRemotePlaylistStreamMediaItem(playlistId, item, index)
-                }
-            }
-    }
-    //endregion
-
-    //region Search
-    fun onSearch(
-        query: String,
-        result: Result<List<MediaBrowserCompat.MediaItem>>
-    ) {
-        if (DEBUG) {
-            Log.d(TAG, "onSearch($query)")
-        }
-
-        result.detach() // allows sendResult() to happen later
-        disposables.add(
-            searchMusicBySongTitle(query)
-                // ignore it.errors, i.e. ignore errors about specific items, since there would
-                // be no way to show the error properly in Android Auto anyway
-                .map { it.relatedItems.mapNotNull(this::createInfoItemMediaItem) }
-                .subscribeOn(Schedulers.io())
-                .subscribe(
-                    { result.sendResult(it) },
-                    { throwable ->
-                        // null indicates an error, see the docs of MediaSessionCompat.onSearch()
-                        result.sendResult(null)
-                        Log.e(TAG, "Search error for query=\"$query\": $throwable")
-                    }
-                )
-        )
-    }
-
-    private fun searchMusicBySongTitle(query: String?): Single<SearchInfo> {
-        val serviceId = ServiceHelper.getSelectedServiceId(context)
-        return ExtractorHelper.searchFor(serviceId, query, listOf(), "")
-    }
-    //endregion
-
-    companion object {
-        private val TAG: String = MediaBrowserImpl::class.java.getSimpleName()
-    }
-}

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt

@@ -1,259 +0,0 @@
-package org.schabi.newpipe.player.mediabrowser
-
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.os.ResultReceiver
-import android.support.v4.media.session.PlaybackStateCompat
-import android.util.Log
-import com.google.android.exoplayer2.Player
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.disposables.Disposable
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.schabi.newpipe.MainActivity
-import org.schabi.newpipe.NewPipeDatabase
-import org.schabi.newpipe.R
-import org.schabi.newpipe.extractor.InfoItem.InfoType
-import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler
-import org.schabi.newpipe.local.playlist.LocalPlaylistManager
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager
-import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue
-import org.schabi.newpipe.player.playqueue.PlayQueue
-import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue
-import org.schabi.newpipe.player.playqueue.SinglePlayQueue
-import org.schabi.newpipe.util.ChannelTabHelper
-import org.schabi.newpipe.util.ExtractorHelper
-import org.schabi.newpipe.util.NavigationHelper
-import java.util.function.BiConsumer
-import java.util.function.Consumer
-
-/**
- * This class is used to cleanly separate the Service implementation (in
- * [org.schabi.newpipe.player.PlayerService]) and the playback preparer implementation (in this
- * file). We currently use the playback preparer only in conjunction with the media browser: the
- * playback preparer will receive the media URLs generated by [MediaBrowserImpl] and will start
- * playback of the corresponding streams or playlists.
- *
- * @param setMediaSessionError takes an error String and an error code from [PlaybackStateCompat],
- * calls `sessionConnector.setCustomErrorMessage(errorString, errorCode)`
- * @param clearMediaSessionError calls `sessionConnector.setCustomErrorMessage(null)`
- * @param onPrepare takes playWhenReady, calls `player.prepare()`; this is needed because
- * `MediaSessionConnector`'s `onPlay()` method calls this class'  [onPrepare] instead of
- * `player.prepare()` if the playback preparer is not null, but we want the original behavior
- */
-class MediaBrowserPlaybackPreparer(
-    private val context: Context,
-    private val setMediaSessionError: BiConsumer<String, Int>, // error string, error code
-    private val clearMediaSessionError: Runnable,
-    private val onPrepare: Consumer<Boolean>,
-) : PlaybackPreparer {
-    private val database = NewPipeDatabase.getInstance(context)
-    private var disposable: Disposable? = null
-
-    fun dispose() {
-        disposable?.dispose()
-    }
-
-    //region Overrides
-    override fun getSupportedPrepareActions(): Long {
-        return PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID
-    }
-
-    override fun onPrepare(playWhenReady: Boolean) {
-        onPrepare.accept(playWhenReady)
-    }
-
-    override fun onPrepareFromMediaId(mediaId: String, playWhenReady: Boolean, extras: Bundle?) {
-        if (MainActivity.DEBUG) {
-            Log.d(TAG, "onPrepareFromMediaId($mediaId, $playWhenReady, $extras)")
-        }
-
-        disposable?.dispose()
-        disposable = extractPlayQueueFromMediaId(mediaId)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(
-                { playQueue ->
-                    clearMediaSessionError.run()
-                    NavigationHelper.playOnBackgroundPlayer(context, playQueue, playWhenReady)
-                },
-                { throwable ->
-                    Log.e(TAG, "Failed to start playback of media ID [$mediaId]", throwable)
-                    onPrepareError()
-                }
-            )
-    }
-
-    override fun onPrepareFromSearch(query: String, playWhenReady: Boolean, extras: Bundle?) {
-        onUnsupportedError()
-    }
-
-    override fun onPrepareFromUri(uri: Uri, playWhenReady: Boolean, extras: Bundle?) {
-        onUnsupportedError()
-    }
-
-    override fun onCommand(
-        player: Player,
-        command: String,
-        extras: Bundle?,
-        cb: ResultReceiver?
-    ): Boolean {
-        return false
-    }
-    //endregion
-
-    //region Errors
-    private fun onUnsupportedError() {
-        setMediaSessionError.accept(
-            context.getString(R.string.content_not_supported),
-            PlaybackStateCompat.ERROR_CODE_NOT_SUPPORTED
-        )
-    }
-
-    private fun onPrepareError() {
-        setMediaSessionError.accept(
-            context.getString(R.string.error_snackbar_message),
-            PlaybackStateCompat.ERROR_CODE_APP_ERROR
-        )
-    }
-    //endregion
-
-    //region Building play queues from playlists and history
-    private fun extractLocalPlayQueue(playlistId: Long, index: Int): Single<PlayQueue> {
-        return LocalPlaylistManager(database).getPlaylistStreams(playlistId).firstOrError()
-            .map { items -> SinglePlayQueue(items.map { it.toStreamInfoItem() }, index) }
-    }
-
-    private fun extractRemotePlayQueue(playlistId: Long, index: Int): Single<PlayQueue> {
-        return RemotePlaylistManager(database).getPlaylist(playlistId).firstOrError()
-            .flatMap { ExtractorHelper.getPlaylistInfo(it.serviceId, it.url, false) }
-            // ignore info.errors, i.e. ignore errors about specific items, since there would
-            // be no way to show the error properly in Android Auto anyway
-            .map { info -> PlaylistPlayQueue(info, index) }
-    }
-
-    private fun extractPlayQueueFromMediaId(mediaId: String): Single<PlayQueue> {
-        try {
-            val mediaIdUri = Uri.parse(mediaId)
-            val path = ArrayList(mediaIdUri.pathSegments)
-            if (path.isEmpty()) {
-                throw parseError(mediaId)
-            }
-
-            return when (/*val uriType = */path.removeAt(0)) {
-                ID_BOOKMARKS -> extractPlayQueueFromPlaylistMediaId(
-                    mediaId,
-                    path,
-                    mediaIdUri.getQueryParameter(ID_URL)
-                )
-
-                ID_HISTORY -> extractPlayQueueFromHistoryMediaId(mediaId, path)
-
-                ID_INFO_ITEM -> extractPlayQueueFromInfoItemMediaId(
-                    mediaId,
-                    path,
-                    mediaIdUri.getQueryParameter(ID_URL) ?: throw parseError(mediaId)
-                )
-
-                else -> throw parseError(mediaId)
-            }
-        } catch (e: ContentNotAvailableException) {
-            return Single.error(e)
-        }
-    }
-
-    @Throws(ContentNotAvailableException::class)
-    private fun extractPlayQueueFromPlaylistMediaId(
-        mediaId: String,
-        path: MutableList<String>,
-        url: String?,
-    ): Single<PlayQueue> {
-        if (path.isEmpty()) {
-            throw parseError(mediaId)
-        }
-
-        when (val playlistType = path.removeAt(0)) {
-            ID_LOCAL, ID_REMOTE -> {
-                if (path.size != 2) {
-                    throw parseError(mediaId)
-                }
-                val playlistId = path[0].toLong()
-                val index = path[1].toInt()
-                return if (playlistType == ID_LOCAL)
-                    extractLocalPlayQueue(playlistId, index)
-                else
-                    extractRemotePlayQueue(playlistId, index)
-            }
-
-            ID_URL -> {
-                if (path.size != 1 || url == null) {
-                    throw parseError(mediaId)
-                }
-
-                val serviceId = path[0].toInt()
-                return ExtractorHelper.getPlaylistInfo(serviceId, url, false)
-                    .map { PlaylistPlayQueue(it) }
-            }
-
-            else -> throw parseError(mediaId)
-        }
-    }
-
-    @Throws(ContentNotAvailableException::class)
-    private fun extractPlayQueueFromHistoryMediaId(
-        mediaId: String,
-        path: List<String>,
-    ): Single<PlayQueue> {
-        if (path.size != 1) {
-            throw parseError(mediaId)
-        }
-
-        val streamId = path[0].toLong()
-        return database.streamHistoryDAO().getHistory()
-            .firstOrError()
-            .map { items ->
-                val infoItems = items
-                    .filter { it.streamId == streamId }
-                    .map { it.toStreamInfoItem() }
-                SinglePlayQueue(infoItems, 0)
-            }
-    }
-
-    @Throws(ContentNotAvailableException::class)
-    private fun extractPlayQueueFromInfoItemMediaId(
-        mediaId: String,
-        path: List<String>,
-        url: String,
-    ): Single<PlayQueue> {
-        if (path.size != 2) {
-            throw parseError(mediaId)
-        }
-
-        val serviceId = path[1].toInt()
-        return when (/*val infoItemType = */infoItemTypeFromString(path[0])) {
-            InfoType.STREAM -> ExtractorHelper.getStreamInfo(serviceId, url, false)
-                .map { SinglePlayQueue(it) }
-
-            InfoType.PLAYLIST -> ExtractorHelper.getPlaylistInfo(serviceId, url, false)
-                .map { PlaylistPlayQueue(it) }
-
-            InfoType.CHANNEL -> ExtractorHelper.getChannelInfo(serviceId, url, false)
-                .map { info ->
-                    val playableTab = info.tabs
-                        .firstOrNull { ChannelTabHelper.isStreamsTab(it) }
-                        ?: throw ContentNotAvailableException("No streams tab found")
-                    return@map ChannelTabPlayQueue(serviceId, ListLinkHandler(playableTab))
-                }
-
-            else -> throw parseError(mediaId)
-        }
-    }
-    //endregion
-
-    companion object {
-        private val TAG = MediaBrowserPlaybackPreparer::class.simpleName
-    }
-}

app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java

@@ -38,10 +38,8 @@ public class MediaSessionPlayerUi extends PlayerUi
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = "MediaSessUi";
 
-    @NonNull
-    private final MediaSessionCompat mediaSession;
-    @NonNull
-    private final MediaSessionConnector sessionConnector;
+    private MediaSessionCompat mediaSession;
+    private MediaSessionConnector sessionConnector;
 
     private final String ignoreHardwareMediaButtonsKey;
     private boolean shouldIgnoreHardwareMediaButtons = false;
@@ -50,13 +48,9 @@ public class MediaSessionPlayerUi extends PlayerUi
     private List<NotificationActionData> prevNotificationActions = List.of();
 
 
-    public MediaSessionPlayerUi(@NonNull final Player player,
-                                @NonNull final MediaSessionCompat mediaSession,
-                                @NonNull final MediaSessionConnector sessionConnector) {
+    public MediaSessionPlayerUi(@NonNull final Player player) {
         super(player);
-        this.mediaSession = mediaSession;
-        this.sessionConnector = sessionConnector;
-        this.ignoreHardwareMediaButtonsKey =
+        ignoreHardwareMediaButtonsKey =
                 context.getString(R.string.ignore_hardware_media_buttons_key);
     }
 
@@ -65,8 +59,10 @@ public class MediaSessionPlayerUi extends PlayerUi
         super.initPlayer();
         destroyPlayer(); // release previously used resources
 
+        mediaSession = new MediaSessionCompat(context, TAG);
         mediaSession.setActive(true);
 
+        sessionConnector = new MediaSessionConnector(mediaSession);
         sessionConnector.setQueueNavigator(new PlayQueueNavigator(mediaSession, player));
         sessionConnector.setPlayer(getForwardingPlayer());
 
@@ -91,18 +87,27 @@ public class MediaSessionPlayerUi extends PlayerUi
     public void destroyPlayer() {
         super.destroyPlayer();
         player.getPrefs().unregisterOnSharedPreferenceChangeListener(this);
-        sessionConnector.setMediaButtonEventHandler(null);
-        sessionConnector.setPlayer(null);
-        sessionConnector.setQueueNavigator(null);
-        mediaSession.setActive(false);
+        if (sessionConnector != null) {
+            sessionConnector.setMediaButtonEventHandler(null);
+            sessionConnector.setPlayer(null);
+            sessionConnector.setQueueNavigator(null);
+            sessionConnector = null;
+        }
+        if (mediaSession != null) {
+            mediaSession.setActive(false);
+            mediaSession.release();
+            mediaSession = null;
+        }
         prevNotificationActions = List.of();
     }
 
     @Override
     public void onThumbnailLoaded(@Nullable final Bitmap bitmap) {
         super.onThumbnailLoaded(bitmap);
-        // the thumbnail is now loaded: invalidate the metadata to trigger a metadata update
-        sessionConnector.invalidateMediaSessionMetadata();
+        if (sessionConnector != null) {
+            // the thumbnail is now loaded: invalidate the metadata to trigger a metadata update
+            sessionConnector.invalidateMediaSessionMetadata();
+        }
     }
 
 
@@ -193,11 +198,6 @@ public class MediaSessionPlayerUi extends PlayerUi
             return;
         }
 
-        if (!mediaSession.isActive()) {
-            // mediaSession will be inactive after destroyPlayer is called
-            return;
-        }
-
         // only use the fourth and fifth actions (the settings page also shows only the last 2 on
         // Android 13+)
         final List<NotificationActionData> newNotificationActions = IntStream.of(3, 4)

app/src/main/java/org/schabi/newpipe/player/notification/NotificationActionData.java

@@ -69,48 +69,41 @@ public final class NotificationActionData {
         switch (selectedAction) {
             case NotificationConstants.PREVIOUS:
                 return new NotificationActionData(ACTION_PLAY_PREVIOUS,
-                        ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_previous_description), baseActionIcon);
+                        ctx.getString(R.string.exo_controls_previous_description), baseActionIcon);
 
             case NotificationConstants.NEXT:
                 return new NotificationActionData(ACTION_PLAY_NEXT,
-                        ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_next_description), baseActionIcon);
+                        ctx.getString(R.string.exo_controls_next_description), baseActionIcon);
 
             case NotificationConstants.REWIND:
                 return new NotificationActionData(ACTION_FAST_REWIND,
-                        ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_rewind_description), baseActionIcon);
+                        ctx.getString(R.string.exo_controls_rewind_description), baseActionIcon);
 
             case NotificationConstants.FORWARD:
                 return new NotificationActionData(ACTION_FAST_FORWARD,
-                        ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_fastforward_description), baseActionIcon);
+                        ctx.getString(R.string.exo_controls_fastforward_description),
+                        baseActionIcon);
 
             case NotificationConstants.SMART_REWIND_PREVIOUS:
                 if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) {
                     return new NotificationActionData(ACTION_PLAY_PREVIOUS,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_previous_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_notification_previous);
+                            ctx.getString(R.string.exo_controls_previous_description),
+                            R.drawable.exo_notification_previous);
                 } else {
                     return new NotificationActionData(ACTION_FAST_REWIND,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_rewind_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_controls_rewind);
+                            ctx.getString(R.string.exo_controls_rewind_description),
+                            R.drawable.exo_controls_rewind);
                 }
 
             case NotificationConstants.SMART_FORWARD_NEXT:
                 if (player.getPlayQueue() != null && player.getPlayQueue().size() > 1) {
                     return new NotificationActionData(ACTION_PLAY_NEXT,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_next_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_notification_next);
+                            ctx.getString(R.string.exo_controls_next_description),
+                            R.drawable.exo_notification_next);
                 } else {
                     return new NotificationActionData(ACTION_FAST_FORWARD,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_fastforward_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_controls_fastforward);
+                            ctx.getString(R.string.exo_controls_fastforward_description),
+                            R.drawable.exo_controls_fastforward);
                 }
 
             case NotificationConstants.PLAY_PAUSE_BUFFERING:
@@ -126,56 +119,45 @@ public final class NotificationActionData {
             case NotificationConstants.PLAY_PAUSE:
                 if (player.getCurrentState() == Player.STATE_COMPLETED) {
                     return new NotificationActionData(ACTION_PLAY_PAUSE,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_pause_description),
+                            ctx.getString(R.string.exo_controls_pause_description),
                             R.drawable.ic_replay);
                 } else if (player.isPlaying()
                         || player.getCurrentState() == Player.STATE_PREFLIGHT
                         || player.getCurrentState() == Player.STATE_BLOCKED
                         || player.getCurrentState() == Player.STATE_BUFFERING) {
                     return new NotificationActionData(ACTION_PLAY_PAUSE,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_pause_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_notification_pause);
+                            ctx.getString(R.string.exo_controls_pause_description),
+                            R.drawable.exo_notification_pause);
                 } else {
                     return new NotificationActionData(ACTION_PLAY_PAUSE,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_play_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_notification_play);
+                            ctx.getString(R.string.exo_controls_play_description),
+                            R.drawable.exo_notification_play);
                 }
 
             case NotificationConstants.REPEAT:
                 if (player.getRepeatMode() == REPEAT_MODE_ALL) {
                     return new NotificationActionData(ACTION_REPEAT,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_repeat_all_description),
-                            com.google.android.exoplayer2.ext.mediasession.R.drawable
-                                    .exo_media_action_repeat_all);
+                            ctx.getString(R.string.exo_controls_repeat_all_description),
+                            R.drawable.exo_media_action_repeat_all);
                 } else if (player.getRepeatMode() == REPEAT_MODE_ONE) {
                     return new NotificationActionData(ACTION_REPEAT,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_repeat_one_description),
-                            com.google.android.exoplayer2.ext.mediasession.R.drawable
-                                    .exo_media_action_repeat_one);
+                            ctx.getString(R.string.exo_controls_repeat_one_description),
+                            R.drawable.exo_media_action_repeat_one);
                 } else /* player.getRepeatMode() == REPEAT_MODE_OFF */ {
                     return new NotificationActionData(ACTION_REPEAT,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_repeat_off_description),
-                            com.google.android.exoplayer2.ext.mediasession.R.drawable
-                                    .exo_media_action_repeat_off);
+                            ctx.getString(R.string.exo_controls_repeat_off_description),
+                            R.drawable.exo_media_action_repeat_off);
                 }
 
             case NotificationConstants.SHUFFLE:
                 if (player.getPlayQueue() != null && player.getPlayQueue().isShuffled()) {
                     return new NotificationActionData(ACTION_SHUFFLE,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_shuffle_on_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_controls_shuffle_on);
+                            ctx.getString(R.string.exo_controls_shuffle_on_description),
+                            R.drawable.exo_controls_shuffle_on);
                 } else {
                     return new NotificationActionData(ACTION_SHUFFLE,
-                            ctx.getString(com.google.android.exoplayer2.ui.R.string
-                                    .exo_controls_shuffle_off_description),
-                            com.google.android.exoplayer2.ui.R.drawable.exo_controls_shuffle_off);
+                            ctx.getString(R.string.exo_controls_shuffle_off_description),
+                            R.drawable.exo_controls_shuffle_off);
                 }
 
             case NotificationConstants.CLOSE:

app/src/main/java/org/schabi/newpipe/player/notification/NotificationConstants.java

@@ -78,16 +78,16 @@ public final class NotificationConstants {
     @DrawableRes
     public static final int[] ACTION_ICONS = {
             0,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_previous,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_next,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_rewind,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_fastforward,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_previous,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_next,
+            R.drawable.exo_icon_previous,
+            R.drawable.exo_icon_next,
+            R.drawable.exo_icon_rewind,
+            R.drawable.exo_icon_fastforward,
+            R.drawable.exo_icon_previous,
+            R.drawable.exo_icon_next,
             R.drawable.ic_pause,
             R.drawable.ic_hourglass_top,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_repeat_all,
-            com.google.android.exoplayer2.ui.R.drawable.exo_icon_shuffle_on,
+            R.drawable.exo_icon_repeat_all,
+            R.drawable.exo_icon_shuffle_on,
             R.drawable.ic_close,
     };
 
@@ -122,41 +122,29 @@ public final class NotificationConstants {
     public static String getActionName(@NonNull final Context context, @Action final int action) {
         switch (action) {
             case PREVIOUS:
-                return context.getString(com.google.android.exoplayer2.ui.R.string
-                        .exo_controls_previous_description);
+                return context.getString(R.string.exo_controls_previous_description);
             case NEXT:
-                return context.getString(com.google.android.exoplayer2.ui.R.string
-                        .exo_controls_next_description);
+                return context.getString(R.string.exo_controls_next_description);
             case REWIND:
-                return context.getString(com.google.android.exoplayer2.ui.R.string
-                        .exo_controls_rewind_description);
+                return context.getString(R.string.exo_controls_rewind_description);
             case FORWARD:
-                return context.getString(com.google.android.exoplayer2.ui.R.string
-                        .exo_controls_fastforward_description);
+                return context.getString(R.string.exo_controls_fastforward_description);
             case SMART_REWIND_PREVIOUS:
                 return Localization.concatenateStrings(
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_rewind_description),
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_previous_description));
+                        context.getString(R.string.exo_controls_rewind_description),
+                        context.getString(R.string.exo_controls_previous_description));
             case SMART_FORWARD_NEXT:
                 return Localization.concatenateStrings(
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_fastforward_description),
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_next_description));
+                        context.getString(R.string.exo_controls_fastforward_description),
+                        context.getString(R.string.exo_controls_next_description));
             case PLAY_PAUSE:
                 return Localization.concatenateStrings(
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_play_description),
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_pause_description));
+                        context.getString(R.string.exo_controls_play_description),
+                        context.getString(R.string.exo_controls_pause_description));
             case PLAY_PAUSE_BUFFERING:
                 return Localization.concatenateStrings(
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_play_description),
-                        context.getString(com.google.android.exoplayer2.ui.R.string
-                                .exo_controls_pause_description),
+                        context.getString(R.string.exo_controls_play_description),
+                        context.getString(R.string.exo_controls_pause_description),
                         context.getString(R.string.notification_action_buffering));
             case REPEAT:
                 return context.getString(R.string.notification_action_repeat);

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

@@ -28,17 +28,13 @@ abstract class AbstractInfoPlayQueue<T extends ListInfo<? extends InfoItem>>
     private transient Disposable fetchReactor;
 
     protected AbstractInfoPlayQueue(final T info) {
-        this(info, 0);
-    }
-
-    protected AbstractInfoPlayQueue(final T info, final int index) {
         this(info.getServiceId(), info.getUrl(), info.getNextPage(),
                 info.getRelatedItems()
                         .stream()
                         .filter(StreamInfoItem.class::isInstance)
                         .map(StreamInfoItem.class::cast)
                         .collect(Collectors.toList()),
-                index);
+                0);
     }
 
     protected AbstractInfoPlayQueue(final int serviceId,

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

@@ -16,10 +16,6 @@ public final class PlaylistPlayQueue extends AbstractInfoPlayQueue<PlaylistInfo>
         super(info);
     }
 
-    public PlaylistPlayQueue(final PlaylistInfo info, final int index) {
-        super(info, index);
-    }
-
     public PlaylistPlayQueue(final int serviceId,
                              final String url,
                              final Page nextPage,

app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java

@@ -132,8 +132,17 @@ public class SeekbarPreviewThumbnailHolder {
 
                 // Get the bounds where the frame is found
                 final int[] bounds = frameset.getFrameBoundsAt(currentPosMs);
-                generatedDataForUrl.put(currentPosMs,
-                                        createBitmapSupplier(srcBitMap, bounds, frameset));
+                generatedDataForUrl.put(currentPosMs, () -> {
+                    // It can happen, that the original bitmap could not be downloaded
+                    // In such a case - we don't want a NullPointer - simply return null
+                    if (srcBitMap == null) {
+                        return null;
+                    }
+
+                    // Cut out the corresponding bitmap form the "srcBitMap"
+                    return Bitmap.createBitmap(srcBitMap, bounds[1], bounds[2],
+                            frameset.getFrameWidth(), frameset.getFrameHeight());
+                });
 
                 currentPosMs += frameset.getDurationPerFrame();
                 pos++;
@@ -156,45 +165,6 @@ public class SeekbarPreviewThumbnailHolder {
         }
     }
 
-    private Supplier<Bitmap> createBitmapSupplier(final Bitmap srcBitMap,
-                                                  final int[] bounds,
-                                                  final Frameset frameset) {
-        return () -> {
-            // It can happen, that the original bitmap could not be downloaded
-            // (or it was recycled though that should not happen)
-            // In such a case - we don't want a NullPointer/
-            // "cannot use a recycled source in createBitmap" Exception -> simply return null
-            if (srcBitMap == null || srcBitMap.isRecycled()) {
-                return null;
-            }
-
-            // Under some rare circumstances the YouTube API returns slightly too small storyboards,
-            // (or not the matching frame width/height)
-            // This would lead to createBitmap cutting out a bitmap that is out of bounds,
-            // so we need to adjust the bounds accordingly
-            if (srcBitMap.getWidth() < bounds[1] + frameset.getFrameWidth()) {
-                bounds[1] = srcBitMap.getWidth() - frameset.getFrameWidth();
-            }
-
-            if (srcBitMap.getHeight() < bounds[2] + frameset.getFrameHeight()) {
-                bounds[2] = srcBitMap.getHeight() - frameset.getFrameHeight();
-            }
-
-            // Cut out the corresponding bitmap form the "srcBitMap"
-            final Bitmap cutOutBitmap = Bitmap.createBitmap(srcBitMap, bounds[1], bounds[2],
-                    frameset.getFrameWidth(), frameset.getFrameHeight());
-
-            // If the cut out bitmap is identical to its source,
-            // we need to copy the bitmap to create a new instance.
-            // createBitmap allows itself to return the original object that is was created with
-            // this leads to recycled bitmaps being returned (if they are identical)
-            // Reference: https://stackoverflow.com/a/23683075 + first comment
-            // Fixes: https://github.com/TeamNewPipe/NewPipe/issues/11461
-            return cutOutBitmap == srcBitMap
-                    ? cutOutBitmap.copy(cutOutBitmap.getConfig(), true) : cutOutBitmap;
-        };
-    }
-
     @Nullable
     private Bitmap getBitMapFrom(final String url) {
         if (url == null) {

app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java

@@ -25,7 +25,9 @@ import android.graphics.Color;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,7 +44,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.exoplayer2.ui.SubtitleView;
 import com.google.android.exoplayer2.video.VideoSize;
 
 import org.schabi.newpipe.R;
@@ -521,8 +522,11 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
 
     @Override
     protected void setupSubtitleView(final float captionScale) {
-        binding.subtitleView.setFractionalTextSize(
-                SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * captionScale);
+        final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        final int minimumLength = Math.min(metrics.heightPixels, metrics.widthPixels);
+        final float captionRatioInverse = 20f + 4f * (1.0f - captionScale);
+        binding.subtitleView.setFixedTextSize(
+                TypedValue.COMPLEX_UNIT_PX, minimumLength / captionRatioInverse);
     }
     //endregion
 

app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java

@@ -382,7 +382,7 @@ public final class PopupPlayerUi extends VideoPlayerUi {
                     private void end() {
                         windowManager.removeView(closeOverlayBinding.getRoot());
                         closeOverlayBinding = null;
-                        player.getService().destroyPlayerAndStopService();
+                        player.getService().stopService();
                     }
                 }).start();
     }
@@ -424,8 +424,9 @@ public final class PopupPlayerUi extends VideoPlayerUi {
 
     @Override
     protected void setupSubtitleView(final float captionScale) {
+        final float captionRatio = (captionScale - 1.0f) / 5.0f + 1.0f;
         binding.subtitleView.setFractionalTextSize(
-                SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * captionScale);
+                SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * captionRatio);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java

@@ -952,14 +952,11 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
         super.onRepeatModeChanged(repeatMode);
 
         if (repeatMode == REPEAT_MODE_ALL) {
-            binding.repeatButton.setImageResource(
-                    com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_all);
+            binding.repeatButton.setImageResource(R.drawable.exo_controls_repeat_all);
         } else if (repeatMode == REPEAT_MODE_ONE) {
-            binding.repeatButton.setImageResource(
-                    com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_one);
+            binding.repeatButton.setImageResource(R.drawable.exo_controls_repeat_one);
         } else /* repeatMode == REPEAT_MODE_OFF */ {
-            binding.repeatButton.setImageResource(
-                    com.google.android.exoplayer2.ui.R.drawable.exo_controls_repeat_off);
+            binding.repeatButton.setImageResource(R.drawable.exo_controls_repeat_off);
         }
     }
 
@@ -1414,10 +1411,6 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
         binding.subtitleView.setStyle(captionStyle);
     }
 
-    /**
-     *
-     * @param captionScale Value returned by {@link PlayerHelper#getCaptionScale}.
-     */
     protected abstract void setupSubtitleView(float captionScale);
     //endregion