Merge pull request #12435 from TeamNewPipe/release-0.28.0

Currently translated at 12.7% (95 of 748 strings)

Co-authored-by: fool <thing-sauna-cussed@duck.com>

.github/workflows/ci.yml

@@ -111,6 +111,7 @@ jobs:
           path: app/build/reports/androidTests/connected/**
 
   sonar:
+    if: ${{ false }} # the key has expired and needs to be regenerated by the sonar admins
     runs-on: ubuntu-latest
 
     permissions:

.gitignore

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

README.md

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

app/build.gradle

@@ -1,18 +1,14 @@
 import com.android.tools.profgen.ArtProfileKt
 import com.android.tools.profgen.ArtProfileSerializer
 import com.android.tools.profgen.DexFile
-import com.mikepenz.aboutlibraries.plugin.DuplicateMode
 
 plugins {
-    alias libs.plugins.android.application
-    alias libs.plugins.kotlin.android
-    alias libs.plugins.kotlin.compose
-    alias libs.plugins.kotlin.kapt
-    alias libs.plugins.kotlin.parcelize
-    alias libs.plugins.checkstyle
-    alias libs.plugins.sonarqube
-    alias libs.plugins.hilt
-    alias libs.plugins.aboutlibraries
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "kotlin-parcelize"
+    id "checkstyle"
+    id "org.sonarqube" version "4.0.0.2929"
 }
 
 android {
@@ -27,9 +23,9 @@ android {
         if (System.properties.containsKey('versionCodeOverride')) {
             versionCode System.getProperty('versionCodeOverride') as Integer
         } else {
-            versionCode 1004
+            versionCode 1005
         }
-        versionName "0.27.7"
+        versionName "0.28.0"
         if (System.properties.containsKey('versionNameSuffix')) {
             versionNameSuffix System.getProperty('versionNameSuffix')
         }
@@ -107,7 +103,6 @@ android {
 
     buildFeatures {
         viewBinding true
-        compose true
         buildConfig true
     }
 
@@ -122,6 +117,23 @@ android {
     }
 }
 
+ext {
+    checkstyleVersion = '10.12.1'
+
+    androidxLifecycleVersion = '2.6.2'
+    androidxRoomVersion = '2.6.1'
+    androidxWorkVersion = '2.8.1'
+
+    stateSaverVersion = '1.4.1'
+    exoPlayerVersion = '2.18.7'
+    googleAutoServiceVersion = '1.1.1'
+    groupieVersion = '2.10.1'
+    markwonVersion = '4.6.2'
+
+    leakCanaryVersion = '2.12'
+    stethoVersion = '1.6.0'
+}
+
 configurations {
     checkstyle
     ktlint
@@ -131,7 +143,7 @@ checkstyle {
     getConfigDirectory().set(rootProject.file("checkstyle"))
     ignoreFailures false
     showViolations true
-    toolVersion = libs.versions.checkstyle.get()
+    toolVersion = checkstyleVersion
 }
 
 tasks.register('runCheckstyle', Checkstyle) {
@@ -173,13 +185,11 @@ tasks.register('formatKtlint', JavaExec) {
     jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
-apply from: 'check-dependencies.gradle'
-
 afterEvaluate {
     if (!System.properties.containsKey('skipFormatKtlint')) {
         preDebugBuild.dependsOn formatKtlint
     }
-    preDebugBuild.dependsOn runCheckstyle, runKtlint, checkDependenciesOrder
+    preDebugBuild.dependsOn runCheckstyle, runKtlint
 }
 
 sonar {
@@ -190,155 +200,125 @@ sonar {
     }
 }
 
-kapt {
-    correctErrorTypes true
-}
-
-aboutLibraries {
-    // note: offline mode prevents the plugin from fetching licenses at build time, which would be
-    // harmful for reproducible builds
-    offlineMode = true
-    duplicationMode = DuplicateMode.MERGE
-}
-
 dependencies {
 /** Desugaring **/
-    coreLibraryDesugaring libs.desugar.jdk.libs.nio
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
 
 /** NewPipe libraries **/
-    implementation libs.teamnewpipe.nanojson
-    implementation libs.teamnewpipe.newpipe.extractor
-    implementation libs.teamnewpipe.nononsense.filepicker
+    // You can use a local version by uncommenting a few lines in settings.gradle
+    // Or you can use a commit you pushed to GitHub by just replacing TeamNewPipe with your GitHub
+    // name and the commit hash with the commit hash of the (pushed) commit you want to test
+    // This works thanks to JitPack: https://jitpack.io/
+    implementation 'com.github.TeamNewPipe:nanojson:e9d656ddb49a412a5a0a5d5ef20ca7ef09549996'
+    // WORKAROUND: if you get errors with the NewPipeExtractor dependency, replace `v0.24.3` with
+    // the corresponding commit hash, since JitPack sometimes deletes artifacts.
+    // If there’s already a git hash, just add more of it to the end (or remove a letter)
+    // to cause jitpack to regenerate the artifact.
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.24.8'
+    implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
-    checkstyle libs.tools.checkstyle
-    ktlint libs.tools.ktlint
+    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
+    ktlint 'com.pinterest:ktlint:0.45.2'
 
 /** Kotlin **/
-    implementation libs.kotlin.stdlib
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
 
 /** AndroidX **/
-    implementation libs.androidx.appcompat
-    implementation libs.androidx.cardview
-    implementation libs.androidx.constraintlayout
-    implementation libs.androidx.core.ktx
-    implementation libs.androidx.documentfile
-    implementation libs.androidx.fragment.compose
-    implementation libs.androidx.lifecycle.livedata
-    implementation libs.androidx.lifecycle.viewmodel
-    implementation libs.androidx.localbroadcastmanager
-    implementation libs.androidx.media
-    implementation libs.androidx.preference
-    implementation libs.androidx.recyclerview
-    implementation libs.androidx.room.runtime
-    implementation libs.androidx.room.rxjava3
-    kapt libs.androidx.room.compiler
-    implementation libs.androidx.swiperefreshlayout
-    implementation libs.androidx.work.runtime
-    implementation libs.androidx.work.rxjava3
-    implementation libs.androidx.material
-    implementation libs.androidx.webkit
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+    implementation 'androidx.media:media:1.7.0'
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation "androidx.room:room-runtime:${androidxRoomVersion}"
+    implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
+    kapt "androidx.room:room-compiler:${androidxRoomVersion}"
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    // Newer version specified to prevent accessibility regressions with RecyclerView, see:
+    // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
+    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 libs.livefront.bridge
-    implementation libs.android.state
-    kapt libs.android.state.processor
+    implementation 'com.github.livefront:bridge:v2.0.2'
+    implementation "com.evernote:android-state:$stateSaverVersion"
+    kapt "com.evernote:android-state-processor:$stateSaverVersion"
 
     // HTML parser
-    implementation libs.jsoup
+    implementation "org.jsoup:jsoup:1.17.2"
 
     // HTTP client
-    implementation libs.okhttp
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
 
     // Media player
-    implementation libs.exoplayer.core
-    implementation libs.exoplayer.dash
-    implementation libs.exoplayer.database
-    implementation libs.exoplayer.datasource
-    implementation libs.exoplayer.hls
-    implementation libs.exoplayer.smoothstreaming
-    implementation libs.exoplayer.ui
-    implementation libs.extension.mediasession
+    implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-dash:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-database:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-datasource:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-hls:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-ui:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
     // Metadata generator for service descriptors
-    compileOnly libs.auto.service
-    kapt libs.auto.service.kapt
+    compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}"
+    kapt "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
 
     // Manager for complex RecyclerView layouts
-    implementation libs.lisawray.groupie
-    implementation libs.lisawray.groupie.viewbinding
+    implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
+    implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
 
     // Image loading
-    implementation libs.coil.compose
-    implementation libs.coil.network.okhttp
+    //noinspection GradleDependency --> 2.8 is the last version, not 2.71828!
+    implementation "com.squareup.picasso:picasso:2.8"
 
     // Markdown library for Android
-    implementation libs.markwon.core
-    implementation libs.markwon.linkify
+    implementation "io.noties.markwon:core:${markwonVersion}"
+    implementation "io.noties.markwon:linkify:${markwonVersion}"
 
     // Crash reporting
-    implementation libs.acra.core
+    implementation "ch.acra:acra-core:5.11.3"
 
     // Properly restarting
-    implementation libs.process.phoenix
+    implementation 'com.jakewharton:process-phoenix:2.1.2'
 
     // Reactive extensions for Java VM
-    implementation libs.rxjava3.rxjava
-    implementation libs.rxjava3.rxandroid
+    implementation "io.reactivex.rxjava3:rxjava:3.1.8"
+    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
     // RxJava binding APIs for Android UI widgets
-    implementation libs.rxbinding4.rxbinding
+    implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
 
     // Date and time formatting
-    implementation libs.prettytime
-
-    // Jetpack Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation libs.androidx.compose.material3
-    implementation libs.androidx.compose.adaptive
-    implementation libs.androidx.activity.compose
-    implementation libs.androidx.compose.ui.tooling.preview
-    implementation libs.androidx.lifecycle.viewmodel.compose
-    implementation libs.androidx.compose.ui.text // Needed for parsing HTML to AnnotatedString
-    implementation libs.androidx.compose.material.icons.extended
-
-    // Jetpack Compose related dependencies
-    implementation libs.androidx.paging.compose
-    implementation libs.androidx.navigation.compose
-
-    // Coroutines interop
-    implementation libs.kotlinx.coroutines.rx3
-
-    // Library loading for About screen
-    implementation libs.aboutlibraries.compose.m3
-
-    // Hilt
-    implementation libs.hilt.android
-    kapt(libs.hilt.compiler)
-
-    // Scroll
-    implementation libs.lazycolumnscrollbar
+    implementation "org.ocpsoft.prettytime:prettytime:5.0.8.Final"
 
 /** Debugging **/
     // Memory leak detection
-    debugImplementation libs.leakcanary.object.watcher
-    debugImplementation libs.leakcanary.plumber.android
-    debugImplementation libs.leakcanary.android.core
+    debugImplementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}"
+    debugImplementation "com.squareup.leakcanary:plumber-android:${leakCanaryVersion}"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android-core:${leakCanaryVersion}"
     // Debug bridge for Android
-    debugImplementation libs.stetho
-    debugImplementation libs.stetho.okhttp3
-
-    // Jetpack Compose
-    debugImplementation libs.androidx.compose.ui.tooling
+    debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
 
 /** Testing **/
-    testImplementation libs.junit
-    testImplementation libs.mockito.core
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.6.0'
 
-    androidTestImplementation libs.androidx.junit
-    androidTestImplementation libs.androidx.runner
-    androidTestImplementation libs.androidx.room.testing
-    androidTestImplementation libs.assertj.core
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test:runner:1.5.2"
+    androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
+    androidTestImplementation "org.assertj:assertj-core:3.24.2"
 }
 
 static String getGitWorkingBranch() {

app/check-dependencies.gradle

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

app/src/main/AndroidManifest.xml

@@ -57,6 +57,15 @@
             </intent-filter>
         </receiver>
 
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
         <service
             android:name=".player.PlayerService"
             android:exported="true"
@@ -80,11 +89,6 @@
             android:exported="false"
             android:label="@string/settings" />
 
-        <activity
-            android:name=".settings.SettingsV2Activity"
-            android:exported="true"
-            android:label="@string/settings" />
-
         <activity
             android:name=".about.AboutActivity"
             android:exported="false"

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

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

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

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

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

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

app/src/main/java/org/schabi/newpipe/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; Win64; x64; rv:140.0) Gecko/20100101 Firefox/140.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";
@@ -48,11 +48,6 @@ public final class DownloaderImpl extends Downloader {
         this.mCookies = new HashMap<>();
     }
 
-    @NonNull
-    public OkHttpClient getClient() {
-        return client;
-    }
-
     /**
      * It's recommended to call exactly once in the entire lifetime of the application.
      *

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

@@ -20,8 +20,6 @@
 
 package org.schabi.newpipe;
 
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -45,6 +43,7 @@ import android.widget.FrameLayout;
 import android.widget.Spinner;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
@@ -52,6 +51,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentContainerView;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
@@ -65,11 +65,13 @@ import org.schabi.newpipe.databinding.ToolbarLayoutBinding;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+import org.schabi.newpipe.fragments.list.comments.CommentRepliesFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.local.feed.notifications.NotificationWorker;
 import org.schabi.newpipe.player.Player;
@@ -77,6 +79,7 @@ import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.settings.UpdateSettingsFragment;
+import org.schabi.newpipe.settings.migration.MigrationManager;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.KioskTranslator;
@@ -122,7 +125,10 @@ public class MainActivity extends AppCompatActivity {
     private static final int ITEM_ID_ABOUT = 2;
 
     private static final int ORDER = 0;
+    public static final String KEY_IS_IN_BACKGROUND = "is_in_background";
 
+    private SharedPreferences sharedPreferences;
+    private SharedPreferences.Editor sharedPrefEditor;
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -134,6 +140,7 @@ public class MainActivity extends AppCompatActivity {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
 
+        Localization.migrateAppLanguageSettingIfNecessary(getApplicationContext());
         ThemeHelper.setDayNightMode(this);
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
@@ -150,8 +157,9 @@ public class MainActivity extends AppCompatActivity {
             }
         }
 
-        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        sharedPrefEditor = sharedPreferences.edit();
 
         mainBinding = ActivityMainBinding.inflate(getLayoutInflater());
         drawerLayoutBinding = mainBinding.drawerLayout;
@@ -182,29 +190,42 @@ public class MainActivity extends AppCompatActivity {
             NotificationWorker.initialize(this);
         }
         if (!UpdateSettingsFragment.wasUserAskedForConsent(this)
-                && !App.getInstance().isFirstRun()
+                && !App.getApp().isFirstRun()
                 && ReleaseVersionUtil.INSTANCE.isReleaseApk()) {
             UpdateSettingsFragment.askForConsentToUpdateChecks(this);
         }
 
-        Localization.migrateAppLanguageSettingIfNecessary(getApplicationContext());
+        MigrationManager.showUserInfoIfPresent(this);
     }
 
     @Override
     protected void onPostCreate(final Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
-        final App app = App.getInstance();
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
+        final App app = App.getApp();
 
-        if (prefs.getBoolean(app.getString(R.string.update_app_key), false)
-                && prefs.getBoolean(app.getString(R.string.update_check_consent_key), false)) {
+        if (sharedPreferences.getBoolean(app.getString(R.string.update_app_key), false)
+                && sharedPreferences
+                .getBoolean(app.getString(R.string.update_check_consent_key), false)) {
             // Start the worker which is checking all conditions
             // and eventually searching for a new version.
             NewVersionWorker.enqueueNewVersionCheckingWork(app, false);
         }
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        sharedPrefEditor.putBoolean(KEY_IS_IN_BACKGROUND, false).apply();
+        Log.d(TAG, "App moved to foreground");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        sharedPrefEditor.putBoolean(KEY_IS_IN_BACKGROUND, true).apply();
+        Log.d(TAG, "App moved to background");
+    }
     private void setupDrawer() throws ExtractionException {
         addDrawerMenuForCurrentService();
 
@@ -242,19 +263,6 @@ public class MainActivity extends AppCompatActivity {
      */
     private void addDrawerMenuForCurrentService() throws ExtractionException {
         //Tabs
-        final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
-        final StreamingService service = NewPipe.getService(currentServiceId);
-
-        int kioskMenuItemId = 0;
-
-        for (final String ks : service.getKioskList().getAvailableKiosks()) {
-            drawerLayoutBinding.navigation.getMenu()
-                    .add(R.id.menu_tabs_group, kioskMenuItemId, 0, KioskTranslator
-                            .getTranslatedKioskName(ks, this))
-                    .setIcon(KioskTranslator.getKioskIcon(ks));
-            kioskMenuItemId++;
-        }
-
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER,
                         R.string.tab_subscriptions)
@@ -272,6 +280,20 @@ public class MainActivity extends AppCompatActivity {
                 .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
                 .setIcon(R.drawable.ic_history);
 
+        //Kiosks
+        final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        final StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskMenuItemId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerLayoutBinding.navigation.getMenu()
+                    .add(R.id.menu_kiosks_group, kioskMenuItemId, 0, KioskTranslator
+                            .getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcon(ks));
+            kioskMenuItemId++;
+        }
+
         //Settings and About
         drawerLayoutBinding.navigation.getMenu()
                 .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
@@ -291,10 +313,13 @@ public class MainActivity extends AppCompatActivity {
                 changeService(item);
                 break;
             case R.id.menu_tabs_group:
+                tabSelected(item);
+                break;
+            case R.id.menu_kiosks_group:
                 try {
-                    tabSelected(item);
+                    kioskSelected(item);
                 } catch (final Exception e) {
-                    ErrorUtil.showUiErrorSnackbar(this, "Selecting main page tab", e);
+                    ErrorUtil.showUiErrorSnackbar(this, "Selecting drawer kiosk", e);
                 }
                 break;
             case R.id.menu_options_about_group:
@@ -318,7 +343,7 @@ public class MainActivity extends AppCompatActivity {
                 .setChecked(true);
     }
 
-    private void tabSelected(final MenuItem item) throws ExtractionException {
+    private void tabSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case ITEM_ID_SUBSCRIPTIONS:
                 NavigationHelper.openSubscriptionFragment(getSupportFragmentManager());
@@ -335,18 +360,19 @@ public class MainActivity extends AppCompatActivity {
             case ITEM_ID_HISTORY:
                 NavigationHelper.openStatisticFragment(getSupportFragmentManager());
                 break;
-            default:
-                final StreamingService currentService = ServiceHelper.getSelectedService(this);
-                int kioskMenuItemId = 0;
-                for (final String kioskId : currentService.getKioskList().getAvailableKiosks()) {
-                    if (kioskMenuItemId == item.getItemId()) {
-                        NavigationHelper.openKioskFragment(getSupportFragmentManager(),
-                                currentService.getServiceId(), kioskId);
-                        break;
-                    }
-                    kioskMenuItemId++;
-                }
+        }
+    }
+
+    private void kioskSelected(final MenuItem item) throws ExtractionException {
+        final StreamingService currentService = ServiceHelper.getSelectedService(this);
+        int kioskMenuItemId = 0;
+        for (final String kioskId : currentService.getKioskList().getAvailableKiosks()) {
+            if (kioskMenuItemId == item.getItemId()) {
+                NavigationHelper.openKioskFragment(getSupportFragmentManager(),
+                        currentService.getServiceId(), kioskId);
                 break;
+            }
+            kioskMenuItemId++;
         }
     }
 
@@ -387,6 +413,7 @@ public class MainActivity extends AppCompatActivity {
 
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_services_group);
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_tabs_group);
+        drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_kiosks_group);
         drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_options_about_group);
 
         // Show up or down arrow
@@ -480,9 +507,8 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onResume() {
-        assureCorrectAppLanguage(this);
         // Change the date format to match the selected language on resume
-        Localization.initPrettyTime(Localization.resolvePrettyTime(getApplicationContext()));
+        Localization.initPrettyTime(Localization.resolvePrettyTime());
         super.onResume();
 
         // Close drawer on return, and don't show animation,
@@ -504,13 +530,11 @@ public class MainActivity extends AppCompatActivity {
             ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
         }
 
-        final SharedPreferences sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
             if (DEBUG) {
                 Log.d(TAG, "Theme has changed, recreating activity...");
             }
-            sharedPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
+            sharedPrefEditor.putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
             ActivityCompat.recreate(this);
         }
 
@@ -518,7 +542,7 @@ public class MainActivity extends AppCompatActivity {
             if (DEBUG) {
                 Log.d(TAG, "main page has changed, recreating main fragment...");
             }
-            sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
+            sharedPrefEditor.putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
             NavigationHelper.openMainActivity(this);
         }
 
@@ -578,27 +602,39 @@ public class MainActivity extends AppCompatActivity {
         // In case bottomSheet is not visible on the screen or collapsed we can assume that the user
         // interacts with a fragment inside fragment_holder so all back presses should be
         // handled by it
-        final var fragmentManager = getSupportFragmentManager();
-
         if (bottomSheetHiddenOrCollapsed()) {
-            final var fragment = fragmentManager.findFragmentById(R.id.fragment_holder);
+            final FragmentManager fm = getSupportFragmentManager();
+            final Fragment fragment = fm.findFragmentById(R.id.fragment_holder);
             // If current fragment implements BackPressable (i.e. can/wanna handle back press)
             // delegate the back press to it
-            if (fragment instanceof BackPressable backPressable && backPressable.onBackPressed()) {
+            if (fragment instanceof BackPressable) {
+                if (((BackPressable) fragment).onBackPressed()) {
+                    return;
+                }
+            } else if (fragment instanceof CommentRepliesFragment) {
+                // expand DetailsFragment if CommentRepliesFragment was opened
+                // to show the top level comments again
+                // Expand DetailsFragment if CommentRepliesFragment was opened
+                // and no other CommentRepliesFragments are on top of the back stack
+                // to show the top level comments again.
+                openDetailFragmentFromCommentReplies(fm, false);
+            }
+
+        } else {
+            final Fragment fragmentPlayer = getSupportFragmentManager()
+                    .findFragmentById(R.id.fragment_player_holder);
+            // If current fragment implements BackPressable (i.e. can/wanna handle back press)
+            // delegate the back press to it
+            if (fragmentPlayer instanceof BackPressable) {
+                if (!((BackPressable) fragmentPlayer).onBackPressed()) {
+                    BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
+                            .setState(BottomSheetBehavior.STATE_COLLAPSED);
+                }
                 return;
             }
-        } else {
-            final var player = fragmentManager.findFragmentById(R.id.fragment_player_holder);
-            // If current fragment implements BackPressable (i.e. can/wanna handle back press)
-            // delegate the back press to it
-            if (player instanceof BackPressable backPressable && !backPressable.onBackPressed()) {
-                BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
-                        .setState(BottomSheetBehavior.STATE_COLLAPSED);
-            }
-            return;
         }
 
-        if (fragmentManager.getBackStackEntryCount() == 1) {
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
             finish();
         } else {
             super.onBackPressed();
@@ -657,9 +693,15 @@ public class MainActivity extends AppCompatActivity {
      * </pre>
      */
     private void onHomeButtonPressed() {
-        final var fm = getSupportFragmentManager();
+        final FragmentManager fm = getSupportFragmentManager();
+        final Fragment fragment = fm.findFragmentById(R.id.fragment_holder);
 
-        if (!NavigationHelper.tryGotoSearchFragment(fm)) {
+        if (fragment instanceof CommentRepliesFragment) {
+            // Expand DetailsFragment if CommentRepliesFragment was opened
+            // and no other CommentRepliesFragments are on top of the back stack
+            // to show the top level comments again.
+            openDetailFragmentFromCommentReplies(fm, true);
+        } else if (!NavigationHelper.tryGotoSearchFragment(fm)) {
             // If search fragment wasn't found in the backstack go to the main fragment
             NavigationHelper.gotoMainFragment(fm);
         }
@@ -862,6 +904,68 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    private void openDetailFragmentFromCommentReplies(
+            @NonNull final FragmentManager fm,
+            final boolean popBackStack
+    ) {
+        // obtain the name of the fragment under the replies fragment that's going to be popped
+        @Nullable final String fragmentUnderEntryName;
+        if (fm.getBackStackEntryCount() < 2) {
+            fragmentUnderEntryName = null;
+        } else {
+            fragmentUnderEntryName = fm.getBackStackEntryAt(fm.getBackStackEntryCount() - 2)
+                    .getName();
+        }
+
+        // the root comment is the comment for which the user opened the replies page
+        @Nullable final CommentRepliesFragment repliesFragment =
+                (CommentRepliesFragment) fm.findFragmentByTag(CommentRepliesFragment.TAG);
+        @Nullable final CommentsInfoItem rootComment =
+                repliesFragment == null ? null : repliesFragment.getCommentsInfoItem();
+
+        // sometimes this function pops the backstack, other times it's handled by the system
+        if (popBackStack) {
+            fm.popBackStackImmediate();
+        }
+
+        // only expand the bottom sheet back if there are no more nested comment replies fragments
+        // stacked under the one that is currently being popped
+        if (CommentRepliesFragment.TAG.equals(fragmentUnderEntryName)) {
+            return;
+        }
+
+        final BottomSheetBehavior<FragmentContainerView> behavior = BottomSheetBehavior
+                .from(mainBinding.fragmentPlayerHolder);
+        // do not return to the comment if the details fragment was closed
+        if (behavior.getState() == BottomSheetBehavior.STATE_HIDDEN) {
+            return;
+        }
+
+        // scroll to the root comment once the bottom sheet expansion animation is finished
+        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+            @Override
+            public void onStateChanged(@NonNull final View bottomSheet,
+                                       final int newState) {
+                if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+                    final Fragment detailFragment = fm.findFragmentById(
+                            R.id.fragment_player_holder);
+                    if (detailFragment instanceof VideoDetailFragment && rootComment != null) {
+                        // should always be the case
+                        ((VideoDetailFragment) detailFragment).scrollToComment(rootComment);
+                    }
+                    behavior.removeBottomSheetCallback(this);
+                }
+            }
+
+            @Override
+            public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
+                // not needed, listener is removed once the sheet is expanded
+            }
+        });
+
+        behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    }
+
     private boolean bottomSheetHiddenOrCollapsed() {
         final BottomSheetBehavior<FrameLayout> bottomSheetBehavior =
                 BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder);

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

@@ -84,7 +84,6 @@ import org.schabi.newpipe.util.ChannelTabHelper;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -132,7 +131,6 @@ public class RouterActivity extends AppCompatActivity {
         ThemeHelper.setDayNightMode(this);
         setTheme(ThemeHelper.isLightThemeSelected(this)
                 ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
-        Localization.assureCorrectAppLanguage(this);
 
         // Pass-through touch events to background activities
         // so that our transparent window won't lock UI in the mean time

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

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

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

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

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

@@ -0,0 +1,138 @@
+package org.schabi.newpipe.about
+
+import android.os.Bundle
+import android.util.Base64
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.WebView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.schabi.newpipe.BuildConfig
+import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.FragmentLicensesBinding
+import org.schabi.newpipe.databinding.ItemSoftwareComponentBinding
+import org.schabi.newpipe.ktx.parcelableArrayList
+import org.schabi.newpipe.util.external_communication.ShareUtils
+
+/**
+ * Fragment containing the software licenses.
+ */
+class LicenseFragment : Fragment() {
+    private lateinit var softwareComponents: List<SoftwareComponent>
+    private var activeSoftwareComponent: SoftwareComponent? = null
+    private val compositeDisposable = CompositeDisposable()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        softwareComponents = arguments?.parcelableArrayList<SoftwareComponent>(ARG_COMPONENTS)!!
+            .sortedBy { it.name } // Sort components by name
+        activeSoftwareComponent = savedInstanceState?.getSerializable(SOFTWARE_COMPONENT_KEY) as? SoftwareComponent
+    }
+
+    override fun onDestroy() {
+        compositeDisposable.dispose()
+        super.onDestroy()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val binding = FragmentLicensesBinding.inflate(inflater, container, false)
+        binding.licensesAppReadLicense.setOnClickListener {
+            compositeDisposable.add(
+                showLicense(NEWPIPE_SOFTWARE_COMPONENT)
+            )
+        }
+        for (component in softwareComponents) {
+            val componentBinding = ItemSoftwareComponentBinding
+                .inflate(inflater, container, false)
+            componentBinding.name.text = component.name
+            componentBinding.copyright.text = getString(
+                R.string.copyright,
+                component.years,
+                component.copyrightOwner,
+                component.license.abbreviation
+            )
+            val root: View = componentBinding.root
+            root.tag = component
+            root.setOnClickListener {
+                compositeDisposable.add(
+                    showLicense(component)
+                )
+            }
+            binding.licensesSoftwareComponents.addView(root)
+            registerForContextMenu(root)
+        }
+        activeSoftwareComponent?.let { compositeDisposable.add(showLicense(it)) }
+        return binding.root
+    }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
+        activeSoftwareComponent?.let { savedInstanceState.putSerializable(SOFTWARE_COMPONENT_KEY, it) }
+    }
+
+    private fun showLicense(
+        softwareComponent: SoftwareComponent
+    ): Disposable {
+        return if (context == null) {
+            Disposable.empty()
+        } else {
+            val context = requireContext()
+            activeSoftwareComponent = softwareComponent
+            Observable.fromCallable { getFormattedLicense(context, softwareComponent.license) }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { formattedLicense ->
+                    val webViewData = Base64.encodeToString(
+                        formattedLicense.toByteArray(), Base64.NO_PADDING
+                    )
+                    val webView = WebView(context)
+                    webView.loadData(webViewData, "text/html; charset=UTF-8", "base64")
+
+                    val builder = AlertDialog.Builder(requireContext())
+                        .setTitle(softwareComponent.name)
+                        .setView(webView)
+                        .setOnCancelListener { activeSoftwareComponent = null }
+                        .setOnDismissListener { activeSoftwareComponent = null }
+                        .setPositiveButton(R.string.done) { dialog, _ -> dialog.dismiss() }
+
+                    if (softwareComponent != NEWPIPE_SOFTWARE_COMPONENT) {
+                        builder.setNeutralButton(R.string.open_website_license) { _, _ ->
+                            ShareUtils.openUrlInApp(requireContext(), softwareComponent.link)
+                        }
+                    }
+
+                    builder.show()
+                }
+        }
+    }
+
+    companion object {
+        private const val ARG_COMPONENTS = "components"
+        private const val SOFTWARE_COMPONENT_KEY = "ACTIVE_SOFTWARE_COMPONENT"
+        private val NEWPIPE_SOFTWARE_COMPONENT = SoftwareComponent(
+            "NewPipe",
+            "2014-2023",
+            "Team NewPipe",
+            "https://newpipe.net/",
+            StandardLicenses.GPL3,
+            BuildConfig.VERSION_NAME
+        )
+
+        fun newInstance(softwareComponents: ArrayList<SoftwareComponent>): LicenseFragment {
+            val fragment = LicenseFragment()
+            fragment.arguments = bundleOf(ARG_COMPONENTS to softwareComponents)
+            return fragment
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+package org.schabi.newpipe.about
+
+import android.content.Context
+import org.schabi.newpipe.R
+import org.schabi.newpipe.util.ThemeHelper
+import java.io.IOException
+
+/**
+ * @param context the context to use
+ * @param license the license
+ * @return String which contains a HTML formatted license page
+ * styled according to the context's theme
+ */
+fun getFormattedLicense(context: Context, license: License): String {
+    try {
+        return context.assets.open(license.filename).bufferedReader().use { it.readText() }
+            // split the HTML file and insert the stylesheet into the HEAD of the file
+            .replace("</head>", "<style>${getLicenseStylesheet(context)}</style></head>")
+    } catch (e: IOException) {
+        throw IllegalArgumentException("Could not get license file: ${license.filename}", e)
+    }
+}
+
+/**
+ * @param context the Android context
+ * @return String which is a CSS stylesheet according to the context's theme
+ */
+fun getLicenseStylesheet(context: Context): String {
+    val isLightTheme = ThemeHelper.isLightThemeSelected(context)
+    val licenseBackgroundColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_license_background_color else R.color.dark_license_background_color
+    )
+    val licenseTextColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_license_text_color else R.color.dark_license_text_color
+    )
+    val youtubePrimaryColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_youtube_primary_color else R.color.dark_youtube_primary_color
+    )
+    return "body{padding:12px 15px;margin:0;background:#$licenseBackgroundColor;color:#$licenseTextColor}" +
+        "a[href]{color:#$youtubePrimaryColor}pre{white-space:pre-wrap}"
+}
+
+/**
+ * Cast R.color to a hexadecimal color value.
+ *
+ * @param context the context to use
+ * @param color   the color number from R.color
+ * @return a six characters long String with hexadecimal RGB values
+ */
+fun getHexRGBColor(context: Context, color: Int): String {
+    return context.getString(color).substring(3)
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.download;
 
 import static org.schabi.newpipe.extractor.stream.DeliveryMethod.PROGRESSIVE_HTTP;
 import static org.schabi.newpipe.util.ListHelper.getStreamsOfSpecifiedDelivery;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -751,7 +750,6 @@ public class DownloadDialog extends DialogFragment
     }
 
     private void showFailedDialog(@StringRes final int msg) {
-        assureCorrectAppLanguage(requireContext());
         new AlertDialog.Builder(context)
                 .setTitle(R.string.general_error)
                 .setMessage(msg)

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

@@ -9,6 +9,7 @@ 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.

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

@@ -1,7 +1,5 @@
 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;
@@ -79,7 +77,6 @@ public class ErrorActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
 
         ThemeHelper.setDayNightMode(this);
@@ -306,7 +303,7 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private String getAppLanguage() {
-        return Localization.getAppLocale(getApplicationContext()).toString();
+        return Localization.getAppLocale().toString();
     }
 
     private String getOsString() {

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

@@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit
 class ErrorPanelHelper(
     private val fragment: Fragment,
     rootView: View,
-    onRetry: Runnable
+    onRetry: Runnable?,
 ) {
     private val context: Context = rootView.context!!
 
@@ -56,12 +56,15 @@ class ErrorPanelHelper(
         errorPanelRoot.findViewById(R.id.error_open_in_browser)
 
     private var errorDisposable: Disposable? = null
+    private var retryShouldBeShown: Boolean = (onRetry != null)
 
     init {
-        errorDisposable = errorRetryButton.clicks()
-            .debounce(300, TimeUnit.MILLISECONDS)
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe { onRetry.run() }
+        if (onRetry != null) {
+            errorDisposable = errorRetryButton.clicks()
+                .debounce(300, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { onRetry.run() }
+        }
     }
 
     private fun ensureDefaultVisibility() {
@@ -101,7 +104,7 @@ class ErrorPanelHelper(
                 errorActionButton.setOnClickListener(null)
             }
 
-            errorRetryButton.isVisible = true
+            errorRetryButton.isVisible = retryShouldBeShown
             showAndSetOpenInBrowserButtonAction(errorInfo)
         } else if (errorInfo.throwable is AccountTerminatedException) {
             errorTextView.setText(R.string.account_terminated)
@@ -130,7 +133,7 @@ class ErrorPanelHelper(
                 errorInfo.throwable !is ContentNotSupportedException
             ) {
                 // show retry button only for content which is not unavailable or unsupported
-                errorRetryButton.isVisible = true
+                errorRetryButton.isVisible = retryShouldBeShown
             }
             showAndSetOpenInBrowserButtonAction(errorInfo)
         }

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

@@ -11,7 +11,9 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.fragment.app.Fragment
+import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
+import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
 
 /**
@@ -35,12 +37,20 @@ class ErrorUtil {
          * activity (since the workflow would be interrupted anyway in that case). So never use this
          * for background services.
          *
+         * If the crashed occurred while the app was in the background open a notification instead
+         *
          * @param context the context to use to start the new activity
          * @param errorInfo the error info to be reported
          */
         @JvmStatic
         fun openActivity(context: Context, errorInfo: ErrorInfo) {
-            context.startActivity(getErrorActivityIntent(context, errorInfo))
+            if (PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(MainActivity.KEY_IS_IN_BACKGROUND, true)
+            ) {
+                createNotification(context, errorInfo)
+            } else {
+                context.startActivity(getErrorActivityIntent(context, errorInfo))
+            }
         }
 
         /**

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

@@ -32,7 +32,8 @@ public enum UserAction {
     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");
+    OPEN_INFO_ITEM_DIALOG("open info item dialog"),
+    GETTING_MAIN_SCREEN_TAB("getting main screen tab");
 
     private final String message;
 

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

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

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

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

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

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

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

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

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

@@ -74,6 +74,7 @@ import org.schabi.newpipe.error.ReCaptchaActivity;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.stream.AudioStream;
@@ -116,7 +117,7 @@ import org.schabi.newpipe.util.StreamTypeUtil;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.image.CoilHelper;
+import org.schabi.newpipe.util.image.PicassoHelper;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -127,7 +128,6 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -159,6 +159,8 @@ public final class VideoDetailFragment
     private static final String DESCRIPTION_TAB_TAG = "DESCRIPTION TAB";
     private static final String EMPTY_TAB_TAG = "EMPTY TAB";
 
+    private static final String PICASSO_VIDEO_DETAILS_TAG = "PICASSO_VIDEO_DETAILS_TAG";
+
     // tabs
     private boolean showComments;
     private boolean showRelatedItems;
@@ -188,21 +190,21 @@ public final class VideoDetailFragment
             };
 
     @State
-    int serviceId = Constants.NO_SERVICE_ID;
+    protected int serviceId = Constants.NO_SERVICE_ID;
     @State
     @NonNull
-    String title = "";
+    protected String title = "";
     @State
     @Nullable
-    String url = null;
+    protected String url = null;
     @Nullable
-    private PlayQueue playQueue = null;
+    protected PlayQueue playQueue = null;
     @State
     int bottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
     @State
     int lastStableBottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
     @State
-    boolean autoPlayEnabled = true;
+    protected boolean autoPlayEnabled = true;
 
     @Nullable
     private StreamInfo currentInfo = null;
@@ -246,7 +248,7 @@ public final class VideoDetailFragment
         // It will do nothing if the player is not in fullscreen mode
         hideSystemUiIfNeeded();
 
-        final Optional<MainPlayerUi> playerUi = player.UIs().getOpt(MainPlayerUi.class);
+        final Optional<MainPlayerUi> playerUi = player.UIs().get(MainPlayerUi.class);
         if (!player.videoPlayerSelected() && !playAfterConnect) {
             return;
         }
@@ -438,15 +440,18 @@ public final class VideoDetailFragment
     @Override
     public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == ReCaptchaActivity.RECAPTCHA_REQUEST) {
-            if (resultCode == Activity.RESULT_OK) {
-                NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
-                        serviceId, url, title, null, false);
-            } else {
-                Log.e(TAG, "ReCaptcha failed");
-            }
-        } else {
-            Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+        switch (requestCode) {
+            case ReCaptchaActivity.RECAPTCHA_REQUEST:
+                if (resultCode == Activity.RESULT_OK) {
+                    NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
+                            serviceId, url, title, null, false);
+                } else {
+                    Log.e(TAG, "ReCaptcha failed");
+                }
+                break;
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
         }
     }
 
@@ -526,7 +531,7 @@ public final class VideoDetailFragment
         binding.overlayPlayPauseButton.setOnClickListener(v -> {
             if (playerIsNotStopped()) {
                 player.playPause();
-                player.UIs().getOpt(VideoPlayerUi.class).ifPresent(ui -> ui.hideControls(0, 0));
+                player.UIs().get(VideoPlayerUi.class).ifPresent(ui -> ui.hideControls(0, 0));
                 showSystemUi();
             } else {
                 autoPlayEnabled = true; // forcefully start playing
@@ -685,7 +690,7 @@ public final class VideoDetailFragment
     @Override
     public boolean onKeyDown(final int keyCode) {
         return isPlayerAvailable()
-                && player.UIs().getOpt(VideoPlayerUi.class)
+                && player.UIs().get(VideoPlayerUi.class)
                 .map(playerUi -> playerUi.onKeyDown(keyCode)).orElse(false);
     }
 
@@ -812,17 +817,13 @@ public final class VideoDetailFragment
 
     }
 
-    private void prepareAndLoadInfo() {
+    protected void prepareAndLoadInfo() {
         scrollToTop();
         startLoading(false);
     }
 
     @Override
     public void startLoading(final boolean forceLoad) {
-        startLoading(forceLoad, null);
-    }
-
-    private void startLoading(final boolean forceLoad, final @Nullable Boolean addToBackStack) {
         super.startLoading(forceLoad);
 
         initTabs();
@@ -831,7 +832,19 @@ public final class VideoDetailFragment
             currentWorker.dispose();
         }
 
-        runWorker(forceLoad, addToBackStack != null ? addToBackStack : stack.isEmpty());
+        runWorker(forceLoad, stack.isEmpty());
+    }
+
+    private void startLoading(final boolean forceLoad, final boolean addToBackStack) {
+        super.startLoading(forceLoad);
+
+        initTabs();
+        currentInfo = null;
+        if (currentWorker != null) {
+            currentWorker.dispose();
+        }
+
+        runWorker(forceLoad, addToBackStack);
     }
 
     private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
@@ -879,7 +892,8 @@ public final class VideoDetailFragment
         tabContentDescriptions.clear();
 
         if (shouldShowComments()) {
-            pageAdapter.addFragment(CommentsFragment.getInstance(serviceId, url), COMMENTS_TAB_TAG);
+            pageAdapter.addFragment(
+                    CommentsFragment.getInstance(serviceId, url, title), COMMENTS_TAB_TAG);
             tabIcons.add(R.drawable.ic_comment);
             tabContentDescriptions.add(R.string.comments_tab_description);
         }
@@ -1009,6 +1023,20 @@ public final class VideoDetailFragment
         updateTabLayoutVisibility();
     }
 
+    public void scrollToComment(final CommentsInfoItem comment) {
+        final int commentsTabPos = pageAdapter.getItemPositionByTitle(COMMENTS_TAB_TAG);
+        final Fragment fragment = pageAdapter.getItem(commentsTabPos);
+        if (!(fragment instanceof CommentsFragment)) {
+            return;
+        }
+
+        // unexpand the app bar only if scrolling to the comment succeeded
+        if (((CommentsFragment) fragment).scrollToComment(comment)) {
+            binding.appBarLayout.setExpanded(false, false);
+            binding.viewPager.setCurrentItem(commentsTabPos, false);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Play Utils
     //////////////////////////////////////////////////////////////////////////*/
@@ -1017,7 +1045,7 @@ public final class VideoDetailFragment
         // If a user watched video inside fullscreen mode and than chose another player
         // return to non-fullscreen mode
         if (isPlayerAvailable()) {
-            player.UIs().getOpt(MainPlayerUi.class).ifPresent(playerUi -> {
+            player.UIs().get(MainPlayerUi.class).ifPresent(playerUi -> {
                 if (playerUi.isFullscreen()) {
                     playerUi.toggleFullscreen();
                 }
@@ -1127,7 +1155,7 @@ public final class VideoDetailFragment
     }
 
     private void openMainPlayer() {
-        if (noPlayerServiceAvailable()) {
+        if (!isPlayerServiceAvailable()) {
             playerHolder.startService(autoPlayEnabled, this);
             return;
         }
@@ -1152,7 +1180,7 @@ public final class VideoDetailFragment
      */
     private void hideMainPlayerOnLoadingNewStream() {
         final var root = getRoot();
-        if (noPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
+        if (!isPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
             return;
         }
 
@@ -1233,7 +1261,7 @@ public final class VideoDetailFragment
             // setup the surface view height, so that it fits the video correctly
             setHeightThumbnail();
 
-            player.UIs().getOpt(MainPlayerUi.class).ifPresent(playerUi -> {
+            player.UIs().get(MainPlayerUi.class).ifPresent(playerUi -> {
                 // sometimes binding would be null here, even though getView() != null above u.u
                 if (binding != null) {
                     // prevent from re-adding a view multiple times
@@ -1249,7 +1277,7 @@ public final class VideoDetailFragment
         makeDefaultHeightForVideoPlaceholder();
 
         if (player != null) {
-            player.UIs().getOpt(VideoPlayerUi.class).ifPresent(VideoPlayerUi::removeViewFromParent);
+            player.UIs().get(VideoPlayerUi.class).ifPresent(VideoPlayerUi::removeViewFromParent);
         }
     }
 
@@ -1316,7 +1344,7 @@ public final class VideoDetailFragment
         binding.detailThumbnailImageView.setMinimumHeight(newHeight);
         if (isPlayerAvailable()) {
             final int maxHeight = (int) (metrics.heightPixels * MAX_PLAYER_HEIGHT);
-            player.UIs().getOpt(VideoPlayerUi.class).ifPresent(ui ->
+            player.UIs().get(VideoPlayerUi.class).ifPresent(ui ->
                     ui.getBinding().surfaceView.setHeights(newHeight,
                             ui.isFullscreen() ? newHeight : maxHeight));
         }
@@ -1326,23 +1354,23 @@ public final class VideoDetailFragment
         binding.detailContentRootHiding.setVisibility(View.VISIBLE);
     }
 
-    private void setInitialData(final int newServiceId,
-                                @Nullable final String newUrl,
-                                @NonNull final String newTitle,
-                                @Nullable final PlayQueue newPlayQueue) {
+    protected void setInitialData(final int newServiceId,
+                                  @Nullable final String newUrl,
+                                  @NonNull final String newTitle,
+                                  @Nullable final PlayQueue newPlayQueue) {
         this.serviceId = newServiceId;
         this.url = newUrl;
         this.title = newTitle;
         this.playQueue = newPlayQueue;
     }
 
-    private void setErrorImage() {
+    private void setErrorImage(final int imageResource) {
         if (binding == null || activity == null) {
             return;
         }
 
         binding.detailThumbnailImageView.setImageDrawable(
-                AppCompatResources.getDrawable(requireContext(), R.drawable.not_available_monkey));
+                AppCompatResources.getDrawable(requireContext(), imageResource));
         animate(binding.detailThumbnailImageView, false, 0, AnimationType.ALPHA,
                 0, () -> animate(binding.detailThumbnailImageView, true, 500));
     }
@@ -1350,7 +1378,7 @@ public final class VideoDetailFragment
     @Override
     public void handleError() {
         super.handleError();
-        setErrorImage();
+        setErrorImage(R.drawable.not_available_monkey);
 
         if (binding.relatedItemsLayout != null) { // hide related streams for tablets
             binding.relatedItemsLayout.setVisibility(View.INVISIBLE);
@@ -1453,11 +1481,7 @@ public final class VideoDetailFragment
             }
         }
 
-        CoilUtils.dispose(binding.detailThumbnailImageView);
-        CoilUtils.dispose(binding.detailSubChannelThumbnailView);
-        CoilUtils.dispose(binding.overlayThumbnail);
-        CoilUtils.dispose(binding.detailUploaderThumbnailView);
-
+        PicassoHelper.cancelTag(PICASSO_VIDEO_DETAILS_TAG);
         binding.detailThumbnailImageView.setImageBitmap(null);
         binding.detailSubChannelThumbnailView.setImageBitmap(null);
     }
@@ -1548,8 +1572,8 @@ public final class VideoDetailFragment
         binding.detailSecondaryControlPanel.setVisibility(View.GONE);
 
         checkUpdateProgressInfo(info);
-        CoilHelper.INSTANCE.loadDetailsThumbnail(binding.detailThumbnailImageView,
-                info.getThumbnails());
+        PicassoHelper.loadDetailsThumbnail(info.getThumbnails()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailThumbnailImageView);
         showMetaInfoInTextView(info.getMetaInfo(), binding.detailMetaInfoTextView,
                 binding.detailMetaInfoSeparator, disposables);
 
@@ -1599,8 +1623,8 @@ public final class VideoDetailFragment
             binding.detailUploaderTextView.setVisibility(View.GONE);
         }
 
-        CoilHelper.INSTANCE.loadAvatar(binding.detailSubChannelThumbnailView,
-                info.getUploaderAvatars());
+        PicassoHelper.loadAvatar(info.getUploaderAvatars()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailSubChannelThumbnailView);
         binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
         binding.detailUploaderThumbnailView.setVisibility(View.GONE);
     }
@@ -1631,11 +1655,11 @@ public final class VideoDetailFragment
             binding.detailUploaderTextView.setVisibility(View.GONE);
         }
 
-        CoilHelper.INSTANCE.loadAvatar(binding.detailSubChannelThumbnailView,
-                info.getSubChannelAvatars());
+        PicassoHelper.loadAvatar(info.getSubChannelAvatars()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailSubChannelThumbnailView);
         binding.detailSubChannelThumbnailView.setVisibility(View.VISIBLE);
-        CoilHelper.INSTANCE.loadAvatar(binding.detailUploaderThumbnailView,
-                info.getUploaderAvatars());
+        PicassoHelper.loadAvatar(info.getUploaderAvatars()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailUploaderThumbnailView);
         binding.detailUploaderThumbnailView.setVisibility(View.VISIBLE);
     }
 
@@ -1765,14 +1789,16 @@ public final class VideoDetailFragment
                                  final PlaybackParameters parameters) {
         setOverlayPlayPauseImage(player != null && player.isPlaying());
 
-        if (state == Player.STATE_PLAYING) {
-            if (binding.positionView.getAlpha() != 1.0f
-                    && player.getPlayQueue() != null
-                    && player.getPlayQueue().getItem() != null
-                    && player.getPlayQueue().getItem().getUrl().equals(url)) {
-                animate(binding.positionView, true, 100);
-                animate(binding.detailPositionView, true, 100);
-            }
+        switch (state) {
+            case Player.STATE_PLAYING:
+                if (binding.positionView.getAlpha() != 1.0f
+                        && player.getPlayQueue() != null
+                        && player.getPlayQueue().getItem() != null
+                        && player.getPlayQueue().getItem().getUrl().equals(url)) {
+                    animate(binding.positionView, true, 100);
+                    animate(binding.detailPositionView, true, 100);
+                }
+                break;
         }
     }
 
@@ -1848,7 +1874,7 @@ public final class VideoDetailFragment
     public void onFullscreenStateChanged(final boolean fullscreen) {
         setupBrightness();
         if (!isPlayerAndPlayerServiceAvailable()
-                || player.UIs().getOpt(MainPlayerUi.class).isEmpty()
+                || player.UIs().get(MainPlayerUi.class).isEmpty()
                 || getRoot().map(View::getParent).isEmpty()) {
             return;
         }
@@ -1877,7 +1903,7 @@ public final class VideoDetailFragment
         final boolean isLandscape = DeviceUtils.isLandscape(requireContext());
         if (DeviceUtils.isTablet(activity)
                 && (!globalScreenOrientationLocked(activity) || isLandscape)) {
-            player.UIs().getOpt(MainPlayerUi.class).ifPresent(MainPlayerUi::toggleFullscreen);
+            player.UIs().get(MainPlayerUi.class).ifPresent(MainPlayerUi::toggleFullscreen);
             return;
         }
 
@@ -1977,7 +2003,7 @@ public final class VideoDetailFragment
     }
 
     private boolean isFullscreen() {
-        return isPlayerAvailable() && player.UIs().getOpt(VideoPlayerUi.class)
+        return isPlayerAvailable() && player.UIs().get(VideoPlayerUi.class)
                 .map(VideoPlayerUi::isFullscreen).orElse(false);
     }
 
@@ -2054,7 +2080,7 @@ public final class VideoDetailFragment
             setAutoPlay(true);
         }
 
-        player.UIs().getOpt(MainPlayerUi.class).ifPresent(MainPlayerUi::checkLandscape);
+        player.UIs().get(MainPlayerUi.class).ifPresent(MainPlayerUi::checkLandscape);
         // Let's give a user time to look at video information page if video is not playing
         if (globalScreenOrientationLocked(activity) && !player.isPlaying()) {
             player.play();
@@ -2319,7 +2345,7 @@ public final class VideoDetailFragment
                                 && player.isPlaying()
                                 && !isFullscreen()
                                 && !DeviceUtils.isTablet(activity)) {
-                            player.UIs().getOpt(MainPlayerUi.class)
+                            player.UIs().get(MainPlayerUi.class)
                                     .ifPresent(MainPlayerUi::toggleFullscreen);
                         }
                         setOverlayLook(binding.appBarLayout, behavior, 1);
@@ -2333,7 +2359,7 @@ public final class VideoDetailFragment
                         // Re-enable clicks
                         setOverlayElementsClickable(true);
                         if (isPlayerAvailable()) {
-                            player.UIs().getOpt(MainPlayerUi.class)
+                            player.UIs().get(MainPlayerUi.class)
                                     .ifPresent(MainPlayerUi::closeItemsList);
                         }
                         setOverlayLook(binding.appBarLayout, behavior, 0);
@@ -2344,7 +2370,7 @@ public final class VideoDetailFragment
                             showSystemUi();
                         }
                         if (isPlayerAvailable()) {
-                            player.UIs().getOpt(MainPlayerUi.class).ifPresent(ui -> {
+                            player.UIs().get(MainPlayerUi.class).ifPresent(ui -> {
                                 if (ui.isControlsVisible()) {
                                     ui.hideControls(0, 0);
                                 }
@@ -2390,7 +2416,8 @@ public final class VideoDetailFragment
         binding.overlayTitleTextView.setText(isEmpty(overlayTitle) ? "" : overlayTitle);
         binding.overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
         binding.overlayThumbnail.setImageDrawable(null);
-        CoilHelper.INSTANCE.loadDetailsThumbnail(binding.overlayThumbnail, thumbnails);
+        PicassoHelper.loadDetailsThumbnail(thumbnails).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.overlayThumbnail);
     }
 
     private void setOverlayPlayPauseImage(final boolean playerIsPlaying) {
@@ -2431,8 +2458,8 @@ public final class VideoDetailFragment
         return player != null;
     }
 
-    boolean noPlayerServiceAvailable() {
-        return playerService == null;
+    boolean isPlayerServiceAvailable() {
+        return playerService != null;
     }
 
     boolean isPlayerAndPlayerServiceAvailable() {
@@ -2441,7 +2468,7 @@ public final class VideoDetailFragment
 
     public Optional<View> getRoot() {
         return Optional.ofNullable(player)
-                .flatMap(player1 -> player1.UIs().getOpt(VideoPlayerUi.class))
+                .flatMap(player1 -> player1.UIs().get(VideoPlayerUi.class))
                 .map(playerUi -> playerUi.getBinding().getRoot());
     }
 

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

@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.evernote.android.state.State;
 
@@ -42,6 +43,7 @@ public abstract class BaseListInfoFragment<I extends InfoItem, L extends ListInf
 
     private final UserAction errorUserAction;
     protected L currentInfo;
+    @Nullable
     protected Page currentNextPage;
     protected Disposable currentWorker;
 

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

@@ -81,9 +81,7 @@ public class ChannelAboutFragment extends BaseDescriptionFragment {
 
         if (channelInfo.getSubscriberCount() != UNKNOWN_SUBSCRIBER_COUNT) {
             addMetadataItem(inflater, layout, false, R.string.metadata_subscribers,
-                    Localization.localizeNumber(
-                            requireContext(),
-                            channelInfo.getSubscriberCount()));
+                    Localization.localizeNumber(channelInfo.getSubscriberCount()));
         }
 
         addImagesMetadataItem(inflater, layout, R.string.metadata_avatars,

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

@@ -10,6 +10,7 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -44,8 +45,6 @@ import org.schabi.newpipe.fragments.detail.TabAdapter;
 import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.feed.notifications.NotificationHelper;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
-import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.ChannelTabHelper;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -54,14 +53,13 @@ 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.CoilHelper;
 import org.schabi.newpipe.util.image.ImageStrategy;
+import org.schabi.newpipe.util.image.PicassoHelper;
 
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
-import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -75,6 +73,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
         implements StateSaver.WriteRead {
 
     private static final int BUTTON_DEBOUNCE_INTERVAL = 100;
+    private static final String PICASSO_CHANNEL_TAG = "PICASSO_CHANNEL_TAG";
 
     @State
     protected int serviceId = Constants.NO_SERVICE_ID;
@@ -200,11 +199,6 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        EmptyStateUtil.setEmptyStateComposable(
-                binding.emptyStateView,
-                EmptyStateSpec.Companion.getContentNotSupported()
-        );
-
         tabAdapter = new TabAdapter(getChildFragmentManager());
         binding.viewPager.setAdapter(tabAdapter);
         binding.tabLayout.setupWithViewPager(binding.viewPager);
@@ -589,9 +583,7 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
     @Override
     public void showLoading() {
         super.showLoading();
-        CoilUtils.dispose(binding.channelAvatarView);
-        CoilUtils.dispose(binding.channelBannerImage);
-        CoilUtils.dispose(binding.subChannelAvatarView);
+        PicassoHelper.cancelTag(PICASSO_CHANNEL_TAG);
         animate(binding.channelSubscribeButton, false, 100);
     }
 
@@ -602,15 +594,17 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
         setInitialData(result.getServiceId(), result.getOriginalUrl(), result.getName());
 
         if (ImageStrategy.shouldLoadImages() && !result.getBanners().isEmpty()) {
-            CoilHelper.INSTANCE.loadBanner(binding.channelBannerImage, result.getBanners());
+            PicassoHelper.loadBanner(result.getBanners()).tag(PICASSO_CHANNEL_TAG)
+                    .into(binding.channelBannerImage);
         } else {
             // do not waste space for the banner, if the user disabled images or there is not one
             binding.channelBannerImage.setImageDrawable(null);
         }
 
-        CoilHelper.INSTANCE.loadAvatar(binding.channelAvatarView, result.getAvatars());
-        CoilHelper.INSTANCE.loadAvatar(binding.subChannelAvatarView,
-                result.getParentChannelAvatars());
+        PicassoHelper.loadAvatar(result.getAvatars()).tag(PICASSO_CHANNEL_TAG)
+                .into(binding.channelAvatarView);
+        PicassoHelper.loadAvatar(result.getParentChannelAvatars()).tag(PICASSO_CHANNEL_TAG)
+                .into(binding.subChannelAvatarView);
 
         binding.channelTitleView.setText(result.getName());
         binding.channelSubscriberView.setVisibility(View.VISIBLE);
@@ -658,6 +652,8 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
             return;
         }
 
-        binding.emptyStateView.setVisibility(View.VISIBLE);
+        binding.errorContentNotSupported.setVisibility(View.VISIBLE);
+        binding.channelKaomoji.setText("(︶︹︺)");
+        binding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
     }
 }

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

@@ -26,7 +26,6 @@ import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.fragments.list.playlist.PlaylistControlViewHolder;
 import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.ChannelTabHelper;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.PlayButtonHelper;
@@ -80,12 +79,6 @@ public class ChannelTabFragment extends BaseListInfoFragment<InfoItem, ChannelTa
         return inflater.inflate(R.layout.fragment_channel_tab, container, false);
     }
 
-    @Override
-    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
-        super.onViewCreated(rootView, savedInstanceState);
-        EmptyStateUtil.setEmptyStateComposable(rootView.findViewById(R.id.empty_state_view));
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();

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

@@ -0,0 +1,172 @@
+package org.schabi.newpipe.fragments.list.comments;
+
+import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+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;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
+import org.schabi.newpipe.info_list.ItemViewMode;
+import org.schabi.newpipe.util.DeviceUtils;
+import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.image.ImageStrategy;
+import org.schabi.newpipe.util.image.PicassoHelper;
+import org.schabi.newpipe.util.text.TextLinkifier;
+import org.schabi.newpipe.util.text.LongPressLinkMovementMethod;
+
+import java.util.Queue;
+import java.util.function.Supplier;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+
+public final class CommentRepliesFragment
+        extends BaseListInfoFragment<CommentsInfoItem, CommentRepliesInfo> {
+
+    public static final String TAG = CommentRepliesFragment.class.getSimpleName();
+
+    @State
+    CommentsInfoItem commentsInfoItem; // the comment to show replies of
+    private final CompositeDisposable disposables = new CompositeDisposable();
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Constructors and lifecycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    // only called by the Android framework, after which readFrom is called and restores all data
+    public CommentRepliesFragment() {
+        super(UserAction.REQUESTED_COMMENT_REPLIES);
+    }
+
+    public CommentRepliesFragment(@NonNull final CommentsInfoItem commentsInfoItem) {
+        this();
+        this.commentsInfoItem = commentsInfoItem;
+        // setting "" as title since the title will be properly set right after
+        setInitialData(commentsInfoItem.getServiceId(), commentsInfoItem.getUrl(), "");
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater,
+                             @Nullable final ViewGroup container,
+                             @Nullable final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_comments, container, false);
+    }
+
+    @Override
+    public void onDestroyView() {
+        disposables.clear();
+        super.onDestroyView();
+    }
+
+    @Override
+    protected Supplier<View> getListHeaderSupplier() {
+        return () -> {
+            final CommentRepliesHeaderBinding binding = CommentRepliesHeaderBinding
+                    .inflate(activity.getLayoutInflater(), itemsList, false);
+            final CommentsInfoItem item = commentsInfoItem;
+
+            // load the author avatar
+            PicassoHelper.loadAvatar(item.getUploaderAvatars()).into(binding.authorAvatar);
+            binding.authorAvatar.setVisibility(ImageStrategy.shouldLoadImages()
+                    ? View.VISIBLE : View.GONE);
+
+            // setup author name and comment date
+            binding.authorName.setText(item.getUploaderName());
+            binding.uploadDate.setText(Localization.relativeTimeOrTextual(
+                    getContext(), item.getUploadDate(), item.getTextualUploadDate()));
+            binding.authorTouchArea.setOnClickListener(
+                    v -> NavigationHelper.openCommentAuthorIfPresent(requireActivity(), item));
+
+            // setup like count, hearted and pinned
+            binding.thumbsUpCount.setText(
+                    Localization.likeCount(requireContext(), item.getLikeCount()));
+            // for heartImage goneMarginEnd was used, but there is no way to tell ConstraintLayout
+            // not to use a different margin only when both the next two views are gone
+            ((ConstraintLayout.LayoutParams) binding.thumbsUpCount.getLayoutParams())
+                    .setMarginEnd(DeviceUtils.dpToPx(
+                            (item.isHeartedByUploader() || item.isPinned() ? 8 : 16),
+                            requireContext()));
+            binding.heartImage.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
+            binding.pinnedImage.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
+
+            // setup comment content
+            TextLinkifier.fromDescription(binding.commentContent, item.getCommentText(),
+                    HtmlCompat.FROM_HTML_MODE_LEGACY, getServiceById(item.getServiceId()),
+                    item.getUrl(), disposables, null);
+            binding.commentContent.setMovementMethod(LongPressLinkMovementMethod.getInstance());
+            return binding.getRoot();
+        };
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // State saving
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void writeTo(final Queue<Object> objectsToSave) {
+        super.writeTo(objectsToSave);
+        objectsToSave.add(commentsInfoItem);
+    }
+
+    @Override
+    public void readFrom(@NonNull final Queue<Object> savedObjects) throws Exception {
+        super.readFrom(savedObjects);
+        commentsInfoItem = (CommentsInfoItem) savedObjects.poll();
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Data loading
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<CommentRepliesInfo> loadResult(final boolean forceLoad) {
+        return Single.fromCallable(() -> new CommentRepliesInfo(commentsInfoItem,
+                // the reply count string will be shown as the activity title
+                Localization.replyCount(requireContext(), commentsInfoItem.getReplyCount())));
+    }
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage<CommentsInfoItem>> loadMoreItemsLogic() {
+        // commentsInfoItem.getUrl() should contain the url of the original
+        // ListInfo<CommentsInfoItem>, which should be the stream url
+        return ExtractorHelper.getMoreCommentItems(
+                serviceId, commentsInfoItem.getUrl(), currentNextPage);
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected ItemViewMode getItemViewMode() {
+        return ItemViewMode.LIST;
+    }
+
+    /**
+     * @return the comment to which the replies are shown
+     */
+    public CommentsInfoItem getCommentsInfoItem() {
+        return commentsInfoItem;
+    }
+}

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

@@ -0,0 +1,22 @@
+package org.schabi.newpipe.fragments.list.comments;
+
+import org.schabi.newpipe.extractor.ListInfo;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+
+import java.util.Collections;
+
+public final class CommentRepliesInfo extends ListInfo<CommentsInfoItem> {
+    /**
+     * This class is used to wrap the comment replies page into a ListInfo object.
+     *
+     * @param comment the comment from which to get replies
+     * @param name will be shown as the fragment title
+     */
+    public CommentRepliesInfo(final CommentsInfoItem comment, final String name) {
+        super(comment.getServiceId(),
+                new ListLinkHandler("", "", "", Collections.emptyList(), null), name);
+        setNextPage(comment.getReplies());
+        setRelatedItems(Collections.emptyList()); // since it must be non-null
+    }
+}

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

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

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

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

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

@@ -53,7 +53,7 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PlayButtonHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.image.CoilHelper;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.text.TextEllipsizer;
 
 import java.util.ArrayList;
@@ -62,7 +62,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;
@@ -72,6 +71,8 @@ import io.reactivex.rxjava3.disposables.Disposable;
 public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, PlaylistInfo>
         implements PlaylistControlViewHolder {
 
+    private static final String PICASSO_PLAYLIST_TAG = "PICASSO_PLAYLIST_TAG";
+
     private CompositeDisposable disposables;
     private Subscription bookmarkReactor;
     private AtomicBoolean isBookmarkButtonReady;
@@ -275,7 +276,7 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
         animate(headerBinding.getRoot(), false, 200);
         animateHideRecyclerViewAllowingScrolling(itemsList);
 
-        CoilUtils.dispose(headerBinding.uploaderAvatarView);
+        PicassoHelper.cancelTag(PICASSO_PLAYLIST_TAG);
         animate(headerBinding.uploaderLayout, false, 200);
     }
 
@@ -326,8 +327,8 @@ public class PlaylistFragment extends BaseListInfoFragment<StreamInfoItem, Playl
                     R.drawable.ic_radio)
             );
         } else {
-            CoilHelper.INSTANCE.loadAvatar(headerBinding.uploaderAvatarView,
-                    result.getUploaderAvatars());
+            PicassoHelper.loadAvatar(result.getUploaderAvatars()).tag(PICASSO_PLAYLIST_TAG)
+                    .into(headerBinding.uploaderAvatarView);
         }
 
         streamCount = result.getStreamCount();

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

@@ -64,8 +64,6 @@ import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.settings.NewPipeSettings;
-import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -146,6 +144,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
     private final SparseArrayCompat<String> menuItemToFilterName = new SparseArrayCompat<>();
     private StreamingService service;
+    @Nullable
     private Page nextPage;
     private boolean showLocalSuggestions = true;
     private boolean showRemoteSuggestions = true;
@@ -221,6 +220,15 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         searchBinding = FragmentSearchBinding.bind(rootView);
         super.onViewCreated(rootView, savedInstanceState);
+
+        updateService();
+        // Add the service name to search string hint
+        // to make it more obvious which platform is being searched.
+        if (service != null) {
+            searchEditText.setHint(
+                    getString(R.string.search_with_service_name,
+                            service.getServiceInfo().getName()));
+        }
         showSearchOnStart();
         initSearchListeners();
     }
@@ -346,10 +354,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        EmptyStateUtil.setEmptyStateComposable(
-                searchBinding.emptyStateView,
-                EmptyStateSpec.Companion.getNoSearchResult());
-
         searchBinding.suggestionsList.setAdapter(suggestionListAdapter);
         // animations are just strange and useless, since the suggestions keep changing too much
         searchBinding.suggestionsList.setItemAnimator(null);
@@ -942,6 +946,20 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
         filterItemCheckedId = item.getItemId();
         item.setChecked(true);
 
+        if (service != null) {
+            final boolean isNotFiltered = theContentFilter.isEmpty()
+                    || "all".equals(theContentFilter.get(0));
+            if (isNotFiltered) {
+                searchEditText.setHint(
+                        getString(R.string.search_with_service_name,
+                                service.getServiceInfo().getName()));
+            } else {
+                searchEditText.setHint(getString(R.string.search_with_service_name_and_filter,
+                        service.getServiceInfo().getName(),
+                        item.getTitle()));
+            }
+        }
+
         contentFilter = theContentFilter.toArray(new String[0]);
 
         if (!TextUtils.isEmpty(searchString)) {
@@ -1071,15 +1089,25 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     public void handleNextItems(final ListExtractor.InfoItemsPage<?> result) {
         showListFooter(false);
         infoListAdapter.addInfoItemList(result.getItems());
-        nextPage = result.getNextPage();
 
         if (!result.getErrors().isEmpty()) {
-            showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
-                    "\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
-                            + "pageIds: " + nextPage.getIds() + ", "
-                            + "pageCookies: " + nextPage.getCookies(),
-                    serviceId));
+            // nextPage should be non-null at this point, because it refers to the page
+            // whose results are handled here, but let's check it anyway
+            if (nextPage == null) {
+                showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
+                        "\"" + searchString + "\" → nextPage == null", serviceId));
+            } else {
+                showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
+                        "\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
+                                + "pageIds: " + nextPage.getIds() + ", "
+                                + "pageCookies: " + nextPage.getCookies(),
+                        serviceId));
+            }
         }
+
+        // keep the reassignment of nextPage after the error handling to ensure that nextPage
+        // still holds the correct value during the error handling
+        nextPage = result.getNextPage();
         super.handleNextItems(result);
     }
 

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

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

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

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

@@ -0,0 +1,22 @@
+package org.schabi.newpipe.fragments.list.videos;
+
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.ListInfo;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public final class RelatedItemsInfo extends ListInfo<InfoItem> {
+    /**
+     * This class is used to wrap the related items of a StreamInfo into a ListInfo object.
+     *
+     * @param info the stream info from which to get related items
+     */
+    public RelatedItemsInfo(final StreamInfo info) {
+        super(info.getServiceId(), new ListLinkHandler(info.getOriginalUrl(), info.getUrl(),
+                info.getId(), Collections.emptyList(), null), info.getName());
+        setRelatedItems(new ArrayList<>(info.getRelatedItems()));
+    }
+}

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

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

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

@@ -21,6 +21,7 @@ import org.schabi.newpipe.info_list.holder.ChannelCardInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistCardInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
@@ -282,32 +283,46 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             Log.d(TAG, "onCreateViewHolder() called with: "
                     + "parent = [" + parent + "], type = [" + type + "]");
         }
-        return switch (type) {
+        switch (type) {
             // #4475 and #3368
             // Always create a new instance otherwise the same instance
             // is sometimes reused which causes a crash
-            case HEADER_TYPE -> new HFHolder(headerSupplier.get());
-            case FOOTER_TYPE -> new HFHolder(PignateFooterBinding
-                    .inflate(layoutInflater, parent, false)
-                    .getRoot()
-            );
-            case MINI_STREAM_HOLDER_TYPE -> new StreamMiniInfoItemHolder(infoItemBuilder, parent);
-            case STREAM_HOLDER_TYPE -> new StreamInfoItemHolder(infoItemBuilder, parent);
-            case GRID_STREAM_HOLDER_TYPE -> new StreamGridInfoItemHolder(infoItemBuilder, parent);
-            case CARD_STREAM_HOLDER_TYPE -> new StreamCardInfoItemHolder(infoItemBuilder, parent);
-            case MINI_CHANNEL_HOLDER_TYPE -> new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
-            case CHANNEL_HOLDER_TYPE -> new ChannelInfoItemHolder(infoItemBuilder, parent);
-            case CARD_CHANNEL_HOLDER_TYPE -> new ChannelCardInfoItemHolder(infoItemBuilder, parent);
-            case GRID_CHANNEL_HOLDER_TYPE -> new ChannelGridInfoItemHolder(infoItemBuilder, parent);
-            case MINI_PLAYLIST_HOLDER_TYPE ->
-                    new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
-            case PLAYLIST_HOLDER_TYPE -> new PlaylistInfoItemHolder(infoItemBuilder, parent);
-            case GRID_PLAYLIST_HOLDER_TYPE ->
-                    new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
-            case CARD_PLAYLIST_HOLDER_TYPE ->
-                    new PlaylistCardInfoItemHolder(infoItemBuilder, parent);
-            default -> new FallbackViewHolder(new View(parent.getContext()));
-        };
+            case HEADER_TYPE:
+                return new HFHolder(headerSupplier.get());
+            case FOOTER_TYPE:
+                return new HFHolder(PignateFooterBinding
+                        .inflate(layoutInflater, parent, false)
+                        .getRoot()
+                );
+            case MINI_STREAM_HOLDER_TYPE:
+                return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
+            case STREAM_HOLDER_TYPE:
+                return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
+            case CARD_STREAM_HOLDER_TYPE:
+                return new StreamCardInfoItemHolder(infoItemBuilder, parent);
+            case MINI_CHANNEL_HOLDER_TYPE:
+                return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
+            case CHANNEL_HOLDER_TYPE:
+                return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case CARD_CHANNEL_HOLDER_TYPE:
+                return new ChannelCardInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
+            case MINI_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
+            case PLAYLIST_HOLDER_TYPE:
+                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
+            case CARD_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistCardInfoItemHolder(infoItemBuilder, parent);
+            case COMMENT_HOLDER_TYPE:
+                return new CommentInfoItemHolder(infoItemBuilder, parent);
+            default:
+                return new FallbackViewHolder(new View(parent.getContext()));
+        }
     }
 
     @Override

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

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

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

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

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

@@ -41,11 +41,10 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
  * </p>
  */
 public enum StreamDialogDefaultEntry {
-    SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) -> {
-        final var activity = fragment.requireActivity();
-        fetchUploaderUrlIfSparse(activity, item.getServiceId(), item.getUrl(),
-                item.getUploaderUrl(), url -> openChannelFragment(activity, item, url));
-    }),
+    SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) ->
+            fetchUploaderUrlIfSparse(fragment.requireContext(), item.getServiceId(), item.getUrl(),
+                    item.getUploaderUrl(), url -> openChannelFragment(fragment, item, url))
+    ),
 
     /**
      * Enqueues the stream automatically to the current PlayerType.

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

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

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

@@ -0,0 +1,212 @@
+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;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.DeviceUtils;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.util.image.ImageStrategy;
+import org.schabi.newpipe.util.image.PicassoHelper;
+import org.schabi.newpipe.util.text.TextEllipsizer;
+
+public class CommentInfoItemHolder extends InfoItemHolder {
+
+    private static final int COMMENT_DEFAULT_LINES = 2;
+    private final int commentHorizontalPadding;
+    private final int commentVerticalPadding;
+
+    private final RelativeLayout itemRoot;
+    private final ImageView itemThumbnailView;
+    private final TextView itemContentView;
+    private final ImageView itemThumbsUpView;
+    private final TextView itemLikesCountView;
+    private final TextView itemTitleView;
+    private final ImageView itemHeartView;
+    private final ImageView itemPinnedView;
+    private final Button repliesButton;
+
+    @NonNull
+    private final TextEllipsizer textEllipsizer;
+
+    public CommentInfoItemHolder(final InfoItemBuilder infoItemBuilder,
+                                 final ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_comment_item, parent);
+
+        itemRoot = itemView.findViewById(R.id.itemRoot);
+        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+        itemContentView = itemView.findViewById(R.id.itemCommentContentView);
+        itemThumbsUpView = itemView.findViewById(R.id.detail_thumbs_up_img_view);
+        itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
+        itemTitleView = itemView.findViewById(R.id.itemTitleView);
+        itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
+        itemPinnedView = itemView.findViewById(R.id.detail_pinned_view);
+        repliesButton = itemView.findViewById(R.id.replies_button);
+
+        commentHorizontalPadding = (int) infoItemBuilder.getContext()
+                .getResources().getDimension(R.dimen.comments_horizontal_padding);
+        commentVerticalPadding = (int) infoItemBuilder.getContext()
+                .getResources().getDimension(R.dimen.comments_vertical_padding);
+
+        textEllipsizer = new TextEllipsizer(itemContentView, COMMENT_DEFAULT_LINES, null);
+        textEllipsizer.setStateChangeListener(isEllipsized -> {
+            if (Boolean.TRUE.equals(isEllipsized)) {
+                denyLinkFocus();
+            } else {
+                determineMovementMethod();
+            }
+        });
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem,
+                               final HistoryRecordManager historyRecordManager) {
+        if (!(infoItem instanceof CommentsInfoItem)) {
+            return;
+        }
+        final CommentsInfoItem item = (CommentsInfoItem) infoItem;
+
+
+        // load the author avatar
+        PicassoHelper.loadAvatar(item.getUploaderAvatars()).into(itemThumbnailView);
+        if (ImageStrategy.shouldLoadImages()) {
+            itemThumbnailView.setVisibility(View.VISIBLE);
+            itemRoot.setPadding(commentVerticalPadding, commentVerticalPadding,
+                    commentVerticalPadding, commentVerticalPadding);
+        } else {
+            itemThumbnailView.setVisibility(View.GONE);
+            itemRoot.setPadding(commentHorizontalPadding, commentVerticalPadding,
+                    commentHorizontalPadding, commentVerticalPadding);
+        }
+        itemThumbnailView.setOnClickListener(view -> openCommentAuthor(item));
+
+        // setup the top row, with pinned icon, author name and comment date
+        itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
+        final String uploaderName = Localization.localizeUserName(item.getUploaderName());
+        itemTitleView.setText(Localization.concatenateStrings(
+                uploaderName,
+                Localization.relativeTimeOrTextual(
+                        itemBuilder.getContext(),
+                        item.getUploadDate(),
+                        item.getTextualUploadDate())));
+
+        // setup bottom row, with likes, heart and replies button
+        itemLikesCountView.setText(
+                Localization.likeCount(itemBuilder.getContext(), item.getLikeCount()));
+
+        itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
+
+        final boolean hasReplies = item.getReplies() != null;
+        repliesButton.setOnClickListener(hasReplies ? v -> openCommentReplies(item) : null);
+        repliesButton.setVisibility(hasReplies ? View.VISIBLE : View.GONE);
+        repliesButton.setText(hasReplies
+                ? Localization.replyCount(itemBuilder.getContext(), item.getReplyCount()) : "");
+        ((RelativeLayout.LayoutParams) itemThumbsUpView.getLayoutParams()).topMargin =
+                hasReplies ? 0 : DeviceUtils.dpToPx(6, itemBuilder.getContext());
+
+
+        // setup comment content and click listeners to expand/ellipsize it
+        textEllipsizer.setStreamingService(getServiceById(item.getServiceId()));
+        textEllipsizer.setStreamUrl(item.getUrl());
+        textEllipsizer.setContent(item.getCommentText());
+        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;
+        });
+
+        itemView.setOnClickListener(view -> {
+            textEllipsizer.toggle();
+            if (itemBuilder.getOnCommentsSelectedListener() != null) {
+                itemBuilder.getOnCommentsSelectedListener().selected(item);
+            }
+        });
+
+        itemView.setOnLongClickListener(view -> {
+            if (DeviceUtils.isTv(itemBuilder.getContext())) {
+                openCommentAuthor(item);
+            } else {
+                final CharSequence text = itemContentView.getText();
+                if (text != null) {
+                    ShareUtils.copyToClipboard(itemBuilder.getContext(), text.toString());
+                }
+            }
+            return true;
+        });
+    }
+
+    private void openCommentAuthor(@NonNull final CommentsInfoItem item) {
+        NavigationHelper.openCommentAuthorIfPresent((FragmentActivity) itemBuilder.getContext(),
+                item);
+    }
+
+    private void openCommentReplies(@NonNull final CommentsInfoItem item) {
+        NavigationHelper.openCommentRepliesFragment((FragmentActivity) itemBuilder.getContext(),
+                item);
+    }
+
+    private void allowLinkFocus() {
+        itemContentView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    private void denyLinkFocus() {
+        itemContentView.setMovementMethod(null);
+    }
+
+    private boolean shouldFocusLinks() {
+        if (itemView.isInTouchMode()) {
+            return false;
+        }
+
+        final URLSpan[] urls = itemContentView.getUrls();
+
+        return urls != null && urls.length != 0;
+    }
+
+    private void determineMovementMethod() {
+        if (shouldFocusLinks()) {
+            allowLinkFocus();
+        } else {
+            denyLinkFocus();
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -38,8 +38,6 @@ 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.ui.emptystate.EmptyStateSpec;
-import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.debounce.DebounceSavable;
@@ -125,10 +123,6 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
         super.initViews(rootView, savedInstanceState);
 
         itemListAdapter.setUseItemHandle(true);
-        EmptyStateUtil.setEmptyStateComposable(
-                rootView.findViewById(R.id.empty_state_view),
-                EmptyStateSpec.Companion.getNoBookmarkedPlaylist()
-        );
     }
 
     @Override

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

@@ -74,7 +74,6 @@ import org.schabi.newpipe.ktx.slideUp
 import org.schabi.newpipe.local.feed.item.StreamItem
 import org.schabi.newpipe.local.feed.service.FeedLoadService
 import org.schabi.newpipe.local.subscription.SubscriptionManager
-import org.schabi.newpipe.ui.emptystate.setEmptyStateComposable
 import org.schabi.newpipe.util.DeviceUtils
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
@@ -133,7 +132,6 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     override fun onViewCreated(rootView: View, savedInstanceState: Bundle?) {
         // super.onViewCreated() calls initListeners() which require the binding to be initialized
         _feedBinding = FragmentFeedBinding.bind(rootView)
-        feedBinding.emptyStateView.setEmptyStateComposable()
         super.onViewCreated(rootView, savedInstanceState)
 
         val factory = FeedViewModel.getFactory(requireContext(), groupId)
@@ -204,7 +202,6 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     // Menu
     // /////////////////////////////////////////////////////////////////////////
 
-    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 
@@ -215,7 +212,6 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         inflater.inflate(R.menu.menu_feed_fragment, menu)
     }
 
-    @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.menu_item_feed_help) {
             val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
@@ -257,7 +253,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
             viewModel.getShowFutureItemsFromPreferences()
         )
 
-        AlertDialog.Builder(requireContext())
+        AlertDialog.Builder(context!!)
             .setTitle(R.string.feed_hide_streams_title)
             .setMultiChoiceItems(dialogItems, checkedDialogItems) { _, which, isChecked ->
                 checkedDialogItems[which] = isChecked
@@ -271,10 +267,14 @@ class FeedFragment : BaseStateFragment<FeedState>() {
             .show()
     }
 
-    @Deprecated("Deprecated in Java")
     override fun onDestroyOptionsMenu() {
         super.onDestroyOptionsMenu()
-        activity?.supportActionBar?.subtitle = null
+        if (
+            (groupName != "") &&
+            (activity?.supportActionBar?.subtitle == groupName)
+        ) {
+            activity?.supportActionBar?.subtitle = null
+        }
     }
 
     override fun onDestroy() {
@@ -286,7 +286,13 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         }
 
         super.onDestroy()
-        activity?.supportActionBar?.subtitle = null
+
+        if (
+            (groupName != "") &&
+            (activity?.supportActionBar?.subtitle == groupName)
+        ) {
+            activity?.supportActionBar?.subtitle = null
+        }
     }
 
     override fun onDestroyView() {

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

@@ -165,7 +165,7 @@ class FeedViewModel(
         fun getFactory(context: Context, groupId: Long) = viewModelFactory {
             initializer {
                 FeedViewModel(
-                    App.instance,
+                    App.getApp(),
                     groupId,
                     // Read initial value from preferences
                     getShowPlayedItemsFromPreferences(context.applicationContext),

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

@@ -19,7 +19,7 @@ import org.schabi.newpipe.extractor.stream.StreamType.POST_LIVE_STREAM
 import org.schabi.newpipe.extractor.stream.StreamType.VIDEO_STREAM
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.StreamTypeUtil
-import org.schabi.newpipe.util.image.CoilHelper
+import org.schabi.newpipe.util.image.PicassoHelper
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
 
@@ -101,7 +101,7 @@ data class StreamItem(
             viewBinding.itemProgressView.visibility = View.GONE
         }
 
-        CoilHelper.loadThumbnail(viewBinding.itemThumbnailView, stream.thumbnailUrl)
+        PicassoHelper.loadThumbnail(stream.thumbnailUrl).into(viewBinding.itemThumbnailView)
 
         if (itemVersion != ItemVersion.MINI) {
             viewBinding.itemAdditionalDetails.text =

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

@@ -6,6 +6,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
@@ -15,17 +16,20 @@ import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import androidx.preference.PreferenceManager
+import com.squareup.picasso.Picasso
+import com.squareup.picasso.Target
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.local.feed.service.FeedUpdateInfo
 import org.schabi.newpipe.util.NavigationHelper
-import org.schabi.newpipe.util.image.CoilHelper
+import org.schabi.newpipe.util.image.PicassoHelper
 
 /**
  * Helper for everything related to show notifications about new streams to the user.
  */
 class NotificationHelper(val context: Context) {
     private val manager = NotificationManagerCompat.from(context)
+    private val iconLoadingTargets = ArrayList<Target>()
 
     /**
      * Show notifications for new streams from a single channel. The individual notifications are
@@ -64,31 +68,61 @@ class NotificationHelper(val context: Context) {
         summaryBuilder.setStyle(style)
 
         // open the channel page when clicking on the summary notification
-        val intent = NavigationHelper
-            .getChannelIntent(context, data.serviceId, data.url)
-            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         summaryBuilder.setContentIntent(
-            PendingIntentCompat.getActivity(context, data.pseudoId, intent, 0, false)
+            PendingIntentCompat.getActivity(
+                context,
+                data.pseudoId,
+                NavigationHelper
+                    .getChannelIntent(context, data.serviceId, data.url)
+                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+                0,
+                false
+            )
         )
 
-        val avatarIcon =
-            CoilHelper.loadBitmapBlocking(context, data.avatarUrl, R.drawable.ic_newpipe_triangle_white)
+        // a Target is like a listener for image loading events
+        val target = object : Target {
+            override fun onBitmapLoaded(bitmap: Bitmap, from: Picasso.LoadedFrom) {
+                // set channel icon only if there is actually one (for Android versions < 7.0)
+                summaryBuilder.setLargeIcon(bitmap)
 
-        summaryBuilder.setLargeIcon(avatarIcon)
+                // Show individual stream notifications, set channel icon only if there is actually
+                // one
+                showStreamNotifications(newStreams, data.serviceId, data.url, bitmap)
+                // Show summary notification
+                manager.notify(data.pseudoId, summaryBuilder.build())
 
-        // Show individual stream notifications, set channel icon only if there is actually one
-        showStreamNotifications(newStreams, data.serviceId, avatarIcon)
-        // Show summary notification
-        manager.notify(data.pseudoId, summaryBuilder.build())
+                iconLoadingTargets.remove(this) // allow it to be garbage-collected
+            }
+
+            override fun onBitmapFailed(e: Exception, errorDrawable: Drawable) {
+                // Show individual stream notifications
+                showStreamNotifications(newStreams, data.serviceId, data.url, null)
+                // Show summary notification
+                manager.notify(data.pseudoId, summaryBuilder.build())
+                iconLoadingTargets.remove(this) // allow it to be garbage-collected
+            }
+
+            override fun onPrepareLoad(placeHolderDrawable: Drawable) {
+                // Nothing to do
+            }
+        }
+
+        // add the target to the list to hold a strong reference and prevent it from being garbage
+        // collected, since Picasso only holds weak references to targets
+        iconLoadingTargets.add(target)
+
+        PicassoHelper.loadNotificationIcon(data.avatarUrl).into(target)
     }
 
     private fun showStreamNotifications(
         newStreams: List<StreamInfoItem>,
         serviceId: Int,
+        channelUrl: String,
         channelIcon: Bitmap?
     ) {
         for (stream in newStreams) {
-            val notification = createStreamNotification(stream, serviceId, channelIcon)
+            val notification = createStreamNotification(stream, serviceId, channelUrl, channelIcon)
             manager.notify(stream.url.hashCode(), notification)
         }
     }
@@ -96,6 +130,7 @@ class NotificationHelper(val context: Context) {
     private fun createStreamNotification(
         item: StreamInfoItem,
         serviceId: Int,
+        channelUrl: String,
         channelIcon: Bitmap?
     ): Notification {
         return NotificationCompat.Builder(
@@ -106,7 +141,7 @@ class NotificationHelper(val context: Context) {
             .setLargeIcon(channelIcon)
             .setContentTitle(item.name)
             .setContentText(item.uploaderName)
-            .setGroup(item.uploaderUrl)
+            .setGroup(channelUrl)
             .setColor(ContextCompat.getColor(context, R.color.ic_launcher_background))
             .setColorized(true)
             .setAutoCancel(true)

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

@@ -18,13 +18,10 @@ package org.schabi.newpipe.local.history;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import static org.schabi.newpipe.util.ExtractorHelper.getStreamInfo;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
-import androidx.collection.LongLongPair;
 import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.NewPipeDatabase;
@@ -48,6 +45,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.local.feed.FeedViewModel;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.util.ExtractorHelper;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
@@ -93,39 +91,47 @@ public class HistoryRecordManager {
      * @param info the item to mark as watched
      * @return a Maybe containing the ID of the item if successful
      */
-    public Completable markAsWatched(final StreamInfoItem info) {
+    public Maybe<Long> markAsWatched(final StreamInfoItem info) {
         if (!isStreamHistoryEnabled()) {
-            return Completable.complete();
+            return Maybe.empty();
         }
 
-        final var remoteInfo = getStreamInfo(info.getServiceId(), info.getUrl(), false)
-            .map(item ->
-                new LongLongPair(item.getDuration(), streamTable.upsert(new StreamEntity(item))));
-
-        return Single.just(info)
-                .filter(item -> item.getDuration() >= 0)
-                .map(item ->
-                    new LongLongPair(item.getDuration(), streamTable.upsert(new StreamEntity(item)))
+        final OffsetDateTime currentTime = OffsetDateTime.now(ZoneOffset.UTC);
+        return Maybe.fromCallable(() -> database.runInTransaction(() -> {
+            final long streamId;
+            final long duration;
+            // Duration will not exist if the item was loaded with fast mode, so fetch it if empty
+            if (info.getDuration() < 0) {
+                final StreamInfo completeInfo = ExtractorHelper.getStreamInfo(
+                        info.getServiceId(),
+                        info.getUrl(),
+                        false
                 )
-                .switchIfEmpty(remoteInfo)
-                .flatMapCompletable(pair -> Completable.fromRunnable(() -> {
-                    final long duration = pair.getFirst();
-                    final long streamId = pair.getSecond();
+                        .subscribeOn(Schedulers.io())
+                        .blockingGet();
+                duration = completeInfo.getDuration();
+                streamId = streamTable.upsert(new StreamEntity(completeInfo));
+            } else {
+                duration = info.getDuration();
+                streamId = streamTable.upsert(new StreamEntity(info));
+            }
 
-                    // Update the stream progress to the full duration of the video
-                    final var entity = new StreamStateEntity(streamId, duration * 1000);
-                    streamStateTable.upsert(entity);
+            // Update the stream progress to the full duration of the video
+            final StreamStateEntity entity = new StreamStateEntity(
+                    streamId,
+                    duration * 1000
+            );
+            streamStateTable.upsert(entity);
 
-                    // Add a history entry
-                    final var latestEntry = streamHistoryTable.getLatestEntry(streamId);
-                    if (latestEntry == null) {
-                        final var currentTime = OffsetDateTime.now(ZoneOffset.UTC);
-                        // never actually viewed: add history entry but with 0 views
-                        final var entry = new StreamHistoryEntity(streamId, currentTime, 0);
-                        streamHistoryTable.insert(entry);
-                    }
-                }))
-                .subscribeOn(Schedulers.io());
+            // Add a history entry
+            final StreamHistoryEntity latestEntry = streamHistoryTable.getLatestEntry(streamId);
+            if (latestEntry == null) {
+                // never actually viewed: add history entry but with 0 views
+                return streamHistoryTable.insert(new StreamHistoryEntity(streamId, currentTime, 0));
+            } else {
+                return 0L;
+            }
+        })).subscribeOn(Schedulers.io());
     }
 
     public Maybe<Long> onViewed(final StreamInfo info) {
@@ -215,7 +221,7 @@ public class HistoryRecordManager {
     public Flowable<List<String>> getRelatedSearches(final String query,
                                                      final int similarQueryLimit,
                                                      final int uniqueQueryLimit) {
-        return !query.isEmpty()
+        return query.length() > 0
                 ? searchHistoryTable.getSimilarEntries(query, similarQueryLimit)
                 : searchHistoryTable.getUniqueEntries(uniqueQueryLimit);
     }
@@ -230,31 +236,47 @@ public class HistoryRecordManager {
 
     public Maybe<StreamStateEntity> loadStreamState(final PlayQueueItem queueItem) {
         return queueItem.getStream()
-                .flatMapMaybe(this::loadStreamState)
+                .map(info -> streamTable.upsert(new StreamEntity(info)))
+                .flatMapPublisher(streamStateTable::getState)
+                .firstElement()
+                .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
                 .filter(state -> state.isValid(queueItem.getDuration()))
                 .subscribeOn(Schedulers.io());
     }
 
     public Maybe<StreamStateEntity> loadStreamState(final StreamInfo info) {
         return Single.fromCallable(() -> streamTable.upsert(new StreamEntity(info)))
-                .flatMapMaybe(streamStateTable::getState)
+                .flatMapPublisher(streamStateTable::getState)
+                .firstElement()
+                .flatMap(list -> list.isEmpty() ? Maybe.empty() : Maybe.just(list.get(0)))
+                .filter(state -> state.isValid(info.getDuration()))
                 .subscribeOn(Schedulers.io());
     }
 
     public Completable saveStreamState(@NonNull final StreamInfo info, final long progressMillis) {
         return Completable.fromAction(() -> database.runInTransaction(() -> {
             final long streamId = streamTable.upsert(new StreamEntity(info));
-            final var state = new StreamStateEntity(streamId, progressMillis);
+            final StreamStateEntity state = new StreamStateEntity(streamId, progressMillis);
             if (state.isValid(info.getDuration())) {
                 streamStateTable.upsert(state);
             }
         })).subscribeOn(Schedulers.io());
     }
 
-    public Maybe<StreamStateEntity> loadStreamState(final InfoItem info) {
-        return streamTable.getStream(info.getServiceId(), info.getUrl())
-                .flatMap(entity -> streamStateTable.getState(entity.getUid()))
-                .subscribeOn(Schedulers.io());
+    public Single<StreamStateEntity[]> loadStreamState(final InfoItem info) {
+        return Single.fromCallable(() -> {
+            final List<StreamEntity> entities = streamTable
+                    .getStream(info.getServiceId(), info.getUrl()).blockingFirst();
+            if (entities.isEmpty()) {
+                return new StreamStateEntity[]{null};
+            }
+            final List<StreamStateEntity> states = streamStateTable
+                    .getState(entities.get(0).getUid()).blockingFirst();
+            if (states.isEmpty()) {
+                return new StreamStateEntity[]{null};
+            }
+            return new StreamStateEntity[]{states.get(0)};
+        }).subscribeOn(Schedulers.io());
     }
 
     public Single<List<StreamStateEntity>> loadLocalStreamStateBatch(
@@ -273,7 +295,13 @@ public class HistoryRecordManager {
                     result.add(null);
                     continue;
                 }
-                result.add(streamStateTable.getState(streamId).blockingGet());
+                final List<StreamStateEntity> states = streamStateTable.getState(streamId)
+                        .blockingFirst();
+                if (states.isEmpty()) {
+                    result.add(null);
+                } else {
+                    result.add(states.get(0));
+                }
             }
             return result;
         }).subscribeOn(Schedulers.io());

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

@@ -8,8 +8,8 @@ import org.schabi.newpipe.database.playlist.PlaylistDuplicatesEntry;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.image.CoilHelper;
 
 import java.time.format.DateTimeFormatter;
 
@@ -30,16 +30,17 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
     public void updateFromItem(final LocalItem localItem,
                                final HistoryRecordManager historyRecordManager,
                                final DateTimeFormatter dateTimeFormatter) {
-        if (!(localItem instanceof PlaylistMetadataEntry item)) {
+        if (!(localItem instanceof PlaylistMetadataEntry)) {
             return;
         }
+        final PlaylistMetadataEntry item = (PlaylistMetadataEntry) localItem;
 
         itemTitleView.setText(item.name);
         itemStreamCountView.setText(Localization.localizeStreamCountMini(
                 itemStreamCountView.getContext(), item.streamCount));
         itemUploaderView.setVisibility(View.INVISIBLE);
 
-        CoilHelper.INSTANCE.loadPlaylistThumbnail(itemThumbnailView, item.thumbnailUrl);
+        PicassoHelper.loadPlaylistThumbnail(item.thumbnailUrl).into(itemThumbnailView);
 
         if (item instanceof PlaylistDuplicatesEntry
                 && ((PlaylistDuplicatesEntry) item).timesStreamIsContained > 0) {

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

@@ -16,8 +16,8 @@ import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.DependentPreferenceHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.image.CoilHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.time.format.DateTimeFormatter;
@@ -83,8 +83,8 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
         }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
-        CoilHelper.INSTANCE.loadThumbnail(itemThumbnailView,
-                item.getStreamEntity().getThumbnailUrl());
+        PicassoHelper.loadThumbnail(item.getStreamEntity().getThumbnailUrl())
+                .into(itemThumbnailView);
 
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnItemSelectedListener() != null) {

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

@@ -16,8 +16,8 @@ import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.DependentPreferenceHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.image.CoilHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;
 
 import java.time.format.DateTimeFormatter;
@@ -117,8 +117,8 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
         }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
-        CoilHelper.INSTANCE.loadThumbnail(itemThumbnailView,
-                item.getStreamEntity().getThumbnailUrl());
+        PicassoHelper.loadThumbnail(item.getStreamEntity().getThumbnailUrl())
+                .into(itemThumbnailView);
 
         itemView.setOnClickListener(view -> {
             if (itemBuilder.getOnItemSelectedListener() != null) {

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

@@ -8,8 +8,8 @@ import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.image.CoilHelper;
 
 import java.time.format.DateTimeFormatter;
 
@@ -29,9 +29,10 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
     public void updateFromItem(final LocalItem localItem,
                                final HistoryRecordManager historyRecordManager,
                                final DateTimeFormatter dateTimeFormatter) {
-        if (!(localItem instanceof PlaylistRemoteEntity item)) {
+        if (!(localItem instanceof PlaylistRemoteEntity)) {
             return;
         }
+        final PlaylistRemoteEntity item = (PlaylistRemoteEntity) localItem;
 
         itemTitleView.setText(item.getName());
         itemStreamCountView.setText(Localization.localizeStreamCountMini(
@@ -44,7 +45,7 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
             itemUploaderView.setText(ServiceHelper.getNameOfServiceById(item.getServiceId()));
         }
 
-        CoilHelper.INSTANCE.loadPlaylistThumbnail(itemThumbnailView, item.getThumbnailUrl());
+        PicassoHelper.loadPlaylistThumbnail(item.getThumbnailUrl()).into(itemThumbnailView);
 
         super.updateFromItem(localItem, historyRecordManager, dateTimeFormatter);
     }

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;
@@ -35,7 +33,6 @@ public class ImportConfirmationDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
-        assureCorrectAppLanguage(getContext());
         return new AlertDialog.Builder(requireContext())
                 .setMessage(R.string.import_network_expensive_warning)
                 .setCancelable(true)

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

@@ -13,6 +13,7 @@ import android.view.MenuItem
 import android.view.SubMenu
 import android.view.View
 import android.view.ViewGroup
+import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
@@ -56,7 +57,6 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE
 import org.schabi.newpipe.streams.io.NoFileManagerSafeGuard
 import org.schabi.newpipe.streams.io.StoredFileHelper
-import org.schabi.newpipe.ui.emptystate.setEmptyStateComposable
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.OnClickGesture
 import org.schabi.newpipe.util.ServiceHelper
@@ -130,7 +130,6 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     // Menu
     // ////////////////////////////////////////////////////////////////////////
 
-    @Deprecated("Deprecated in Java")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 
@@ -258,8 +257,6 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         binding.itemsList.adapter = groupAdapter
         binding.itemsList.itemAnimator = null
 
-        binding.emptyStateView.setEmptyStateComposable()
-
         viewModel = ViewModelProvider(this)[SubscriptionViewModel::class.java]
         viewModel.stateLiveData.observe(viewLifecycleOwner) { it?.let(this::handleResult) }
         viewModel.feedGroupsLiveData.observe(viewLifecycleOwner) {
@@ -464,6 +461,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     }
 
     companion object {
-        const val JSON_MIME_TYPE = "application/json"
+        val JSON_MIME_TYPE = MimeTypeMap.getSingleton()
+            .getMimeTypeFromExtension("json") ?: "application/octet-stream"
     }
 }

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

@@ -94,7 +94,6 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return object : Dialog(requireActivity(), theme) {
-            @Deprecated("Deprecated in Java")
             override fun onBackPressed() {
                 if (!this@FeedGroupDialog.onBackPressed()) {
                     super.onBackPressed()

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

@@ -9,7 +9,7 @@ import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.OnClickGesture
-import org.schabi.newpipe.util.image.CoilHelper
+import org.schabi.newpipe.util.image.PicassoHelper
 
 class ChannelItem(
     private val infoItem: ChannelInfoItem,
@@ -39,7 +39,7 @@ class ChannelItem(
             itemChannelDescriptionView.text = infoItem.description
         }
 
-        CoilHelper.loadAvatar(itemThumbnailView, infoItem.thumbnails)
+        PicassoHelper.loadAvatar(infoItem.thumbnails).into(itemThumbnailView)
 
         gesturesListener?.run {
             viewHolder.root.setOnClickListener { selected(infoItem) }

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

@@ -3,18 +3,14 @@ package org.schabi.newpipe.local.subscription.item
 import android.view.View
 import com.xwray.groupie.viewbinding.BindableItem
 import org.schabi.newpipe.R
-import org.schabi.newpipe.databinding.ListEmptyViewSubscriptionsBinding
-import org.schabi.newpipe.ui.emptystate.EmptyStateSpec
-import org.schabi.newpipe.ui.emptystate.setEmptyStateComposable
+import org.schabi.newpipe.databinding.ListEmptyViewBinding
 
 /**
  * When there are no subscriptions, show a hint to the user about how to import subscriptions
  */
-class ImportSubscriptionsHintPlaceholderItem : BindableItem<ListEmptyViewSubscriptionsBinding>() {
+class ImportSubscriptionsHintPlaceholderItem : BindableItem<ListEmptyViewBinding>() {
     override fun getLayout(): Int = R.layout.list_empty_view_subscriptions
-    override fun bind(viewBinding: ListEmptyViewSubscriptionsBinding, position: Int) {
-        viewBinding.root.setEmptyStateComposable(EmptyStateSpec.NoSubscriptionsHint)
-    }
+    override fun bind(viewBinding: ListEmptyViewBinding, position: Int) {}
     override fun getSpanSize(spanCount: Int, position: Int): Int = spanCount
-    override fun initializeViewBinding(view: View) = ListEmptyViewSubscriptionsBinding.bind(view)
+    override fun initializeViewBinding(view: View) = ListEmptyViewBinding.bind(view)
 }

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

@@ -10,7 +10,7 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity
 import org.schabi.newpipe.databinding.PickerSubscriptionItemBinding
 import org.schabi.newpipe.ktx.AnimationType
 import org.schabi.newpipe.ktx.animate
-import org.schabi.newpipe.util.image.CoilHelper
+import org.schabi.newpipe.util.image.PicassoHelper
 
 data class PickerSubscriptionItem(
     val subscriptionEntity: SubscriptionEntity,
@@ -21,7 +21,7 @@ data class PickerSubscriptionItem(
     override fun getSpanSize(spanCount: Int, position: Int): Int = 1
 
     override fun bind(viewBinding: PickerSubscriptionItemBinding, position: Int) {
-        CoilHelper.loadAvatar(viewBinding.thumbnailView, subscriptionEntity.avatarUrl)
+        PicassoHelper.loadAvatar(subscriptionEntity.avatarUrl).into(viewBinding.thumbnailView)
         viewBinding.titleView.text = subscriptionEntity.name
         viewBinding.selectedHighlight.isVisible = isSelected
     }

app/src/main/java/org/schabi/newpipe/paging/CommentRepliesSource.kt

@@ -1,27 +0,0 @@
-package org.schabi.newpipe.paging
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.schabi.newpipe.extractor.NewPipe
-import org.schabi.newpipe.extractor.Page
-import org.schabi.newpipe.extractor.comments.CommentsInfo
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem
-
-class CommentRepliesSource(
-    private val commentInfo: CommentsInfoItem,
-) : PagingSource<Page, CommentsInfoItem>() {
-    private val service = NewPipe.getService(commentInfo.serviceId)
-
-    override suspend fun load(params: LoadParams<Page>): LoadResult<Page, CommentsInfoItem> {
-        // params.key is null the first time load() is called, and we need to return the first page
-        val repliesPage = params.key ?: commentInfo.replies
-        val info = withContext(Dispatchers.IO) {
-            CommentsInfo.getMoreItems(service, commentInfo.url, repliesPage)
-        }
-        return LoadResult.Page(info.items, null, info.nextPage)
-    }
-
-    override fun getRefreshKey(state: PagingState<Page, CommentsInfoItem>) = null
-}

app/src/main/java/org/schabi/newpipe/paging/CommentsSource.kt

@@ -1,30 +0,0 @@
-package org.schabi.newpipe.paging
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.schabi.newpipe.extractor.NewPipe
-import org.schabi.newpipe.extractor.Page
-import org.schabi.newpipe.extractor.comments.CommentsInfo
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem
-import org.schabi.newpipe.ui.components.video.comment.CommentInfo
-
-class CommentsSource(private val commentInfo: CommentInfo) : PagingSource<Page, CommentsInfoItem>() {
-    private val service = NewPipe.getService(commentInfo.serviceId)
-
-    override suspend fun load(params: LoadParams<Page>): LoadResult<Page, CommentsInfoItem> {
-        // params.key is null the first time the load() function is called, so we need to return the
-        // first batch of already-loaded comments
-        if (params.key == null) {
-            return LoadResult.Page(commentInfo.comments, null, commentInfo.nextPage)
-        } else {
-            val info = withContext(Dispatchers.IO) {
-                CommentsInfo.getMoreItems(service, commentInfo.url, params.key)
-            }
-            return LoadResult.Page(info.items, null, info.nextPage)
-        }
-    }
-
-    override fun getRefreshKey(state: PagingState<Page, CommentsInfoItem>) = null
-}

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.player;
 
 import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.content.ComponentName;
 import android.content.Intent;
@@ -84,7 +83,6 @@ public final class PlayQueueActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        assureCorrectAppLanguage(this);
         super.onCreate(savedInstanceState);
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 

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

@@ -44,9 +44,7 @@ import static org.schabi.newpipe.player.notification.NotificationConstants.ACTIO
 import static org.schabi.newpipe.player.notification.NotificationConstants.ACTION_SHUFFLE;
 import static org.schabi.newpipe.util.ListHelper.getPopupResolutionIndex;
 import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static coil3.Image_androidKt.toBitmap;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -54,6 +52,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 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;
@@ -79,6 +78,8 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.video.VideoSize;
+import com.squareup.picasso.Picasso;
+import com.squareup.picasso.Target;
 
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
@@ -120,13 +121,12 @@ import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.StreamTypeUtil;
-import org.schabi.newpipe.util.image.CoilHelper;
+import org.schabi.newpipe.util.image.PicassoHelper;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.IntStream;
 
-import coil3.target.Target;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -175,6 +175,7 @@ public final class Player implements PlaybackListener, Listener {
     //////////////////////////////////////////////////////////////////////////*/
 
     public static final int RENDERER_UNAVAILABLE = -1;
+    private static final String PICASSO_PLAYER_THUMBNAIL_TAG = "PICASSO_PLAYER_THUMBNAIL_TAG";
 
     /*//////////////////////////////////////////////////////////////////////////
     // Playback
@@ -193,8 +194,6 @@ public final class Player implements PlaybackListener, Listener {
     private MediaItemTag currentMetadata;
     @Nullable
     private Bitmap currentThumbnail;
-    @Nullable
-    private coil3.request.Disposable thumbnailDisposable;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Player
@@ -248,6 +247,12 @@ public final class Player implements PlaybackListener, Listener {
     @NonNull
     private final CompositeDisposable databaseUpdateDisposable = new CompositeDisposable();
 
+    // This is the only listener we need for thumbnail loading, since there is always at most only
+    // one thumbnail being loaded at a time. This field is also here to maintain a strong reference,
+    // which would otherwise be garbage collected since Picasso holds weak references to targets.
+    @NonNull
+    private final Target currentThumbnailTarget;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
@@ -300,6 +305,8 @@ public final class Player implements PlaybackListener, Listener {
         videoResolver = new VideoPlaybackResolver(context, dataSource, getQualityResolver());
         audioResolver = new AudioPlaybackResolver(context, dataSource);
 
+        currentThumbnailTarget = getCurrentThumbnailTarget();
+
         // The UIs added here should always be present. They will be initialized when the player
         // reaches the initialization step. Make sure the media session ui is before the
         // notification ui in the UIs list, since the notification depends on the media session in
@@ -473,15 +480,14 @@ public final class Player implements PlaybackListener, Listener {
     }
 
     private void initUIsForCurrentPlayerType() {
-        if ((UIs.getOpt(MainPlayerUi.class).isPresent() && playerType == PlayerType.MAIN)
-                || (UIs.getOpt(PopupPlayerUi.class).isPresent()
-                    && playerType == PlayerType.POPUP)) {
+        if ((UIs.get(MainPlayerUi.class).isPresent() && playerType == PlayerType.MAIN)
+                || (UIs.get(PopupPlayerUi.class).isPresent() && playerType == PlayerType.POPUP)) {
             // correct UI already in place
             return;
         }
 
         // try to reuse binding if possible
-        final PlayerBinding binding = UIs.getOpt(VideoPlayerUi.class).map(VideoPlayerUi::getBinding)
+        final PlayerBinding binding = UIs.get(VideoPlayerUi.class).map(VideoPlayerUi::getBinding)
                 .orElseGet(() -> {
                     if (playerType == PlayerType.AUDIO) {
                         return null;
@@ -492,15 +498,15 @@ public final class Player implements PlaybackListener, Listener {
 
         switch (playerType) {
             case MAIN:
-                UIs.destroyAllOfType(PopupPlayerUi.class);
+                UIs.destroyAll(PopupPlayerUi.class);
                 UIs.addAndPrepare(new MainPlayerUi(this, binding));
                 break;
             case POPUP:
-                UIs.destroyAllOfType(MainPlayerUi.class);
+                UIs.destroyAll(MainPlayerUi.class);
                 UIs.addAndPrepare(new PopupPlayerUi(this, binding));
                 break;
             case AUDIO:
-                UIs.destroyAllOfType(VideoPlayerUi.class);
+                UIs.destroyAll(VideoPlayerUi.class);
                 break;
         }
     }
@@ -591,15 +597,9 @@ public final class Player implements PlaybackListener, Listener {
         }
     }
 
-
-    /**
-     * Shut down this player.
-     * Saves the stream progress, sets recovery.
-     * Then destroys the player in all UIs and destroys the UIs as well.
-     */
-    public void saveAndShutdown() {
+    public void destroy() {
         if (DEBUG) {
-            Log.d(TAG, "saveAndShutdown() called");
+            Log.d(TAG, "destroy() called");
         }
 
         saveStreamProgressState();
@@ -611,8 +611,9 @@ public final class Player implements PlaybackListener, Listener {
 
         databaseUpdateDisposable.clear();
         progressUpdateDisposable.set(null);
+        cancelLoadingCurrentThumbnail();
 
-        UIs.destroyAllOfType(null);
+        UIs.destroyAll(Object.class); // destroy every UI: obviously every UI extends Object
     }
 
     public void setRecovery() {
@@ -751,7 +752,6 @@ public final class Player implements PlaybackListener, Listener {
                 toggleShuffleModeEnabled();
                 break;
             case Intent.ACTION_CONFIGURATION_CHANGED:
-                assureCorrectAppLanguage(service);
                 if (DEBUG) {
                     Log.d(TAG, "ACTION_CONFIGURATION_CHANGED received");
                 }
@@ -784,57 +784,67 @@ public final class Player implements PlaybackListener, Listener {
     //////////////////////////////////////////////////////////////////////////*/
     //region Thumbnail loading
 
+    private Target getCurrentThumbnailTarget() {
+        // a Picasso target is just a listener for thumbnail loading events
+        return new Target() {
+            @Override
+            public void onBitmapLoaded(final Bitmap bitmap, final Picasso.LoadedFrom from) {
+                if (DEBUG) {
+                    Log.d(TAG, "Thumbnail - onBitmapLoaded() called with: bitmap = [" + bitmap
+                            + " -> " + bitmap.getWidth() + "x" + bitmap.getHeight() + "], from = ["
+                            + from + "]");
+                }
+                // there is a new thumbnail, so e.g. the end screen thumbnail needs to change, too.
+                onThumbnailLoaded(bitmap);
+            }
+
+            @Override
+            public void onBitmapFailed(final Exception e, final Drawable errorDrawable) {
+                Log.e(TAG, "Thumbnail - onBitmapFailed() called", e);
+                // there is a new thumbnail, so e.g. the end screen thumbnail needs to change, too.
+                onThumbnailLoaded(null);
+            }
+
+            @Override
+            public void onPrepareLoad(final Drawable placeHolderDrawable) {
+                if (DEBUG) {
+                    Log.d(TAG, "Thumbnail - onPrepareLoad() called");
+                }
+            }
+        };
+    }
+
     private void loadCurrentThumbnail(final List<Image> thumbnails) {
         if (DEBUG) {
             Log.d(TAG, "Thumbnail - loadCurrentThumbnail() called with thumbnails = ["
                     + thumbnails.size() + "]");
         }
 
-        // Cancel any ongoing image loading
-        if (thumbnailDisposable != null) {
-            thumbnailDisposable.dispose();
-        }
+        // first cancel any previous loading
+        cancelLoadingCurrentThumbnail();
 
         // Unset currentThumbnail, since it is now outdated. This ensures it is not used in media
-        // session metadata while the new thumbnail is being loaded by Coil.
+        // session metadata while the new thumbnail is being loaded by Picasso.
         onThumbnailLoaded(null);
         if (thumbnails.isEmpty()) {
             return;
         }
 
         // scale down the notification thumbnail for performance
-        final var thumbnailTarget = new Target() {
-            @Override
-            public void onError(@Nullable final coil3.Image error) {
-                Log.e(TAG, "Thumbnail - onError() called");
-                // there is a new thumbnail, so e.g. the end screen thumbnail needs to change, too.
-                onThumbnailLoaded(null);
-            }
+        PicassoHelper.loadScaledDownThumbnail(context, thumbnails)
+                .tag(PICASSO_PLAYER_THUMBNAIL_TAG)
+                .into(currentThumbnailTarget);
+    }
 
-            @Override
-            public void onStart(@Nullable final coil3.Image placeholder) {
-                if (DEBUG) {
-                    Log.d(TAG, "Thumbnail - onStart() called");
-                }
-            }
-
-            @Override
-            public void onSuccess(@NonNull final coil3.Image result) {
-                if (DEBUG) {
-                    Log.d(TAG, "Thumbnail - onSuccess() called with: drawable = [" + result + "]");
-                }
-                // there is a new thumbnail, so e.g. the end screen thumbnail needs to change, too.
-                onThumbnailLoaded(toBitmap(result));
-            }
-        };
-        thumbnailDisposable = CoilHelper.INSTANCE
-                .loadScaledDownThumbnail(context, thumbnails, thumbnailTarget);
+    private void cancelLoadingCurrentThumbnail() {
+        // cancel the Picasso job associated with the player thumbnail, if any
+        PicassoHelper.cancelTag(PICASSO_PLAYER_THUMBNAIL_TAG);
     }
 
     private void onThumbnailLoaded(@Nullable final Bitmap bitmap) {
         // Avoid useless thumbnail updates, if the thumbnail has not actually changed. Based on the
         // thumbnail loading code, this if would be skipped only when both bitmaps are `null`, since
-        // onThumbnailLoaded won't be called twice with the same nonnull bitmap by Coil's target.
+        // onThumbnailLoaded won't be called twice with the same nonnull bitmap by Picasso's target.
         if (currentThumbnail != bitmap) {
             currentThumbnail = bitmap;
             UIs.call(playerUi -> playerUi.onThumbnailLoaded(bitmap));
@@ -2001,10 +2011,6 @@ public final class Player implements PlaybackListener, Listener {
         triggerProgressUpdate();
     }
 
-    /**
-     * Remove the listener, if it was set.
-     * @param listener listener to remove
-     * */
     public void removeFragmentListener(final PlayerServiceEventListener listener) {
         if (fragmentListener == listener) {
             fragmentListener = null;
@@ -2019,10 +2025,6 @@ public final class Player implements PlaybackListener, Listener {
         triggerProgressUpdate();
     }
 
-    /**
-     * Remove the listener, if it was set.
-     * @param listener listener to remove
-     * */
     void removeActivityListener(final PlayerEventListener listener) {
         if (activityListener == listener) {
             activityListener = null;

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

@@ -16,101 +16,100 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.schabi.newpipe.player
 
-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.core.app.ServiceCompat
-import androidx.media.MediaBrowserServiceCompat
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
-import org.schabi.newpipe.ktx.toDebugString
-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.Localization
-import org.schabi.newpipe.util.ThemeHelper
-import java.lang.ref.WeakReference
-import java.util.function.BiConsumer
-import java.util.function.Consumer
+package org.schabi.newpipe.player;
+
+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.
  */
-class PlayerService : MediaBrowserServiceCompat() {
+public final class PlayerService extends MediaBrowserServiceCompat {
+    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 var mediaBrowserImpl: MediaBrowserImpl? = null
-    private var mediaBrowserPlaybackPreparer: MediaBrowserPlaybackPreparer? = null
+    private MediaBrowserImpl mediaBrowserImpl;
+    private MediaBrowserPlaybackPreparer mediaBrowserPlaybackPreparer;
 
     // these are instantiated in onCreate() as per
     // https://developer.android.com/training/cars/media#browser_workflow
-    private var mediaSession: MediaSessionCompat? = null
-    private var sessionConnector: MediaSessionConnector? = null
+    private MediaSessionCompat mediaSession;
+    private MediaSessionConnector sessionConnector;
+
+    @Nullable
+    private Player player;
+
+    private final IBinder mBinder = new PlayerService.LocalBinder(this);
 
     /**
-     * @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.
-     */
-    var player: Player? = null
-        private set
-
-    private val mBinder: IBinder = LocalBinder(this)
-
-    /**
-     * The parameter taken by this [Consumer] can be null to indicate the player is being
+     * The parameter taken by this {@link Consumer} can be null to indicate the player is being
      * stopped.
      */
-    private var onPlayerStartedOrStopped: Consumer<Player?>? = null
+    @Nullable
+    private Consumer<Player> onPlayerStartedOrStopped = null;
+
 
     //region Service lifecycle
-    override fun onCreate() {
-        super.onCreate()
+    @Override
+    public void onCreate() {
+        super.onCreate();
 
         if (DEBUG) {
-            Log.d(TAG, "onCreate() called")
+            Log.d(TAG, "onCreate() called");
         }
-        Localization.assureCorrectAppLanguage(this)
-        ThemeHelper.setTheme(this)
+        ThemeHelper.setTheme(this);
 
-        mediaBrowserImpl = MediaBrowserImpl(
-            this,
-            Consumer { parentId: String? ->
-                this.notifyChildrenChanged(
-                    parentId!!
-                )
-            }
-        )
+        mediaBrowserImpl = new MediaBrowserImpl(this, this::notifyChildrenChanged);
 
         // see https://developer.android.com/training/cars/media#browser_workflow
-        mediaSession = MediaSessionCompat(this, "MediaSessionPlayerServ")
-        setSessionToken(mediaSession!!.sessionToken)
-        sessionConnector = MediaSessionConnector(mediaSession!!)
-        sessionConnector!!.setMetadataDeduplicationEnabled(true)
+        mediaSession = new MediaSessionCompat(this, "MediaSessionPlayerServ");
+        setSessionToken(mediaSession.getSessionToken());
+        sessionConnector = new MediaSessionConnector(mediaSession);
+        sessionConnector.setMetadataDeduplicationEnabled(true);
 
-        mediaBrowserPlaybackPreparer = MediaBrowserPlaybackPreparer(
-            this,
-            BiConsumer { message: String?, code: Int? ->
-                sessionConnector!!.setCustomErrorMessage(
-                    message,
-                    code!!
-                )
-            },
-            Runnable { sessionConnector!!.setCustomErrorMessage(null) },
-            Consumer { playWhenReady: Boolean? ->
-                if (player != null) {
-                    player!!.onPrepare()
+        mediaBrowserPlaybackPreparer = new MediaBrowserPlaybackPreparer(
+                this,
+                sessionConnector::setCustomErrorMessage,
+                () -> sessionConnector.setCustomErrorMessage(null),
+                (playWhenReady) -> {
+                    if (player != null) {
+                        player.onPrepare();
+                    }
                 }
-            }
-        )
-        sessionConnector!!.setPlaybackPreparer(mediaBrowserPlaybackPreparer)
+        );
+        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
@@ -121,26 +120,22 @@ class PlayerService : MediaBrowserServiceCompat() {
         // useless notification.
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    @Override
+    public int onStartCommand(final Intent intent, final int flags, final int startId) {
         if (DEBUG) {
-            Log.d(
-                TAG,
-                (
-                    "onStartCommand() called with: intent = [" + intent +
-                        "], extras = [" + intent.extras.toDebugString() +
-                        "], flags = [" + flags + "], startId = [" + startId + "]"
-                    )
-            )
+            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)) {
-            val playerWasNull = (player == null)
+            final boolean playerWasNull = (player == null);
             if (playerWasNull) {
                 // make sure the player exists, in case the service was resumed
-                player = Player(this, mediaSession!!, sessionConnector!!)
+                player = new Player(this, mediaSession, sessionConnector);
             }
 
             // Be sure that the player notification is set and the service is started in foreground,
@@ -150,107 +145,107 @@ class PlayerService : MediaBrowserServiceCompat() {
             // 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.
-            player!!.UIs().get(NotificationPlayerUi::class.java)
-                ?.createNotificationAndStartForeground()
+            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)
+                onPlayerStartedOrStopped.accept(player);
             }
         }
 
-        if (Intent.ACTION_MEDIA_BUTTON == intent.action &&
-            (player == null || player!!.playQueue == null)
-        ) {
+        if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())
+                && (player == null || player.getPlayQueue() == null)) {
             /*
             No need to process media button's actions if the player is not working, otherwise
             the player service would strangely start with nothing to play
             Stop the service in this case, which will be removed from the foreground and its
             notification cancelled in its destruction
              */
-            destroyPlayerAndStopService()
-            return START_NOT_STICKY
+            destroyPlayerAndStopService();
+            return START_NOT_STICKY;
         }
 
-        val p = player
-        if (p != null) {
-            p.handleIntent(intent)
-            p.UIs().get(MediaSessionPlayerUi::class.java)
-                ?.handleMediaButtonIntent(intent)
+        if (player != null) {
+            player.handleIntent(intent);
+            player.UIs().get(MediaSessionPlayerUi.class)
+                    .ifPresent(ui -> ui.handleMediaButtonIntent(intent));
         }
 
-        return START_NOT_STICKY
+        return START_NOT_STICKY;
     }
 
-    fun stopForImmediateReusing() {
+    public void stopForImmediateReusing() {
         if (DEBUG) {
-            Log.d(TAG, "stopForImmediateReusing() called")
+            Log.d(TAG, "stopForImmediateReusing() called");
         }
 
-        if (player != null && !player!!.exoPlayerIsNull()) {
+        if (player != null && !player.exoPlayerIsNull()) {
             // Releases wifi & cpu, disables keepScreenOn, etc.
             // We can't just pause the player here because it will make transition
             // from one stream to a new stream not smooth
-            player!!.smoothStopForImmediateReusing()
+            player.smoothStopForImmediateReusing();
         }
     }
 
-    override fun onTaskRemoved(rootIntent: Intent?) {
-        super.onTaskRemoved(rootIntent)
-        if (player != null && !player!!.videoPlayerSelected()) {
-            return
+    @Override
+    public void onTaskRemoved(final Intent rootIntent) {
+        super.onTaskRemoved(rootIntent);
+        if (player != null && !player.videoPlayerSelected()) {
+            return;
         }
-        onDestroy()
+        onDestroy();
         // Unload from memory completely
-        Runtime.getRuntime().halt(0)
+        Runtime.getRuntime().halt(0);
     }
 
-    override fun onDestroy() {
+    @Override
+    public void onDestroy() {
         if (DEBUG) {
-            Log.d(TAG, "destroy() called")
+            Log.d(TAG, "destroy() called");
         }
-        super.onDestroy()
+        super.onDestroy();
 
-        cleanup()
+        cleanup();
 
-        mediaBrowserPlaybackPreparer!!.dispose()
-        mediaSession!!.release()
-        mediaBrowserImpl!!.dispose()
+        mediaBrowserPlaybackPreparer.dispose();
+        mediaSession.release();
+        mediaBrowserImpl.dispose();
     }
 
-    private fun cleanup() {
+    private void cleanup() {
         if (player != null) {
             if (onPlayerStartedOrStopped != null) {
                 // notify that the player is being destroyed
-                onPlayerStartedOrStopped!!.accept(null)
+                onPlayerStartedOrStopped.accept(null);
             }
-            player!!.saveAndShutdown()
-            player = null
+            player.destroy();
+            player = null;
         }
 
         // Should already be handled by MediaSessionPlayerUi, but just to be sure.
-        mediaSession!!.setActive(false)
+        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)
+        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 [PlayerService] completely, but this step will
+     * 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).
      */
-    fun destroyPlayerAndStopService() {
+    public void destroyPlayerAndStopService() {
         if (DEBUG) {
-            Log.d(TAG, "destroyPlayerAndStopService() called")
+            Log.d(TAG, "destroyPlayerAndStopService() called");
         }
 
-        cleanup()
+        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().
@@ -258,96 +253,94 @@ class PlayerService : MediaBrowserServiceCompat() {
         // 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(Intent(this, PlayerService::class.java))
+        stopService(new Intent(this, PlayerService.class));
     }
 
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(base))
+    @Override
+    protected void attachBaseContext(final Context base) {
+        super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(base));
     }
-
     //endregion
+
     //region Bind
-    override fun onBind(intent: Intent): IBinder? {
+    @Override
+    public IBinder onBind(final Intent intent) {
         if (DEBUG) {
-            Log.d(
-                TAG,
-                (
-                    "onBind() called with: intent = [" + intent +
-                        "], extras = [" + intent.extras.toDebugString() + "]"
-                    )
-            )
+            Log.d(TAG, "onBind() called with: intent = [" + intent
+                    + "], extras = [" + BundleKt.toDebugString(intent.getExtras()) + "]");
         }
 
-        if (BIND_PLAYER_HOLDER_ACTION == intent.action) {
+        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 (SERVICE_INTERFACE == intent.action) {
+            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)
+            return super.onBind(intent);
+
         } else {
             // This is an unknown request, avoid returning any binder to not leak objects.
-            return null
+            return null;
         }
     }
 
-    class LocalBinder internal constructor(playerService: PlayerService) : Binder() {
-        private val playerService: WeakReference<PlayerService?>
+    public static class LocalBinder extends Binder {
+        private final WeakReference<PlayerService> playerService;
 
-        init {
-            this.playerService = WeakReference<PlayerService?>(playerService)
+        LocalBinder(final PlayerService playerService) {
+            this.playerService = new WeakReference<>(playerService);
         }
 
-        val service: PlayerService?
-            get() = playerService.get()
+        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
-     * `null` listener is passed, then the current listener will be unset. The parameter taken
-     * by the [Consumer] can be null to indicate that the player is stopping.
+     * {@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
      */
-    fun setPlayerListener(listener: Consumer<Player?>?) {
-        this.onPlayerStartedOrStopped = listener
+    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)
+            listener.accept(player);
         }
     }
-
     //endregion
+
     //region Media browser
-    override fun onGetRoot(
-        clientPackageName: String,
-        clientUid: Int,
-        rootHints: Bundle?
-    ): BrowserRoot {
-        // TODO check if the accessing package has permission to view data
-        return mediaBrowserImpl!!.onGetRoot(clientPackageName, clientUid, rootHints)
+    @Override
+    public BrowserRoot onGetRoot(@NonNull final String clientPackageName,
+                                 final int clientUid,
+                                 @Nullable final Bundle rootHints) {
+        return mediaBrowserImpl.onGetRoot(clientPackageName, clientUid, rootHints);
     }
 
-    override fun onLoadChildren(
-        parentId: String,
-        result: Result<List<MediaBrowserCompat.MediaItem>>
-    ) {
-        mediaBrowserImpl!!.onLoadChildren(parentId, result)
+    @Override
+    public void onLoadChildren(@NonNull final String parentId,
+                               @NonNull final Result<List<MediaBrowserCompat.MediaItem>> result) {
+        mediaBrowserImpl.onLoadChildren(parentId, result);
     }
 
-    override fun onSearch(
-        query: String,
-        extras: Bundle?,
-        result: Result<List<MediaBrowserCompat.MediaItem>>
-    ) {
-        mediaBrowserImpl!!.onSearch(query, result)
-    } //endregion
-
-    companion object {
-        private val TAG: String = PlayerService::class.java.getSimpleName()
-        private val DEBUG = Player.DEBUG
-
-        const val SHOULD_START_FOREGROUND_EXTRA: String = "should_start_foreground_extra"
-        const val BIND_PLAYER_HOLDER_ACTION: String = "bind_player_holder_action"
+    @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/event/PlayerEventListener.java

@@ -5,7 +5,6 @@ import com.google.android.exoplayer2.PlaybackParameters;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 
-/** Player-specific events like queue or progress updates. */
 public interface PlayerEventListener {
     void onQueueUpdate(PlayQueue queue);
     void onPlaybackUpdate(int state, int repeatMode, boolean shuffled,

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

@@ -2,9 +2,6 @@ package org.schabi.newpipe.player.event;
 
 import com.google.android.exoplayer2.PlaybackException;
 
-/** {@link org.schabi.newpipe.player.event.PlayerEventListener} that also gets called for
- * application-specific events like screen rotation or UI changes.
- */
 public interface PlayerServiceEventListener extends PlayerEventListener {
     void onViewCreated();
 

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.player.helper;
 
 import static org.schabi.newpipe.ktx.ViewUtils.animateRotation;
 import static org.schabi.newpipe.player.Player.DEBUG;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 import static org.schabi.newpipe.util.ThemeHelper.resolveDrawable;
 
 import android.app.Dialog;
@@ -145,7 +144,6 @@ public class PlaybackParameterDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
-        assureCorrectAppLanguage(getContext());
         Bridge.restoreInstanceState(this, savedInstanceState);
 
         binding = DialogPlaybackParameterBinding.inflate(getLayoutInflater());

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

@@ -33,11 +33,9 @@ import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
 import com.google.android.exoplayer2.ui.CaptionStyleCompat;
-import com.google.android.exoplayer2.util.MimeTypes;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
@@ -47,13 +45,14 @@ import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.util.Localization;
 
 import java.lang.annotation.Retention;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Formatter;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -62,11 +61,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 public final class PlayerHelper {
-    private static final StringBuilder STRING_BUILDER = new StringBuilder();
-    private static final Formatter STRING_FORMATTER =
-            new Formatter(STRING_BUILDER, Locale.getDefault());
-    private static final NumberFormat SPEED_FORMATTER = new DecimalFormat("0.##x");
-    private static final NumberFormat PITCH_FORMATTER = new DecimalFormat("##%");
+    private static final FormattersProvider FORMATTERS_PROVIDER = new FormattersProvider();
 
     @Retention(SOURCE)
     @IntDef({AUTOPLAY_TYPE_ALWAYS, AUTOPLAY_TYPE_WIFI,
@@ -89,9 +84,11 @@ public final class PlayerHelper {
     private PlayerHelper() {
     }
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Exposed helpers
-    ////////////////////////////////////////////////////////////////////////////
+    // region Exposed helpers
+
+    public static void resetFormat() {
+        FORMATTERS_PROVIDER.reset();
+    }
 
     @NonNull
     public static String getTimeString(final int milliSeconds) {
@@ -100,35 +97,24 @@ public final class PlayerHelper {
         final int hours = (milliSeconds % 86400000) / 3600000;
         final int days = (milliSeconds % (86400000 * 7)) / 86400000;
 
-        STRING_BUILDER.setLength(0);
-        return (days > 0
-                ? STRING_FORMATTER.format("%d:%02d:%02d:%02d", days, hours, minutes, seconds)
-                : hours > 0
-                ? STRING_FORMATTER.format("%d:%02d:%02d", hours, minutes, seconds)
-                : STRING_FORMATTER.format("%02d:%02d", minutes, seconds)
-        ).toString();
+        final Formatters formatters = FORMATTERS_PROVIDER.formatters();
+        if (days > 0) {
+            return formatters.stringFormat("%d:%02d:%02d:%02d", days, hours, minutes, seconds);
+        }
+
+        return hours > 0
+            ? formatters.stringFormat("%d:%02d:%02d", hours, minutes, seconds)
+            : formatters.stringFormat("%02d:%02d", minutes, seconds);
     }
 
     @NonNull
     public static String formatSpeed(final double speed) {
-        return SPEED_FORMATTER.format(speed);
+        return FORMATTERS_PROVIDER.formatters().speed().format(speed);
     }
 
     @NonNull
     public static String formatPitch(final double pitch) {
-        return PITCH_FORMATTER.format(pitch);
-    }
-
-    @NonNull
-    public static String subtitleMimeTypesOf(@NonNull final MediaFormat format) {
-        switch (format) {
-            case VTT:
-                return MimeTypes.TEXT_VTT;
-            case TTML:
-                return MimeTypes.APPLICATION_TTML;
-            default:
-                throw new IllegalArgumentException("Unrecognized mime type: " + format.name());
-        }
+        return FORMATTERS_PROVIDER.formatters().pitch().format(pitch);
     }
 
     @NonNull
@@ -219,9 +205,8 @@ public final class PlayerHelper {
                 ? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
     }
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Settings Resolution
-    ////////////////////////////////////////////////////////////////////////////
+    // endregion
+    // region Resolution
 
     public static boolean isResumeAfterAudioFocusGain(@NonNull final Context context) {
         return getPreferences(context)
@@ -405,9 +390,8 @@ public final class PlayerHelper {
         return Integer.parseInt(preferredIntervalBytes) * 1024;
     }
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Private helpers
-    ////////////////////////////////////////////////////////////////////////////
+    // endregion
+    // region Private helpers
 
     @NonNull
     private static SharedPreferences getPreferences(@NonNull final Context context) {
@@ -427,9 +411,8 @@ public final class PlayerHelper {
     }
 
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Utils used by player
-    ////////////////////////////////////////////////////////////////////////////
+    // endregion
+    // region Utils used by player
 
     @RepeatMode
     public static int nextRepeatMode(@RepeatMode final int repeatMode) {
@@ -503,4 +486,43 @@ public final class PlayerHelper {
                 player.getContext().getString(R.string.seek_duration_key),
                 player.getContext().getString(R.string.seek_duration_default_value))));
     }
+
+    // endregion
+    // region Format
+
+    static class FormattersProvider {
+        private Formatters formatters;
+
+        public Formatters formatters() {
+            if (formatters == null) {
+                formatters = Formatters.create();
+            }
+            return formatters;
+        }
+
+        public void reset() {
+            formatters = null;
+        }
+    }
+
+    record Formatters(
+        Locale locale,
+        NumberFormat speed,
+        NumberFormat pitch) {
+
+        static Formatters create() {
+            final Locale locale = Localization.getAppLocale();
+            final DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(locale);
+            return new Formatters(
+                locale,
+                new DecimalFormat("0.##x", dfs),
+                new DecimalFormat("##%", dfs));
+        }
+
+        String stringFormat(final String format, final Object... args) {
+            return String.format(locale, format, args);
+        }
+    }
+
+    // endregion
 }

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

@@ -117,17 +117,9 @@ public final class PlayerHolder {
     // helper to handle context in common place as using the same
     // context to bind/unbind a service is crucial
     private Context getCommonContext() {
-        return App.getInstance();
+        return App.getApp();
     }
 
-    /**
-     * Connect to (and if needed start) the {@link PlayerService}
-     * and bind {@link PlayerServiceConnection} to it.
-     * If the service is already started, only set the listener.
-     * @param playAfterConnect If this holder’s service was already started,
-     *                         start playing immediately
-     * @param newListener set this listener
-     * */
     public void startService(final boolean playAfterConnect,
                              final PlayerServiceExtendedEventListener newListener) {
         if (DEBUG) {
@@ -167,6 +159,11 @@ public final class PlayerHolder {
 
         private boolean playAfterConnect = false;
 
+        /**
+         * @param playAfterConnection Sets the value of `playAfterConnect` to pass to the {@link
+         * PlayerServiceExtendedEventListener#onPlayerConnected(Player, boolean)} the next time it
+         * is called. The value of `playAfterConnect` will be reset to false after that.
+         */
         public void doPlayAfterConnect(final boolean playAfterConnection) {
             this.playAfterConnect = playAfterConnection;
         }
@@ -191,7 +188,6 @@ public final class PlayerHolder {
             playerService = localBinder.getService();
             if (listener != null) {
                 listener.onServiceConnected(playerService);
-                getPlayer().ifPresent(p -> listener.onPlayerConnected(p, playAfterConnect));
             }
             startPlayerListener();
             // ^ will call listener.onPlayerConnected() down the line if there is an active player
@@ -365,6 +361,8 @@ public final class PlayerHolder {
                 listener.onPlayerDisconnected();
             } else {
                 listener.onPlayerConnected(player, serviceConnection.playAfterConnect);
+                // reset the value of playAfterConnect: if it was true before, it is now "consumed"
+                serviceConnection.playAfterConnect = false;
                 player.setFragmentListener(internalListener);
             }
         }

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

@@ -8,7 +8,9 @@ import android.support.v4.media.MediaBrowserCompat
 import android.support.v4.media.MediaDescriptionCompat
 import android.util.Log
 import androidx.annotation.DrawableRes
+import androidx.core.net.toUri
 import androidx.media.MediaBrowserServiceCompat
+import androidx.media.MediaBrowserServiceCompat.BrowserRoot.EXTRA_RECENT
 import androidx.media.MediaBrowserServiceCompat.Result
 import androidx.media.utils.MediaConstants
 import io.reactivex.rxjava3.core.Flowable
@@ -47,6 +49,7 @@ class MediaBrowserImpl(
     private val context: Context,
     notifyChildrenChanged: Consumer<String>, // parentId
 ) {
+    private val packageValidator = PackageValidator(context)
     private val database = NewPipeDatabase.getInstance(context)
     private var disposables = CompositeDisposable()
 
@@ -68,11 +71,22 @@ class MediaBrowserImpl(
         clientPackageName: String,
         clientUid: Int,
         rootHints: Bundle?
-    ): MediaBrowserServiceCompat.BrowserRoot {
+    ): MediaBrowserServiceCompat.BrowserRoot? {
         if (DEBUG) {
             Log.d(TAG, "onGetRoot($clientPackageName, $clientUid, $rootHints)")
         }
 
+        if (!packageValidator.isKnownCaller(clientPackageName, clientUid)) {
+            // this is a caller we can't trust (see PackageValidator's rules taken from uamp)
+            return null
+        }
+
+        if (rootHints?.getBoolean(EXTRA_RECENT, false) == true) {
+            // the system is asking for a root to do media resumption, but we can't handle that yet,
+            // see https://developer.android.com/media/implement/surfaces/mobile#mediabrowserservice_implementation
+            return null
+        }
+
         val extras = Bundle()
         extras.putBoolean(
             MediaConstants.BROWSER_SERVICE_EXTRAS_KEY_SEARCH_SUPPORTED, true
@@ -103,7 +117,7 @@ class MediaBrowserImpl(
 
     private fun onLoadChildren(parentId: String): Single<List<MediaBrowserCompat.MediaItem>> {
         try {
-            val parentIdUri = Uri.parse(parentId)
+            val parentIdUri = parentId.toUri()
             val path = ArrayList(parentIdUri.pathSegments)
 
             if (path.isEmpty()) {
@@ -185,7 +199,7 @@ class MediaBrowserImpl(
         builder
             .setMediaId(createMediaIdForInfoItem(playlist is PlaylistRemoteEntity, playlist.uid))
             .setTitle(playlist.orderingName)
-            .setIconUri(playlist.thumbnailUrl?.let { Uri.parse(it) })
+            .setIconUri(imageUriOrNullIfDisabled(playlist.thumbnailUrl))
 
         val extras = Bundle()
         extras.putString(
@@ -212,7 +226,7 @@ class MediaBrowserImpl(
         }
 
         ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
-            builder.setIconUri(Uri.parse(it))
+            builder.setIconUri(imageUriOrNullIfDisabled(it))
         }
 
         return MediaBrowserCompat.MediaItem(
@@ -258,7 +272,7 @@ class MediaBrowserImpl(
         builder.setMediaId(createMediaIdForPlaylistIndex(false, playlistId, index))
             .setTitle(item.streamEntity.title)
             .setSubtitle(item.streamEntity.uploader)
-            .setIconUri(Uri.parse(item.streamEntity.thumbnailUrl))
+            .setIconUri(imageUriOrNullIfDisabled(item.streamEntity.thumbnailUrl))
 
         return MediaBrowserCompat.MediaItem(
             builder.build(),
@@ -277,7 +291,7 @@ class MediaBrowserImpl(
             .setSubtitle(item.uploaderName)
 
         ImageStrategy.choosePreferredImage(item.thumbnails)?.let {
-            builder.setIconUri(Uri.parse(it))
+            builder.setIconUri(imageUriOrNullIfDisabled(it))
         }
 
         return MediaBrowserCompat.MediaItem(
@@ -316,7 +330,7 @@ class MediaBrowserImpl(
         builder.setMediaId(mediaId)
             .setTitle(streamHistoryEntry.streamEntity.title)
             .setSubtitle(streamHistoryEntry.streamEntity.uploader)
-            .setIconUri(Uri.parse(streamHistoryEntry.streamEntity.thumbnailUrl))
+            .setIconUri(imageUriOrNullIfDisabled(streamHistoryEntry.streamEntity.thumbnailUrl))
 
         return MediaBrowserCompat.MediaItem(
             builder.build(),
@@ -395,5 +409,13 @@ class MediaBrowserImpl(
 
     companion object {
         private val TAG: String = MediaBrowserImpl::class.java.getSimpleName()
+
+        fun imageUriOrNullIfDisabled(url: String?): Uri? {
+            return if (ImageStrategy.shouldLoadImages()) {
+                url?.toUri()
+            } else {
+                null
+            }
+        }
     }
 }

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

@@ -6,6 +6,8 @@ import android.os.Bundle
 import android.os.ResultReceiver
 import android.support.v4.media.session.PlaybackStateCompat
 import android.util.Log
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -108,14 +110,14 @@ class MediaBrowserPlaybackPreparer(
     //region Errors
     private fun onUnsupportedError() {
         setMediaSessionError.accept(
-            context.getString(R.string.content_not_supported),
+            ContextCompat.getString(context, R.string.content_not_supported),
             PlaybackStateCompat.ERROR_CODE_NOT_SUPPORTED
         )
     }
 
     private fun onPrepareError() {
         setMediaSessionError.accept(
-            context.getString(R.string.error_snackbar_message),
+            ContextCompat.getString(context, R.string.error_snackbar_message),
             PlaybackStateCompat.ERROR_CODE_APP_ERROR
         )
     }
@@ -137,7 +139,7 @@ class MediaBrowserPlaybackPreparer(
 
     private fun extractPlayQueueFromMediaId(mediaId: String): Single<PlayQueue> {
         try {
-            val mediaIdUri = Uri.parse(mediaId)
+            val mediaIdUri = mediaId.toUri()
             val path = ArrayList(mediaIdUri.pathSegments)
             if (path.isEmpty()) {
                 throw parseError(mediaId)

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

@@ -0,0 +1,243 @@
+/*
+ * Copyright 2018 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// THIS FILE WAS TAKEN FROM UAMP, EXCEPT FOR THINGS RELATED TO THE WHITELIST. UPDATE IT WHEN NEEDED.
+// https://github.com/android/uamp/blob/329a21b63c247e9bd35f6858d4fc0e448fa38603/common/src/main/java/com/example/android/uamp/media/PackageValidator.kt
+
+package org.schabi.newpipe.player.mediabrowser
+
+import android.Manifest.permission.MEDIA_CONTENT_CONTROL
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED
+import android.content.pm.PackageManager
+import android.os.Process
+import android.support.v4.media.session.MediaSessionCompat
+import android.util.Log
+import androidx.core.app.NotificationManagerCompat
+import androidx.media.MediaBrowserServiceCompat
+import org.schabi.newpipe.BuildConfig
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+/**
+ * Validates that the calling package is authorized to browse a [MediaBrowserServiceCompat].
+ *
+ * The list of allowed signing certificates and their corresponding package names is defined in
+ * res/xml/allowed_media_browser_callers.xml.
+ *
+ * If you want to add a new caller to allowed_media_browser_callers.xml and you don't know
+ * its signature, this class will print to logcat (INFO level) a message with the proper
+ * xml tags to add to allow the caller.
+ *
+ * For more information, see res/xml/allowed_media_browser_callers.xml.
+ */
+internal class PackageValidator(context: Context) {
+    private val context: Context = context.applicationContext
+    private val packageManager: PackageManager = this.context.packageManager
+    private val platformSignature: String = getSystemSignature()
+    private val callerChecked = mutableMapOf<String, Pair<Int, Boolean>>()
+
+    /**
+     * Checks whether the caller attempting to connect to a [MediaBrowserServiceCompat] is known.
+     * See [MusicService.onGetRoot] for where this is utilized.
+     *
+     * @param callingPackage The package name of the caller.
+     * @param callingUid The user id of the caller.
+     * @return `true` if the caller is known, `false` otherwise.
+     */
+    fun isKnownCaller(callingPackage: String, callingUid: Int): Boolean {
+        // If the caller has already been checked, return the previous result here.
+        val (checkedUid, checkResult) = callerChecked[callingPackage] ?: Pair(0, false)
+        if (checkedUid == callingUid) {
+            return checkResult
+        }
+
+        /**
+         * Because some of these checks can be slow, we save the results in [callerChecked] after
+         * this code is run.
+         *
+         * In particular, there's little reason to recompute the calling package's certificate
+         * signature (SHA-256) each call.
+         *
+         * This is safe to do as we know the UID matches the package's UID (from the check above),
+         * and app UIDs are set at install time. Additionally, a package name + UID is guaranteed to
+         * be constant until a reboot. (After a reboot then a previously assigned UID could be
+         * reassigned.)
+         */
+
+        // Build the caller info for the rest of the checks here.
+        val callerPackageInfo = buildCallerInfo(callingPackage)
+            ?: throw IllegalStateException("Caller wasn't found in the system?")
+
+        // Verify that things aren't ... broken. (This test should always pass.)
+        if (callerPackageInfo.uid != callingUid) {
+            throw IllegalStateException("Caller's package UID doesn't match caller's actual UID?")
+        }
+
+        val callerSignature = callerPackageInfo.signature
+
+        val isCallerKnown = when {
+            // If it's our own app making the call, allow it.
+            callingUid == Process.myUid() -> true
+            // If the system is making the call, allow it.
+            callingUid == Process.SYSTEM_UID -> true
+            // If the app was signed by the same certificate as the platform itself, also allow it.
+            callerSignature == platformSignature -> true
+            /**
+             * [MEDIA_CONTENT_CONTROL] permission is only available to system applications, and
+             * while it isn't required to allow these apps to connect to a
+             * [MediaBrowserServiceCompat], allowing this ensures optimal compatability with apps
+             * such as Android TV and the Google Assistant.
+             */
+            callerPackageInfo.permissions.contains(MEDIA_CONTENT_CONTROL) -> true
+            /**
+             * If the calling app has a notification listener it is able to retrieve notifications
+             * and can connect to an active [MediaSessionCompat].
+             *
+             * It's not required to allow apps with a notification listener to
+             * connect to your [MediaBrowserServiceCompat], but it does allow easy compatibility
+             * with apps such as Wear OS.
+             */
+            NotificationManagerCompat.getEnabledListenerPackages(this.context)
+                .contains(callerPackageInfo.packageName) -> true
+
+            // If none of the previous checks succeeded, then the caller is unrecognized.
+            else -> false
+        }
+
+        if (!isCallerKnown) {
+            logUnknownCaller(callerPackageInfo)
+        }
+
+        // Save our work for next time.
+        callerChecked[callingPackage] = Pair(callingUid, isCallerKnown)
+        return isCallerKnown
+    }
+
+    /**
+     * Logs an info level message with details of how to add a caller to the allowed callers list
+     * when the app is debuggable.
+     */
+    private fun logUnknownCaller(callerPackageInfo: CallerPackageInfo) {
+        if (BuildConfig.DEBUG) {
+            Log.w(TAG, "Unknown caller $callerPackageInfo")
+        }
+    }
+
+    /**
+     * Builds a [CallerPackageInfo] for a given package that can be used for all the
+     * various checks that are performed before allowing an app to connect to a
+     * [MediaBrowserServiceCompat].
+     */
+    private fun buildCallerInfo(callingPackage: String): CallerPackageInfo? {
+        val packageInfo = getPackageInfo(callingPackage) ?: return null
+
+        val appName = packageInfo.applicationInfo.loadLabel(packageManager).toString()
+        val uid = packageInfo.applicationInfo.uid
+        val signature = getSignature(packageInfo)
+
+        val requestedPermissions = packageInfo.requestedPermissions
+        val permissionFlags = packageInfo.requestedPermissionsFlags
+        val activePermissions = mutableSetOf<String>()
+        requestedPermissions?.forEachIndexed { index, permission ->
+            if (permissionFlags[index] and REQUESTED_PERMISSION_GRANTED != 0) {
+                activePermissions += permission
+            }
+        }
+
+        return CallerPackageInfo(appName, callingPackage, uid, signature, activePermissions.toSet())
+    }
+
+    /**
+     * Looks up the [PackageInfo] for a package name.
+     * This requests both the signatures (for checking if an app is on the allow list) and
+     * the app's permissions, which allow for more flexibility in the allow list.
+     *
+     * @return [PackageInfo] for the package name or null if it's not found.
+     */
+    @Suppress("deprecation")
+    @SuppressLint("PackageManagerGetSignatures")
+    private fun getPackageInfo(callingPackage: String): PackageInfo? =
+        packageManager.getPackageInfo(
+            callingPackage,
+            PackageManager.GET_SIGNATURES or PackageManager.GET_PERMISSIONS
+        )
+
+    /**
+     * Gets the signature of a given package's [PackageInfo].
+     *
+     * The "signature" is a SHA-256 hash of the public key of the signing certificate used by
+     * the app.
+     *
+     * If the app is not found, or if the app does not have exactly one signature, this method
+     * returns `null` as the signature.
+     */
+    @Suppress("deprecation")
+    private fun getSignature(packageInfo: PackageInfo): String? =
+        if (packageInfo.signatures == null || packageInfo.signatures.size != 1) {
+            // Security best practices dictate that an app should be signed with exactly one (1)
+            // signature. Because of this, if there are multiple signatures, reject it.
+            null
+        } else {
+            val certificate = packageInfo.signatures[0].toByteArray()
+            getSignatureSha256(certificate)
+        }
+
+    /**
+     * Finds the Android platform signing key signature. This key is never null.
+     */
+    private fun getSystemSignature(): String =
+        getPackageInfo(ANDROID_PLATFORM)?.let { platformInfo ->
+            getSignature(platformInfo)
+        } ?: throw IllegalStateException("Platform signature not found")
+
+    /**
+     * Creates a SHA-256 signature given a certificate byte array.
+     */
+    private fun getSignatureSha256(certificate: ByteArray): String {
+        val md: MessageDigest
+        try {
+            md = MessageDigest.getInstance("SHA256")
+        } catch (noSuchAlgorithmException: NoSuchAlgorithmException) {
+            Log.e(TAG, "No such algorithm: $noSuchAlgorithmException")
+            throw RuntimeException("Could not find SHA256 hash algorithm", noSuchAlgorithmException)
+        }
+        md.update(certificate)
+
+        // This code takes the byte array generated by `md.digest()` and joins each of the bytes
+        // to a string, applying the string format `%02x` on each digit before it's appended, with
+        // a colon (':') between each of the items.
+        // For example: input=[0,2,4,6,8,10,12], output="00:02:04:06:08:0a:0c"
+        return md.digest().joinToString(":") { String.format("%02x", it) }
+    }
+
+    /**
+     * Convenience class to hold all of the information about an app that's being checked
+     * to see if it's a known caller.
+     */
+    private data class CallerPackageInfo(
+        val name: String,
+        val packageName: String,
+        val uid: Int,
+        val signature: String?,
+        val permissions: Set<String>
+    )
+}
+
+private const val TAG = "PackageValidator"
+private const val ANDROID_PLATFORM = "android"

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

@@ -138,7 +138,7 @@ public class MediaSessionPlayerUi extends PlayerUi
             public void play() {
                 player.play();
                 // hide the player controls even if the play command came from the media session
-                player.UIs().getOpt(VideoPlayerUi.class).ifPresent(ui -> ui.hideControls(0, 0));
+                player.UIs().get(VideoPlayerUi.class).ifPresent(ui -> ui.hideControls(0, 0));
             }
 
             @Override

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

@@ -102,7 +102,7 @@ public final class NotificationUtil {
             mediaStyle.setShowActionsInCompactView(compactSlots);
         }
         player.UIs()
-                .getOpt(MediaSessionPlayerUi.class)
+                .get(MediaSessionPlayerUi.class)
                 .flatMap(MediaSessionPlayerUi::getSessionToken)
                 .ifPresent(mediaStyle::setMediaSession);
 

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

@@ -3,6 +3,7 @@ package org.schabi.newpipe.player.playqueue;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -23,6 +24,7 @@ abstract class AbstractInfoPlayQueue<T extends ListInfo<? extends InfoItem>>
 
     final int serviceId;
     final String baseUrl;
+    @Nullable
     Page nextPage;
 
     private transient Disposable fetchReactor;

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

@@ -6,8 +6,8 @@ import android.view.MotionEvent;
 import android.view.View;
 
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.image.CoilHelper;
 
 public class PlayQueueItemBuilder {
     private static final String TAG = PlayQueueItemBuilder.class.toString();
@@ -33,7 +33,7 @@ public class PlayQueueItemBuilder {
             holder.itemDurationView.setVisibility(View.GONE);
         }
 
-        CoilHelper.INSTANCE.loadThumbnail(holder.itemThumbnailView, item.getThumbnails());
+        PicassoHelper.loadThumbnail(item.getThumbnails()).into(holder.itemThumbnailView);
 
         holder.itemRoot.setOnClickListener(view -> {
             if (onItemClickListener != null) {

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

@@ -13,9 +13,8 @@ import androidx.collection.SparseArrayCompat;
 
 import com.google.common.base.Stopwatch;
 
-import org.schabi.newpipe.App;
 import org.schabi.newpipe.extractor.stream.Frameset;
-import org.schabi.newpipe.util.image.CoilHelper;
+import org.schabi.newpipe.util.image.PicassoHelper;
 
 import java.util.Comparator;
 import java.util.List;
@@ -208,8 +207,8 @@ public class SeekbarPreviewThumbnailHolder {
             Log.d(TAG, "Downloading bitmap for seekbarPreview from '" + url + "'");
 
             // Gets the bitmap within the timeout of 15 seconds imposed by default by OkHttpClient
-            // Ensure that you are not running on the main thread, otherwise this will hang
-            final var bitmap = CoilHelper.INSTANCE.loadBitmapBlocking(App.getInstance(), url);
+            // Ensure that your are not running on the main-Thread this will otherwise hang
+            final Bitmap bitmap = PicassoHelper.loadSeekbarThumbnailPreview(url).get();
 
             if (sw != null) {
                 Log.d(TAG, "Download of bitmap for seekbarPreview from '" + url + "' took "

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

@@ -0,0 +1,90 @@
+package org.schabi.newpipe.player.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+public final class PlayerUiList {
+    final List<PlayerUi> playerUis = new ArrayList<>();
+
+    /**
+     * Creates a {@link PlayerUiList} starting with the provided player uis. The provided player uis
+     * will not be prepared like those passed to {@link #addAndPrepare(PlayerUi)}, because when
+     * the {@link PlayerUiList} constructor is called, the player is still not running and it
+     * wouldn't make sense to initialize uis then. Instead the player will initialize them by doing
+     * proper calls to {@link #call(Consumer)}.
+     *
+     * @param initialPlayerUis the player uis this list should start with; the order will be kept
+     */
+    public PlayerUiList(final PlayerUi... initialPlayerUis) {
+        playerUis.addAll(List.of(initialPlayerUis));
+    }
+
+    /**
+     * Adds the provided player ui to the list and calls on it the initialization functions that
+     * apply based on the current player state. The preparation step needs to be done since when UIs
+     * are removed and re-added, the player will not call e.g. initPlayer again since the exoplayer
+     * is already initialized, but we need to notify the newly built UI that the player is ready
+     * nonetheless.
+     * @param playerUi the player ui to prepare and add to the list; its {@link
+     *                 PlayerUi#getPlayer()} will be used to query information about the player
+     *                 state
+     */
+    public void addAndPrepare(final PlayerUi playerUi) {
+        if (playerUi.getPlayer().getFragmentListener().isPresent()) {
+            // make sure UIs know whether a service is connected or not
+            playerUi.onFragmentListenerSet();
+        }
+
+        if (!playerUi.getPlayer().exoPlayerIsNull()) {
+            playerUi.initPlayer();
+            if (playerUi.getPlayer().getPlayQueue() != null) {
+                playerUi.initPlayback();
+            }
+        }
+
+        playerUis.add(playerUi);
+    }
+
+    /**
+     * Destroys all matching player UIs and removes them from the list.
+     * @param playerUiType the class of the player UI to destroy; the {@link
+     *                     Class#isInstance(Object)} method will be used, so even subclasses will be
+     *                     destroyed and removed
+     * @param <T>          the class type parameter
+     */
+    public <T> void destroyAll(final Class<T> playerUiType) {
+        playerUis.stream()
+                .filter(playerUiType::isInstance)
+                .forEach(playerUi -> {
+                    playerUi.destroyPlayer();
+                    playerUi.destroy();
+                });
+        playerUis.removeIf(playerUiType::isInstance);
+    }
+
+    /**
+     * @param playerUiType the class of the player UI to return; the {@link
+     *                     Class#isInstance(Object)} method will be used, so even subclasses could
+     *                     be returned
+     * @param <T>          the class type parameter
+     * @return the first player UI of the required type found in the list, or an empty {@link
+     *         Optional} otherwise
+     */
+    public <T> Optional<T> get(final Class<T> playerUiType) {
+        return playerUis.stream()
+                .filter(playerUiType::isInstance)
+                .map(playerUiType::cast)
+                .findFirst();
+    }
+
+    /**
+     * Calls the provided consumer on all player UIs in the list, in order of addition.
+     * @param consumer the consumer to call with player UIs
+     */
+    public void call(final Consumer<PlayerUi> consumer) {
+        //noinspection SimplifyStreamApiCallChains
+        playerUis.stream().forEachOrdered(consumer);
+    }
+}

app/src/main/java/org/schabi/newpipe/player/ui/PlayerUiList.kt

@@ -1,124 +0,0 @@
-package org.schabi.newpipe.player.ui
-
-import org.schabi.newpipe.util.GuardedByMutex
-import java.util.Optional
-
-class PlayerUiList(vararg initialPlayerUis: PlayerUi) {
-    private var playerUis = GuardedByMutex(mutableListOf<PlayerUi>())
-
-    /**
-     * Creates a [PlayerUiList] starting with the provided player uis. The provided player uis
-     * will not be prepared like those passed to [.addAndPrepare], because when
-     * the [PlayerUiList] constructor is called, the player is still not running and it
-     * wouldn't make sense to initialize uis then. Instead the player will initialize them by doing
-     * proper calls to [.call].
-     *
-     * @param initialPlayerUis the player uis this list should start with; the order will be kept
-     */
-    init {
-        playerUis.runWithLockSync {
-            lockData.addAll(listOf(*initialPlayerUis))
-        }
-    }
-
-    /**
-     * Adds the provided player ui to the list and calls on it the initialization functions that
-     * apply based on the current player state. The preparation step needs to be done since when UIs
-     * are removed and re-added, the player will not call e.g. initPlayer again since the exoplayer
-     * is already initialized, but we need to notify the newly built UI that the player is ready
-     * nonetheless.
-     * @param playerUi the player ui to prepare and add to the list; its [PlayerUi.getPlayer]
-     * will be used to query information about the player state
-     */
-    fun addAndPrepare(playerUi: PlayerUi) {
-        if (playerUi.getPlayer().fragmentListener.isPresent) {
-            // make sure UIs know whether a service is connected or not
-            playerUi.onFragmentListenerSet()
-        }
-
-        if (!playerUi.getPlayer().exoPlayerIsNull()) {
-            playerUi.initPlayer()
-            if (playerUi.getPlayer().playQueue != null) {
-                playerUi.initPlayback()
-            }
-        }
-
-        playerUis.runWithLockSync {
-            lockData.add(playerUi)
-        }
-    }
-
-    /**
-     * Destroys all matching player UIs and removes them from the list.
-     * @param playerUiType the class of the player UI to destroy, everything if `null`.
-     * The [Class.isInstance] method will be used, so even subclasses will be
-     * destroyed and removed
-     * @param T the class type parameter </T>
-     * */
-    fun <T : PlayerUi> destroyAllOfType(playerUiType: Class<T>? = null) {
-        val toDestroy = mutableListOf<PlayerUi>()
-
-        // short blocking removal from class to prevent interfering from other threads
-        playerUis.runWithLockSync {
-            val new = mutableListOf<PlayerUi>()
-            for (ui in lockData) {
-                if (playerUiType == null || playerUiType.isInstance(ui)) {
-                    toDestroy.add(ui)
-                } else {
-                    new.add(ui)
-                }
-            }
-            lockData = new
-        }
-        // then actually destroy the UIs
-        for (ui in toDestroy) {
-            ui.destroyPlayer()
-            ui.destroy()
-        }
-    }
-
-    /**
-     * @param playerUiType the class of the player UI to return;
-     * the [Class.isInstance] method will be used, so even subclasses could be returned
-     * @param T the class type parameter
-     * @return the first player UI of the required type found in the list, or null
-     </T> */
-    fun <T : PlayerUi> get(playerUiType: Class<T>): T? =
-        playerUis.runWithLockSync {
-            for (ui in lockData) {
-                if (playerUiType.isInstance(ui)) {
-                    when (val r = playerUiType.cast(ui)) {
-                        // try all UIs before returning null
-                        null -> continue
-                        else -> return@runWithLockSync r
-                    }
-                }
-            }
-            return@runWithLockSync null
-        }
-
-    /**
-     * @param playerUiType the class of the player UI to return;
-     * the [Class.isInstance] method will be used, so even subclasses could be returned
-     * @param T the class type parameter
-     * @return the first player UI of the required type found in the list, or an empty
-     * [Optional] otherwise
-     </T> */
-    @Deprecated("use get", ReplaceWith("get(playerUiType)"))
-    fun <T : PlayerUi> getOpt(playerUiType: Class<T>): Optional<T> =
-        Optional.ofNullable(get(playerUiType))
-
-    /**
-     * Calls the provided consumer on all player UIs in the list, in order of addition.
-     * @param consumer the consumer to call with player UIs
-     */
-    fun call(consumer: java.util.function.Consumer<PlayerUi>) {
-        // copy the list out of the mutex before calling the consumer which might block
-        val new = playerUis.runWithLockSync {
-            lockData.toMutableList()
-        }
-        for (ui in new) {
-            consumer.accept(ui)
-        }
-    }
-}

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

@@ -16,7 +16,6 @@ import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
 import static org.schabi.newpipe.player.helper.PlayerHelper.nextResizeModeAndSaveToPrefs;
 import static org.schabi.newpipe.player.helper.PlayerHelper.retrieveSeekDurationFromPreferences;
 
-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -762,7 +761,7 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
     }
 
     /**
-     * Update the play/pause button (`R.id.playPauseButton`) to reflect the action
+     * Update the play/pause button ({@link R.id.playPauseButton}) to reflect the action
      * that will be performed when the button is clicked..
      * @param action the action that is performed when the play/pause button is clicked
      */
@@ -948,8 +947,6 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
         player.toggleShuffleModeEnabled();
     }
 
-    // TODO: don’t reference internal exoplayer2 resources
-    @SuppressLint("PrivateResource")
     @Override
     public void onRepeatModeChanged(@RepeatMode final int repeatMode) {
         super.onRepeatModeChanged(repeatMode);

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.settings;
 
 import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -126,7 +125,6 @@ public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
     }
 
     private void requestExportPathResult(final ActivityResult result) {
-        assureCorrectAppLanguage(requireContext());
         if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
             // will be saved only on success
             final Uri lastExportDataUri = result.getData().getData();
@@ -139,7 +137,6 @@ public class BackupRestoreSettingsFragment extends BasePreferenceFragment {
     }
 
     private void requestImportPathResult(final ActivityResult result) {
-        assureCorrectAppLanguage(requireContext());
         if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
             // will be saved only on success
             final Uri lastImportDataUri = result.getData().getData();

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

@@ -10,43 +10,45 @@ import android.util.Log;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.os.LocaleListCompat;
 import androidx.preference.Preference;
 
 import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.localization.ContentCountry;
-import org.schabi.newpipe.extractor.localization.Localization;
+import org.schabi.newpipe.player.helper.PlayerHelper;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.image.ImageStrategy;
+import org.schabi.newpipe.util.image.PicassoHelper;
 import org.schabi.newpipe.util.image.PreferredImageQuality;
 
+import java.io.IOException;
 import java.util.Locale;
 
-import coil3.SingletonImageLoader;
-
 public class ContentSettingsFragment extends BasePreferenceFragment {
     private String youtubeRestrictedModeEnabledKey;
 
-    private String initialLanguage;
-
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
         youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
 
         addPreferencesFromResourceRegistry();
 
-        initialLanguage = defaultPreferences.getString(getString(R.string.app_language_key), "en");
+        setupAppLanguagePreferences();
+        setupImageQualityPref();
+    }
+
+    private void setupAppLanguagePreferences() {
+        final Preference appLanguagePref = requirePreference(R.string.app_language_key);
+        // Android 13+ allows to set app specific languages
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            appLanguagePref.setVisible(false);
 
-        if (Build.VERSION.SDK_INT >= 33) {
-            requirePreference(R.string.app_language_key).setVisible(false);
             final Preference newAppLanguagePref =
                     requirePreference(R.string.app_language_android_13_and_up_key);
             newAppLanguagePref.setSummaryProvider(preference -> {
-                final Locale customLocale = AppCompatDelegate.getApplicationLocales().get(0);
-                if (customLocale != null) {
-                    return customLocale.getDisplayName();
-                }
-                return getString(R.string.systems_language);
+                final Locale loc = AppCompatDelegate.getApplicationLocales().get(0);
+                return loc != null ? loc.getDisplayName() : getString(R.string.systems_language);
             });
             newAppLanguagePref.setOnPreferenceClickListener(preference -> {
                 final Intent intent = new Intent(Settings.ACTION_APP_LOCALE_SETTINGS)
@@ -55,22 +57,33 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                 return true;
             });
             newAppLanguagePref.setVisible(true);
+            return;
         }
 
-        final Preference imageQualityPreference = requirePreference(R.string.image_quality_key);
-        imageQualityPreference.setOnPreferenceChangeListener(
-                (preference, newValue) -> {
-                    ImageStrategy.setPreferredImageQuality(PreferredImageQuality
-                            .fromPreferenceKey(requireContext(), (String) newValue));
-                    final var loader = SingletonImageLoader.get(preference.getContext());
-                    loader.getMemoryCache().clear();
-                    loader.getDiskCache().clear();
+        appLanguagePref.setOnPreferenceChangeListener((preference, newValue) -> {
+            final String language = (String) newValue;
+            final String systemLang = getString(R.string.default_localization_key);
+            final String tag = systemLang.equals(language) ? null : language;
+            AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(tag));
+            return true;
+        });
+    }
+
+    private void setupImageQualityPref() {
+        requirePreference(R.string.image_quality_key).setOnPreferenceChangeListener(
+            (preference, newValue) -> {
+                ImageStrategy.setPreferredImageQuality(PreferredImageQuality
+                    .fromPreferenceKey(requireContext(), (String) newValue));
+                try {
+                    PicassoHelper.clearCache(preference.getContext());
                     Toast.makeText(preference.getContext(),
                             R.string.thumbnail_cache_wipe_complete_notice, Toast.LENGTH_SHORT)
-                            .show();
-
-                    return true;
-                });
+                        .show();
+                } catch (final IOException e) {
+                    Log.e(TAG, "Unable to clear Picasso cache", e);
+                }
+                return true;
+            });
     }
 
     @Override
@@ -91,22 +104,10 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     public void onDestroy() {
         super.onDestroy();
 
-        final String selectedLanguage =
-                defaultPreferences.getString(getString(R.string.app_language_key), "en");
-
-        if (!selectedLanguage.equals(initialLanguage)) {
-            if (Build.VERSION.SDK_INT < 33) {
-                Toast.makeText(
-                        requireContext(),
-                        R.string.localization_changes_requires_app_restart,
-                        Toast.LENGTH_LONG
-                ).show();
-            }
-            final Localization selectedLocalization = org.schabi.newpipe.util.Localization
-                    .getPreferredLocalization(requireContext());
-            final ContentCountry selectedContentCountry = org.schabi.newpipe.util.Localization
-                    .getPreferredContentCountry(requireContext());
-            NewPipe.setupLocalization(selectedLocalization, selectedContentCountry);
-        }
+        final Context context = requireContext();
+        NewPipe.setupLocalization(
+            Localization.getPreferredLocalization(context),
+            Localization.getPreferredContentCountry(context));
+        PlayerHelper.resetFormat();
     }
 }

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

@@ -1,27 +0,0 @@
-package org.schabi.newpipe.settings
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import org.schabi.newpipe.R
-import org.schabi.newpipe.settings.viewmodel.SettingsViewModel
-import org.schabi.newpipe.ui.SwitchPreference
-import org.schabi.newpipe.ui.theme.SizeTokens
-
-@Composable
-fun DebugScreen(viewModel: SettingsViewModel, modifier: Modifier = Modifier) {
-
-    val settingsLayoutRedesign by viewModel.settingsLayoutRedesign.collectAsState()
-
-    Column(modifier = modifier) {
-        SwitchPreference(
-            modifier = Modifier.padding(SizeTokens.SpacingExtraSmall),
-            R.string.settings_layout_redesign,
-            settingsLayoutRedesign,
-            viewModel::toggleSettingsLayoutRedesign
-        )
-    }
-}

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

@@ -10,6 +10,7 @@ import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
 import org.schabi.newpipe.local.feed.notifications.NotificationWorker;
+import org.schabi.newpipe.util.image.PicassoHelper;
 
 import java.util.Optional;
 
@@ -24,6 +25,8 @@ public class DebugSettingsFragment extends BasePreferenceFragment {
                 findPreference(getString(R.string.allow_heap_dumping_key));
         final Preference showMemoryLeaksPreference =
                 findPreference(getString(R.string.show_memory_leaks_key));
+        final Preference showImageIndicatorsPreference =
+                findPreference(getString(R.string.show_image_indicators_key));
         final Preference checkNewStreamsPreference =
                 findPreference(getString(R.string.check_new_streams_key));
         final Preference crashTheAppPreference =
@@ -35,6 +38,7 @@ public class DebugSettingsFragment extends BasePreferenceFragment {
 
         assert allowHeapDumpingPreference != null;
         assert showMemoryLeaksPreference != null;
+        assert showImageIndicatorsPreference != null;
         assert checkNewStreamsPreference != null;
         assert crashTheAppPreference != null;
         assert showErrorSnackbarPreference != null;
@@ -57,6 +61,11 @@ public class DebugSettingsFragment extends BasePreferenceFragment {
             showMemoryLeaksPreference.setSummary(R.string.leak_canary_not_available);
         }
 
+        showImageIndicatorsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            PicassoHelper.setIndicatorsEnabled((Boolean) newValue);
+            return true;
+        });
+
         checkNewStreamsPreference.setOnPreferenceClickListener(preference -> {
             NotificationWorker.runNow(preference.getContext());
             return true;

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

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.settings;
 
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -209,8 +207,6 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     }
 
     private void requestDownloadPathResult(final ActivityResult result, final String key) {
-        assureCorrectAppLanguage(getContext());
-
         if (result.getResultCode() != Activity.RESULT_OK) {
             return;
         }

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

@@ -13,6 +13,7 @@ import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.migration.MigrationManager;
 import org.schabi.newpipe.util.DeviceUtils;
 
 import java.io.File;
@@ -46,7 +47,7 @@ public final class NewPipeSettings {
 
     public static void initSettings(final Context context) {
         // first run migrations, then setDefaultValues, since the latter requires the correct types
-        SettingMigrations.runMigrationsIfNeeded(context);
+        MigrationManager.runMigrationsIfNeeded(context);
 
         // readAgain is true so that if new settings are added their default value is set
         PreferenceManager.setDefaultValues(context, R.xml.main_settings, true);
@@ -156,7 +157,7 @@ public final class NewPipeSettings {
                 prefs.getInt(disabledTunnelingAutomaticallyKey, -1) == 0
                         && !prefs.getBoolean(disabledTunnelingKey, false);
 
-        if (App.getInstance().isFirstRun()
+        if (App.getApp().isFirstRun()
                 || (wasDeviceBlacklistUpdated && !wasMediaTunnelingEnabledByUser)) {
             setMediaTunneling(context);
         }