Merge pull request #8889 from TeamNewPipe/release-0.24.0

Release v0.24.0 (990)
Update NewPipeExtractor again
2025-09-20 23:00:50 +02:00 · 2022-09-25 13:56:20 +02:00 · 2022-09-25 13:33:49 +02:00 · 2022-09-25 13:31:17 +02:00 · 2022-09-19 11:21:42 +02:00 · 2022-09-19 09:17:25 +02:00
623 changed files with 16729 additions and 11333 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug report
 description: Create a bug report to help us improve
-labels: [bug]
+labels: [bug, needs triage]
 body:
  - type: markdown
    attributes:
@@ -18,6 +18,8 @@ body:
          required: true
        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
          required: true
+        - label: "I have read the [FAQ](https://newpipe.net/FAQ/) and my problem isn't listed."
+          required: true
        - label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
          required: true
        - label: "This issue contains only one bug."
@@ -40,7 +42,7 @@ body:
      label: Steps to reproduce the bug
      description: |
        What did you do for the bug to show up?
-        
+
        If you can't cause the bug to show up again reliably (and hence don't have a proper set of steps to give us), please still try to give as many details as possible on how you think you encountered the bug.
      placeholder: |
        1. Go to '...'
@@ -69,11 +71,11 @@ body:
      label: Screenshots/Screen recordings
      description: |
        A picture or video is worth a thousand words.
-        
+
        If applicable, add screenshots or a screen recording to help explain your problem.
        GitHub supports uploading them directly in the text box.
        If your file is too big for Github to accept, try to compress it (ZIP-file) or feel free to paste a link to an image/video hoster here instead.
-        
+
        :heavy_exclamation_mark: DON'T POST SCREENSHOTS OF THE ERROR PAGE.
        Instead, follow the instructions in the "Logs" section below.

--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest an idea for this project
-labels: [enhancement]
+labels: [enhancement, needs triage]
 body:
  - type: markdown
    attributes:
@@ -8,7 +8,6 @@ body:
        Thank you for helping to make NewPipe better by suggesting a feature. :hugs:

        Your ideas are highly welcome! The app is made for you, the users, after all.
-        
  - type: checkboxes
    id: checklist
    attributes:
@@ -16,6 +15,8 @@ body:
      options:
        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
          required: true
+        - label: "I have read the [FAQ](https://newpipe.net/FAQ/) and my problem isn't listed."
+          required: true
        - label: "I'm aware that this is a request for NewPipe itself and that requests for adding a new service need to be made at [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor/issues)."
          required: true
        - label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
@@ -43,7 +44,7 @@ body:
        Describe any problem or limitation you come across while using the app which would be solved by this feature.
    validations:
      required: true
-      
+
  - type: textarea
    id: additional-information
    attributes:
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,6 +1,6 @@
 name: Question
 description: Ask about anything NewPipe-related
-labels: [question]
+labels: [question, needs triage]
 body:
  - type: markdown
    attributes:
@@ -16,6 +16,8 @@ body:
      options:
        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
          required: true
+        - label: "I have read the [FAQ](https://newpipe.net/FAQ/) and my question isn't listed."
+          required: true
        - label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
          required: true
        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
@@ -27,7 +29,7 @@ body:
      label: What is/are your question(s)?
    validations:
      required: true
-      
+
  - type: textarea
    id: additional-information
    attributes:
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,7 +25,7 @@
 <!-- Delete this if it doesn't apply to your PR. -->
 - 

-#### APK testing 
+#### APK testing
 <!-- Use a new, meaningfully named branch. The name is used as a suffix for the app ID to allow installing and testing multiple versions of NewPipe, e.g. "commentfix", if your PR implements a bugfix for comments. (No names like "patch-0" and "feature-1".)  -->
 <!-- Remove the following line if you directly link the APK created by the CI pipeline. Directly linking is preferred if you need to let users test.-->
 The APK can be found by going to the "Checks" tab below the title. On the left pane, click on "CI", scroll down to "artifacts" and click "app" to download the zip file which contains the debug APK of this PR.
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
    branches:
      - dev
      - master
-      - release/**
+      - release**
    paths-ignore:
      - 'README.md'
      - 'doc/**'
@@ -31,6 +31,10 @@ on:
 jobs:
  build-and-test-jvm:
    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
    steps:
      - uses: actions/checkout@v3
      - uses: gradle/wrapper-validation-action@v1
@@ -64,6 +68,10 @@ jobs:
      matrix:
        # api-level 19 is min sdk, but throws errors related to desugaring
        api-level: [ 21, 29 ]
+
+    permissions:
+      contents: read
+
    steps:
      - uses: actions/checkout@v3

@@ -81,7 +89,7 @@ jobs:
          # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
          emulator-build: 7425822
          script: ./gradlew connectedCheck --stacktrace
-        
+
      - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
        uses: actions/upload-artifact@v3
        if: failure()
@@ -91,6 +99,10 @@ jobs:

  sonar:
    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
    steps:
      - uses: actions/checkout@v3
        with:
--- a/.github/workflows/image-minimizer.yml
+++ b/.github/workflows/image-minimizer.yml
@@ -6,6 +6,10 @@ on:
  issues:
    types: [opened, edited]

+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
  try-minimize:
    runs-on: ubuntu-latest
--- a/.github/workflows/no-response.yml
+++ b/.github/workflows/no-response.yml
@@ -9,6 +9,10 @@ on:
    # Run daily at midnight.
    - cron: '0 0 * * *'

+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
  noResponse:
    runs-on: ubuntu-latest
@@ -17,4 +21,4 @@ jobs:
        with:
          token: ${{ github.token }}
          daysUntilClose: 14
-          responseRequiredLabel: waiting-for-author
+          responseRequiredLabel: waiting for author
--- a/README.md
+++ b/README.md
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,15 +14,12 @@ android {
    defaultConfig {
        applicationId "org.schabi.newpipe"
        resValue "string", "app_name", "NewPipe"
-        minSdk 19
+        minSdk 21
        targetSdk 29
-        versionCode 986
-        versionName "0.23.0"
-
-        multiDexEnabled true
+        versionCode 990
+        versionName "0.24.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true

        javaCompileOptions {
            annotationProcessorOptions {
@@ -98,22 +95,22 @@ android {
 }

 ext {
-    checkstyleVersion = '10.0'
+    checkstyleVersion = '10.3.1'

-    androidxLifecycleVersion = '2.3.1'
-    androidxRoomVersion = '2.4.2'
+    androidxLifecycleVersion = '2.5.1'
+    androidxRoomVersion = '2.4.3'
    androidxWorkVersion = '2.7.1'

    icepickVersion = '3.2.0'
-    exoPlayerVersion = '2.17.1'
+    exoPlayerVersion = '2.18.1'
    googleAutoServiceVersion = '1.0.1'
-    groupieVersion = '2.10.0'
+    groupieVersion = '2.10.1'
    markwonVersion = '4.6.2'

    leakCanaryVersion = '2.5'
    stethoVersion = '1.6.0'
    mockitoVersion = '4.0.0'
-    assertJVersion = '3.22.0'
+    assertJVersion = '3.23.1'
 }

 configurations {
@@ -182,7 +179,7 @@ sonarqube {

 dependencies {
 /** Desugaring **/
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'

 /** NewPipe libraries **/
    // You can use a local version by uncommenting a few lines in settings.gradle
@@ -190,27 +187,27 @@ dependencies {
    // name and the commit hash with the commit hash of the (pushed) commit you want to test
    // This works thanks to JitPack: https://jitpack.io/
    implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:ac1c22d81c65b7b0c5427f4e1989f5256d617f32'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:5c710da160f488bb40ab2cf4469bec9bd4cefd38'
+    implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'

 /** Checkstyle **/
    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
-    ktlint 'com.pinterest:ktlint:0.44.0'
+    ktlint 'com.pinterest:ktlint:0.45.2'

 /** Kotlin **/
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"

 /** AndroidX **/
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.8.0'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${androidxLifecycleVersion}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${androidxLifecycleVersion}"
    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
-    implementation 'androidx.media:media:1.5.0'
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.media:media:1.6.0'
    implementation 'androidx.preference:preference:1.2.0'
    implementation 'androidx.recyclerview:recyclerview:1.2.1'
    implementation "androidx.room:room-runtime:${androidxRoomVersion}"
@@ -220,11 +217,9 @@ dependencies {
    // Newer version specified to prevent accessibility regressions with RecyclerView, see:
    // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-    implementation 'androidx.webkit:webkit:1.4.0'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation "androidx.work:work-runtime:${androidxWorkVersion}"
    implementation "androidx.work:work-runtime-ktx:${androidxWorkVersion}"
    implementation "androidx.work:work-rxjava3:${androidxWorkVersion}"
+    implementation 'com.google.android.material:material:1.6.1'

 /** Third-party libraries **/
    // Instance state boilerplate elimination
@@ -232,14 +227,19 @@ dependencies {
    kapt "frankiesardo:icepick-processor:${icepickVersion}"

    // HTML parser
-    implementation "org.jsoup:jsoup:1.14.3"
+    implementation "org.jsoup:jsoup:1.15.3"

    // HTTP client
-    //noinspection GradleDependency --> do not update okhttp to keep supporting Android 4.4 users
-    implementation "com.squareup.okhttp3:okhttp:3.12.13"
+    implementation "com.squareup.okhttp3:okhttp:4.10.0"

    // Media player
-    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-dash:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-database:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-datasource:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-hls:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:${exoPlayerVersion}"
+    implementation "com.google.android.exoplayer:exoplayer-ui:${exoPlayerVersion}"
    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"

    // Metadata generator for service descriptors
@@ -258,11 +258,8 @@ dependencies {
    implementation "io.noties.markwon:core:${markwonVersion}"
    implementation "io.noties.markwon:linkify:${markwonVersion}"

-    // File picker
-    implementation "com.nononsenseapps:filepicker:4.2.1"
-
    // Crash reporting
-    implementation "ch.acra:acra-core:5.8.4"
+    implementation "ch.acra:acra-core:5.9.3"

    // Properly restarting
    implementation 'com.jakewharton:process-phoenix:2.1.2'
@@ -274,7 +271,7 @@ dependencies {
    implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"

    // Date and time formatting
-    implementation "org.ocpsoft.prettytime:prettytime:5.0.2.Final"
+    implementation "org.ocpsoft.prettytime:prettytime:5.0.3.Final"

 /** Debugging **/
    // Memory leak detection
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,7 +18,6 @@

 -dontobfuscate
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
-keep class org.ocpsoft.prettytime.i18n.** { *; }

 -keep class org.mozilla.javascript.** { *; }

@@ -26,9 +25,6 @@
 -keep class com.google.android.exoplayer2.** { *; }

 -dontwarn org.mozilla.javascript.tools.**
-dontwarn android.arch.util.paging.CountedDataSource
-dontwarn android.arch.persistence.room.paging.LimitOffsetDataSource
-

 # Rules for icepick. Copy paste from https://github.com/frankiesardo/icepick
 -dontwarn icepick.**
@@ -39,12 +35,11 @@
 }
 -keepnames class * { @icepick.State *;}

-# Rules for OkHttp. Copy paste from https://github.com/square/okhttp
+## Rules for OkHttp. Copy paste from https://github.com/square/okhttp
 -dontwarn okhttp3.**
 -dontwarn okio.**
-dontwarn javax.annotation.**
-# A resource is loaded with a relative path so the package of this class must be preserved.
-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+##
+
 -keepclassmembers class * implements java.io.Serializable {
    static final long serialVersionUID;
    !static !transient <fields>;
--- a/app/src/androidTest/java/org/schabi/newpipe/util/StreamItemAdapterTest.kt
+++ b/app/src/androidTest/java/org/schabi/newpipe/util/StreamItemAdapterTest.kt
@@ -91,7 +91,12 @@ class StreamItemAdapterTest {
            context,
            StreamItemAdapter.StreamSizeWrapper(
                (0 until 5).map {
-                    SubtitlesStream(MediaFormat.SRT, "pt-BR", "https://example.com", false)
+                    SubtitlesStream.Builder()
+                        .setContent("https://example.com", true)
+                        .setMediaFormat(MediaFormat.SRT)
+                        .setLanguageCode("pt-BR")
+                        .setAutoGenerated(false)
+                        .build()
                },
                context
            ),
@@ -108,7 +113,14 @@ class StreamItemAdapterTest {
        val adapter = StreamItemAdapter<AudioStream, Stream>(
            context,
            StreamItemAdapter.StreamSizeWrapper(
-                (0 until 5).map { AudioStream("https://example.com/$it", MediaFormat.OPUS, 192) },
+                (0 until 5).map {
+                    AudioStream.Builder()
+                        .setId(Stream.ID_UNKNOWN)
+                        .setContent("https://example.com/$it", true)
+                        .setMediaFormat(MediaFormat.OPUS)
+                        .setAverageBitrate(192)
+                        .build()
+                },
                context
            ),
            null
@@ -126,7 +138,13 @@ class StreamItemAdapterTest {
    private fun getVideoStreams(vararg videoOnly: Boolean) =
        StreamItemAdapter.StreamSizeWrapper(
            videoOnly.map {
-                VideoStream("https://example.com", MediaFormat.MPEG_4, "720p", it)
+                VideoStream.Builder()
+                    .setId(Stream.ID_UNKNOWN)
+                    .setContent("https://example.com", true)
+                    .setMediaFormat(MediaFormat.MPEG_4)
+                    .setResolution("720p")
+                    .setIsVideoOnly(it)
+                    .build()
            },
            context
        )
@@ -138,8 +156,16 @@ class StreamItemAdapterTest {
    private fun getAudioStreams(vararg shouldBeValid: Boolean) =
        getSecondaryStreamsFromList(
            shouldBeValid.map {
-                if (it) AudioStream("https://example.com", MediaFormat.OPUS, 192)
-                else null
+                if (it) {
+                    AudioStream.Builder()
+                        .setId(Stream.ID_UNKNOWN)
+                        .setContent("https://example.com", true)
+                        .setMediaFormat(MediaFormat.OPUS)
+                        .setAverageBitrate(192)
+                        .build()
+                } else {
+                    null
+                }
            }
        )

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
        </receiver>

        <service
-            android:name=".player.MainPlayer"
+            android:name=".player.PlayerService"
            android:exported="false"
            android:foregroundServiceType="mediaPlayback">
            <intent-filter>
--- a/app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapterMenuWorkaround.java
+++ b/app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapterMenuWorkaround.java
@@ -282,11 +282,9 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
    @Nullable
    public Parcelable saveState() {
        Bundle state = null;
-        if (mSavedState.size() > 0) {
+        if (!mSavedState.isEmpty()) {
            state = new Bundle();
-            final Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
-            mSavedState.toArray(fss);
-            state.putParcelableArray("states", fss);
+            state.putParcelableArray("states", mSavedState.toArray(new Fragment.SavedState[0]));
        }
        for (int i = 0; i < mFragments.size(); i++) {
            final Fragment f = mFragments.get(i);
--- a/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
+++ b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
@@ -14,7 +14,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import org.schabi.newpipe.R;

 import java.lang.reflect.Field;
-import java.util.Arrays;
 import java.util.List;

 // See https://stackoverflow.com/questions/56849221#57997489
@@ -27,7 +26,7 @@ public final class FlingBehavior extends AppBarLayout.Behavior {

    private boolean allowScroll = true;
    private final Rect globalRect = new Rect();
-    private final List<Integer> skipInterceptionOfElements = Arrays.asList(
+    private final List<Integer> skipInterceptionOfElements = List.of(
            R.id.itemsListPanel, R.id.playbackSeekBar,
            R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);

@@ -67,7 +66,7 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
    public boolean onInterceptTouchEvent(@NonNull final CoordinatorLayout parent,
                                         @NonNull final AppBarLayout child,
                                         @NonNull final MotionEvent ev) {
-        for (final Integer element : skipInterceptionOfElements) {
+        for (final int element : skipInterceptionOfElements) {
            final View view = child.findViewById(element);
            if (view != null) {
                final boolean visible = view.getGlobalVisibleRect(globalRect);
@@ -132,8 +131,8 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
        try {
            final Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass();
            if (headerBehaviorType != null) {
-                final Field field
-                        = headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
+                final Field field =
+                        headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
                field.setAccessible(true);
                return field;
            }
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe;

+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
@@ -7,7 +8,6 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationChannelCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;

 import com.jakewharton.processphoenix.ProcessPhoenix;
@@ -27,9 +27,8 @@ import org.schabi.newpipe.util.StateSaver;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Objects;

 import io.reactivex.rxjava3.exceptions.CompositeException;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
@@ -56,7 +55,7 @@ import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

-public class App extends MultiDexApplication {
+public class App extends Application {
    public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
    private static final String TAG = App.class.toString();
    private static App app;
@@ -140,7 +139,7 @@ public class App extends MultiDexApplication {
                if (throwable instanceof UndeliverableException) {
                    // As UndeliverableException is a wrapper,
                    // get the cause of it to get the "real" exception
-                    actualThrowable = throwable.getCause();
+                    actualThrowable = Objects.requireNonNull(throwable.getCause());
                } else {
                    actualThrowable = throwable;
                }
@@ -149,7 +148,7 @@ public class App extends MultiDexApplication {
                if (actualThrowable instanceof CompositeException) {
                    errors = ((CompositeException) actualThrowable).getExceptions();
                } else {
-                    errors = Collections.singletonList(actualThrowable);
+                    errors = List.of(actualThrowable);
                }

                for (final Throwable error : errors) {
@@ -205,7 +204,7 @@ public class App extends MultiDexApplication {
            return;
        }

-        final CoreConfigurationBuilder acraConfig = new CoreConfigurationBuilder(this)
+        final CoreConfigurationBuilder acraConfig = new CoreConfigurationBuilder()
                .withBuildConfigClass(BuildConfig.class);
        ACRA.init(this, acraConfig);
    }
@@ -213,41 +212,37 @@ public class App extends MultiDexApplication {
    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 = new ArrayList<>();
-        notificationChannelCompats.add(new NotificationChannelCompat
-                .Builder(getString(R.string.notification_channel_id),
+        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());
-
-        notificationChannelCompats.add(new NotificationChannelCompat
-                .Builder(getString(R.string.app_update_notification_channel_id),
+                        .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());
-
-        notificationChannelCompats.add(new NotificationChannelCompat
-                .Builder(getString(R.string.hash_channel_id),
+                        .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());
-
-        notificationChannelCompats.add(new NotificationChannelCompat
-                .Builder(getString(R.string.error_report_channel_id),
+                        .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());
-
-        notificationChannelCompats.add(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());
+                        .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);
--- a/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/DownloaderImpl.java
@@ -1,7 +1,6 @@
 package org.schabi.newpipe;

 import android.content.Context;
-import android.os.Build;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -12,40 +11,27 @@ import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.downloader.Request;
 import org.schabi.newpipe.extractor.downloader.Response;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.util.CookieUtils;
 import org.schabi.newpipe.util.InfoCache;
-import org.schabi.newpipe.util.TLSSocketFactoryCompat;

 import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import okhttp3.CipherSuite;
-import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;

-import static org.schabi.newpipe.MainActivity.DEBUG;
-
 public final class DownloaderImpl extends Downloader {
-    public static final String USER_AGENT
-            = "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0";
-    public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY
-            = "youtube_restricted_mode_key";
+    public static final String USER_AGENT =
+            "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0";
+    public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY =
+            "youtube_restricted_mode_key";
    public static final String YOUTUBE_RESTRICTED_MODE_COOKIE = "PREF=f2=8000000";
    public static final String YOUTUBE_DOMAIN = "youtube.com";

@@ -54,9 +40,6 @@ public final class DownloaderImpl extends Downloader {
    private final OkHttpClient client;

    private DownloaderImpl(final OkHttpClient.Builder builder) {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-            enableModernTLS(builder);
-        }
        this.client = builder
                .readTimeout(30, TimeUnit.SECONDS)
 //                .cache(new Cache(new File(context.getExternalCacheDir(), "okhttp"),
@@ -81,69 +64,16 @@ public final class DownloaderImpl extends Downloader {
        return instance;
    }

-    /**
-     * Enable TLS 1.2 and 1.1 on Android Kitkat. This function is mostly taken
-     * from the documentation of OkHttpClient.Builder.sslSocketFactory(_,_).
-     * <p>
-     * If there is an error, the function will safely fall back to doing nothing
-     * and printing the error to the console.
-     * </p>
-     *
-     * @param builder The HTTPClient Builder on which TLS is enabled on (will be modified in-place)
-     */
-    private static void enableModernTLS(final OkHttpClient.Builder builder) {
-        try {
-            // get the default TrustManager
-            final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-                    TrustManagerFactory.getDefaultAlgorithm());
-            trustManagerFactory.init((KeyStore) null);
-            final TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-            if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
-                throw new IllegalStateException("Unexpected default trust managers:"
-                        + Arrays.toString(trustManagers));
-            }
-            final X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
-
-            // insert our own TLSSocketFactory
-            final SSLSocketFactory sslSocketFactory = TLSSocketFactoryCompat.getInstance();
-
-            builder.sslSocketFactory(sslSocketFactory, trustManager);
-
-            // This will try to enable all modern CipherSuites(+2 more)
-            // that are supported on the device.
-            // Necessary because some servers (e.g. Framatube.org)
-            // don't support the old cipher suites.
-            // https://github.com/square/okhttp/issues/4053#issuecomment-402579554
-            final List<CipherSuite> cipherSuites =
-                    new ArrayList<>(ConnectionSpec.MODERN_TLS.cipherSuites());
-            cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
-            cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
-            final ConnectionSpec legacyTLS = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                    .cipherSuites(cipherSuites.toArray(new CipherSuite[0]))
-                    .build();
-
-            builder.connectionSpecs(Arrays.asList(legacyTLS, ConnectionSpec.CLEARTEXT));
-        } catch (final KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
-            if (DEBUG) {
-                e.printStackTrace();
-            }
-        }
-    }
-
    public String getCookies(final String url) {
-        final List<String> resultCookies = new ArrayList<>();
-        if (url.contains(YOUTUBE_DOMAIN)) {
-            final String youtubeCookie = getCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY);
-            if (youtubeCookie != null) {
-                resultCookies.add(youtubeCookie);
-            }
-        }
+        final String youtubeCookie = url.contains(YOUTUBE_DOMAIN)
+                ? getCookie(YOUTUBE_RESTRICTED_MODE_COOKIE_KEY) : null;
+
        // Recaptcha cookie is always added TODO: not sure if this is necessary
-        final String recaptchaCookie = getCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY);
-        if (recaptchaCookie != null) {
-            resultCookies.add(recaptchaCookie);
-        }
-        return CookieUtils.concatCookies(resultCookies);
+        return Stream.of(youtubeCookie, getCookie(ReCaptchaActivity.RECAPTCHA_COOKIES_KEY))
+                .filter(Objects::nonNull)
+                .flatMap(cookies -> Arrays.stream(cookies.split("; *")))
+                .distinct()
+                .collect(Collectors.joining("; "));
    }

    public String getCookie(final String key) {
@@ -203,7 +133,7 @@ public final class DownloaderImpl extends Downloader {

        RequestBody requestBody = null;
        if (dataToSend != null) {
-            requestBody = RequestBody.create(null, dataToSend);
+            requestBody = RequestBody.create(dataToSend);
        }

        final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
--- a/app/src/main/java/org/schabi/newpipe/ExitActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ExitActivity.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;

 import org.schabi.newpipe.util.NavigationHelper;
@@ -44,11 +43,7 @@ public class ExitActivity extends Activity {
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            finishAndRemoveTask();
-        } else {
-            finish();
-        }
+        finishAndRemoveTask();

        NavigationHelper.restartApp(this);
    }
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -28,7 +28,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -86,7 +85,6 @@ import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
-import org.schabi.newpipe.util.TLSSocketFactoryCompat;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.FocusOverlayView;

@@ -131,11 +129,6 @@ public class MainActivity extends AppCompatActivity {
                    + "savedInstanceState = [" + savedInstanceState + "]");
        }

-        // enable TLS1.1/1.2 for kitkat devices, to fix download and play for media.ccc.de sources
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
-            TLSSocketFactoryCompat.setAsDefault();
-        }
-
        ThemeHelper.setDayNightMode(this);
        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));

@@ -381,8 +374,7 @@ public class MainActivity extends AppCompatActivity {

    private void showServices() {
        for (final StreamingService s : NewPipe.getServices()) {
-            final String title = s.getServiceInfo().getName()
-                    + (ServiceHelper.isBeta(s) ? " (beta)" : "");
+            final String title = s.getServiceInfo().getName();

            final MenuItem menuItem = drawerLayoutBinding.navigation.getMenu()
                    .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
@@ -390,7 +382,7 @@ public class MainActivity extends AppCompatActivity {

            // peertube specifics
            if (s.getServiceId() == 3) {
-                enhancePeertubeMenu(s, menuItem);
+                enhancePeertubeMenu(menuItem);
            }
        }
        drawerLayoutBinding.navigation.getMenu()
@@ -398,9 +390,9 @@ public class MainActivity extends AppCompatActivity {
                .setChecked(true);
    }

-    private void enhancePeertubeMenu(final StreamingService s, final MenuItem menuItem) {
+    private void enhancePeertubeMenu(final MenuItem menuItem) {
        final PeertubeInstance currentInstance = PeertubeHelper.getCurrentInstance();
-        menuItem.setTitle(currentInstance.getName() + (ServiceHelper.isBeta(s) ? " (beta)" : ""));
+        menuItem.setTitle(currentInstance.getName());
        final Spinner spinner = InstanceSpinnerLayoutBinding.inflate(LayoutInflater.from(this))
                .getRoot();
        final List<PeertubeInstance> instances = PeertubeHelper.getInstanceList(this);
@@ -480,8 +472,8 @@ public class MainActivity extends AppCompatActivity {
            ErrorUtil.showUiErrorSnackbar(this, "Setting up service toggle", e);
        }

-        final SharedPreferences sharedPreferences
-                = PreferenceManager.getDefaultSharedPreferences(this);
+        final SharedPreferences sharedPreferences =
+                PreferenceManager.getDefaultSharedPreferences(this);
        if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
            if (DEBUG) {
                Log.d(TAG, "Theme has changed, recreating activity...");
@@ -653,8 +645,8 @@ public class MainActivity extends AppCompatActivity {
        }
        super.onCreateOptionsMenu(menu);

-        final Fragment fragment
-                = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        final Fragment fragment =
+                getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
        if (!(fragment instanceof SearchFragment)) {
            toolbarLayoutBinding.toolbarSearchContainer.getRoot().setVisibility(View.GONE);
        }
--- a/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;

 /*
@@ -40,10 +39,6 @@ public class PanicResponderActivity extends Activity {
            ExitActivity.exitAndRemoveFromRecentApps(this);
        }

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            finishAndRemoveTask();
-        } else {
-            finish();
-        }
+        finishAndRemoveTask();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
@@ -16,7 +16,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.SparseItemUtil;

-import java.util.Collections;
+import java.util.List;

 public final class QueueItemMenuUtil {
    private QueueItemMenuUtil() {
@@ -53,7 +53,7 @@ public final class QueueItemMenuUtil {
                case R.id.menu_item_append_playlist:
                    PlaylistDialog.createCorrespondingDialog(
                            context,
-                            Collections.singletonList(new StreamEntity(item)),
+                            List.of(new StreamEntity(item)),
                            dialog -> dialog.show(
                                    fragmentManager,
                                    "QueueItemMenuUtil@append_playlist"
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt
@@ -8,7 +8,6 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.schabi.newpipe.R
-import org.schabi.newpipe.about.LicenseFragmentHelper.showLicense
 import org.schabi.newpipe.databinding.FragmentLicensesBinding
 import org.schabi.newpipe.databinding.ItemSoftwareComponentBinding

--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt
@@ -12,126 +12,92 @@ import org.schabi.newpipe.R
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.ThemeHelper
 import org.schabi.newpipe.util.external_communication.ShareUtils
-import java.io.BufferedReader
 import java.io.IOException
-import java.io.InputStreamReader
-import java.nio.charset.StandardCharsets

-object LicenseFragmentHelper {
-    /**
-     * @param context the context to use
-     * @param license the license
-     * @return String which contains a HTML formatted license page
-     * styled according to the context's theme
-     */
-    private fun getFormattedLicense(context: Context, license: License): String {
-        val licenseContent = StringBuilder()
-        val webViewData: String
-        try {
-            BufferedReader(
-                InputStreamReader(
-                    context.assets.open(license.filename),
-                    StandardCharsets.UTF_8
-                )
-            ).use { `in` ->
-                var str: String?
-                while (`in`.readLine().also { str = it } != null) {
-                    licenseContent.append(str)
-                }
+/**
+ * @param context the context to use
+ * @param license the license
+ * @return String which contains a HTML formatted license page
+ * styled according to the context's theme
+ */
+private fun getFormattedLicense(context: Context, license: License): String {
+    try {
+        return context.assets.open(license.filename).bufferedReader().use { it.readText() }
+            // split the HTML file and insert the stylesheet into the HEAD of the file
+            .replace("</head>", "<style>${getLicenseStylesheet(context)}</style></head>")
+    } catch (e: IOException) {
+        throw IllegalArgumentException("Could not get license file: ${license.filename}", e)
+    }
+}

-                // split the HTML file and insert the stylesheet into the HEAD of the file
-                webViewData = "$licenseContent".replace(
-                    "</head>",
-                    "<style>" + getLicenseStylesheet(context) + "</style></head>"
-                )
-            }
-        } catch (e: IOException) {
-            throw IllegalArgumentException(
-                "Could not get license file: " + license.filename, e
-            )
+/**
+ * @param context the Android context
+ * @return String which is a CSS stylesheet according to the context's theme
+ */
+private fun getLicenseStylesheet(context: Context): String {
+    val isLightTheme = ThemeHelper.isLightThemeSelected(context)
+    val licenseBackgroundColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_license_background_color else R.color.dark_license_background_color
+    )
+    val licenseTextColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_license_text_color else R.color.dark_license_text_color
+    )
+    val youtubePrimaryColor = getHexRGBColor(
+        context, if (isLightTheme) R.color.light_youtube_primary_color else R.color.dark_youtube_primary_color
+    )
+    return "body{padding:12px 15px;margin:0;background:#$licenseBackgroundColor;color:#$licenseTextColor}" +
+        "a[href]{color:#$youtubePrimaryColor}pre{white-space:pre-wrap}"
+}
+
+/**
+ * Cast R.color to a hexadecimal color value.
+ *
+ * @param context the context to use
+ * @param color   the color number from R.color
+ * @return a six characters long String with hexadecimal RGB values
+ */
+private fun getHexRGBColor(context: Context, color: Int): String {
+    return context.getString(color).substring(3)
+}
+
+fun showLicense(context: Context?, component: SoftwareComponent): Disposable {
+    return showLicense(context, component.license) {
+        setPositiveButton(R.string.dismiss) { dialog, _ ->
+            dialog.dismiss()
        }
-        return webViewData
-    }
-
-    /**
-     * @param context the Android context
-     * @return String which is a CSS stylesheet according to the context's theme
-     */
-    private fun getLicenseStylesheet(context: Context): String {
-        val isLightTheme = ThemeHelper.isLightThemeSelected(context)
-        return (
-            "body{padding:12px 15px;margin:0;" + "background:#" + getHexRGBColor(
-                context,
-                if (isLightTheme) R.color.light_license_background_color
-                else R.color.dark_license_background_color
-            ) + ";" + "color:#" + getHexRGBColor(
-                context,
-                if (isLightTheme) R.color.light_license_text_color
-                else R.color.dark_license_text_color
-            ) + "}" + "a[href]{color:#" + getHexRGBColor(
-                context,
-                if (isLightTheme) R.color.light_youtube_primary_color
-                else R.color.dark_youtube_primary_color
-            ) + "}" + "pre{white-space:pre-wrap}"
-            )
-    }
-
-    /**
-     * Cast R.color to a hexadecimal color value.
-     *
-     * @param context the context to use
-     * @param color   the color number from R.color
-     * @return a six characters long String with hexadecimal RGB values
-     */
-    private fun getHexRGBColor(context: Context, color: Int): String {
-        return context.getString(color).substring(3)
-    }
-
-    fun showLicense(context: Context?, license: License): Disposable {
-        return showLicense(context, license) { alertDialog ->
-            alertDialog.setPositiveButton(R.string.ok) { dialog, _ ->
-                dialog.dismiss()
-            }
-        }
-    }
-
-    fun showLicense(context: Context?, component: SoftwareComponent): Disposable {
-        return showLicense(context, component.license) { alertDialog ->
-            alertDialog.setPositiveButton(R.string.dismiss) { dialog, _ ->
-                dialog.dismiss()
-            }
-            alertDialog.setNeutralButton(R.string.open_website_license) { _, _ ->
-                ShareUtils.openUrlInBrowser(context!!, component.link)
-            }
-        }
-    }
-
-    private fun showLicense(
-        context: Context?,
-        license: License,
-        block: (AlertDialog.Builder) -> Unit
-    ): Disposable {
-        return if (context == null) {
-            Disposable.empty()
-        } else {
-            Observable.fromCallable { getFormattedLicense(context, license) }
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe { formattedLicense ->
-                    val webViewData = Base64.encodeToString(
-                        formattedLicense.toByteArray(StandardCharsets.UTF_8), Base64.NO_PADDING
-                    )
-                    val webView = WebView(context)
-                    webView.loadData(webViewData, "text/html; charset=UTF-8", "base64")
-
-                    AlertDialog.Builder(context).apply {
-                        setTitle(license.name)
-                        setView(webView)
-                        Localization.assureCorrectAppLanguage(context)
-                        block(this)
-                        show()
-                    }
-                }
+        setNeutralButton(R.string.open_website_license) { _, _ ->
+            ShareUtils.openUrlInBrowser(context!!, component.link)
        }
    }
 }
+
+fun showLicense(context: Context?, license: License) = showLicense(context, license) {
+    setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
+}
+
+private fun showLicense(
+    context: Context?,
+    license: License,
+    block: AlertDialog.Builder.() -> AlertDialog.Builder
+): Disposable {
+    return if (context == null) {
+        Disposable.empty()
+    } else {
+        Observable.fromCallable { getFormattedLicense(context, license) }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe { formattedLicense ->
+                val webViewData =
+                    Base64.encodeToString(formattedLicense.toByteArray(), Base64.NO_PADDING)
+                val webView = WebView(context)
+                webView.loadData(webViewData, "text/html; charset=UTF-8", "base64")
+
+                Localization.assureCorrectAppLanguage(context)
+                AlertDialog.Builder(context)
+                    .setTitle(license.name)
+                    .setView(webView)
+                    .block()
+                    .show()
+            }
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe.database;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Update;

 import java.util.Collection;
@@ -14,13 +13,10 @@ import io.reactivex.rxjava3.core.Flowable;
@Dao
 public interface BasicDAO<Entity> {
    /* Inserts */
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert
    long insert(Entity entity);

-    @Insert(onConflict = OnConflictStrategy.ABORT)
-    List<Long> insertAll(Entity... entities);
-
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert
    List<Long> insertAll(Collection<Entity> entities);

    /* Searches */
@@ -32,9 +28,6 @@ public interface BasicDAO<Entity> {
    @Delete
    void delete(Entity entity);

-    @Delete
-    int delete(Collection<Entity> entities);
-
    int deleteAll();

    /* Updates */
--- a/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
+++ b/app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
@@ -9,6 +9,7 @@ import androidx.room.Update
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
 import org.schabi.newpipe.database.feed.model.FeedEntity
+import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.StreamWithState
 import org.schabi.newpipe.database.stream.model.StreamStateEntity
@@ -21,56 +22,16 @@ abstract class FeedDAO {
    @Query("DELETE FROM feed")
    abstract fun deleteAll(): Int

-    @Query(
-        """
-        SELECT s.*, sst.progress_time
-        FROM streams s
-
-        LEFT JOIN stream_state sst
-        ON s.uid = sst.stream_id
-
-        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id
-
-        INNER JOIN feed f
-        ON s.uid = f.stream_id
-
-        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
-        LIMIT 500
-        """
-    )
-    abstract fun getAllStreams(): Maybe<List<StreamWithState>>
-
-    @Query(
-        """
-        SELECT s.*, sst.progress_time
-        FROM streams s
-
-        LEFT JOIN stream_state sst
-        ON s.uid = sst.stream_id
-
-        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id
-
-        INNER JOIN feed f
-        ON s.uid = f.stream_id
-
-        INNER JOIN feed_group_subscription_join fgs
-        ON fgs.subscription_id = f.subscription_id
-
-        WHERE fgs.group_id = :groupId
-
-        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
-        LIMIT 500
-        """
-    )
-    abstract fun getAllStreamsForGroup(groupId: Long): Maybe<List<StreamWithState>>
-
    /**
+     * @param groupId          the group id to get feed streams of; use
+     *                         [FeedGroupEntity.GROUP_ALL_ID] to not filter by group
+     * @param includePlayed    if false, only return all of the live, never-played or non-finished
+     *                         feed streams (see `@see` items); if true no filter is applied
+     * @param uploadDateBefore get only streams uploaded before this date (useful to filter out
+     *                         future streams); use null to not filter by upload date
+     * @return the feed streams filtered according to the conditions provided in the parameters
     * @see StreamStateEntity.isFinished()
     * @see StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS
-     * @return all of the non-live, never-played and non-finished streams in the feed
-     *         (all of the cited conditions must hold for a stream to be in the returned list)
     */
    @Query(
        """
@@ -79,67 +40,44 @@ abstract class FeedDAO {

        LEFT JOIN stream_state sst
        ON s.uid = sst.stream_id
-
+        
        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id    
-            
+        ON s.uid = sh.stream_id
+        
        INNER JOIN feed f
        ON s.uid = f.stream_id

+        LEFT JOIN feed_group_subscription_join fgs
+        ON fgs.subscription_id = f.subscription_id
+
        WHERE (
-            sh.stream_id IS NULL
-            OR sst.stream_id IS NULL
-            OR sst.progress_time < s.duration * 1000 - ${StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS}
-            OR sst.progress_time < s.duration * 1000 * 3 / 4
-            OR s.stream_type = 'LIVE_STREAM'
-            OR s.stream_type = 'AUDIO_LIVE_STREAM'
+            :groupId = ${FeedGroupEntity.GROUP_ALL_ID}
+            OR fgs.group_id = :groupId
        )
-
-        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
-        LIMIT 500
-        """
-    )
-    abstract fun getLiveOrNotPlayedStreams(): Maybe<List<StreamWithState>>
-
-    /**
-     * @see StreamStateEntity.isFinished()
-     * @see StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS
-     * @param groupId the group id to get streams of
-     * @return all of the non-live, never-played and non-finished streams for the given feed group
-     *         (all of the cited conditions must hold for a stream to be in the returned list)
-     */
-    @Query(
-        """
-        SELECT s.*, sst.progress_time
-        FROM streams s
-
-        LEFT JOIN stream_state sst
-        ON s.uid = sst.stream_id
-        
-        LEFT JOIN stream_history sh
-        ON s.uid = sh.stream_id
-        
-        INNER JOIN feed f
-        ON s.uid = f.stream_id
-
-        INNER JOIN feed_group_subscription_join fgs
-        ON fgs.subscription_id = f.subscription_id
-
-        WHERE fgs.group_id = :groupId
        AND (
-            sh.stream_id IS NULL
+            :includePlayed
+            OR sh.stream_id IS NULL
            OR sst.stream_id IS NULL
            OR sst.progress_time < s.duration * 1000 - ${StreamStateEntity.PLAYBACK_FINISHED_END_MILLISECONDS}
            OR sst.progress_time < s.duration * 1000 * 3 / 4
            OR s.stream_type = 'LIVE_STREAM'
            OR s.stream_type = 'AUDIO_LIVE_STREAM'
        )
+        AND (
+            :uploadDateBefore IS NULL
+            OR s.upload_date IS NULL
+            OR s.upload_date < :uploadDateBefore
+        )

        ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
        LIMIT 500
        """
    )
-    abstract fun getLiveOrNotPlayedStreamsForGroup(groupId: Long): Maybe<List<StreamWithState>>
+    abstract fun getStreams(
+        groupId: Long,
+        includePlayed: Boolean,
+        uploadDateBefore: OffsetDateTime?
+    ): Maybe<List<StreamWithState>>

    @Query(
        """
--- a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java
@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
-import androidx.room.Ignore;
 import androidx.room.Index;

 import org.schabi.newpipe.database.stream.model.StreamEntity;
@@ -42,18 +41,19 @@ public class StreamHistoryEntity {
    @ColumnInfo(name = STREAM_REPEAT_COUNT)
    private long repeatCount;

-    public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate,
+    /**
+     * @param streamUid the stream id this history item will refer to
+     * @param accessDate the last time the stream was accessed
+     * @param repeatCount the total number of views this stream received
+     */
+    public StreamHistoryEntity(final long streamUid,
+                               @NonNull final OffsetDateTime accessDate,
                               final long repeatCount) {
        this.streamUid = streamUid;
        this.accessDate = accessDate;
        this.repeatCount = repeatCount;
    }

-    @Ignore
-    public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate) {
-        this(streamUid, accessDate, 1);
-    }
-
    public long getStreamUid() {
        return streamUid;
    }
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java
@@ -3,10 +3,10 @@ package org.schabi.newpipe.database.playlist;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;

-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 public interface PlaylistLocalItem extends LocalItem {
    String getOrderingName();
@@ -14,14 +14,9 @@ public interface PlaylistLocalItem extends LocalItem {
    static List<PlaylistLocalItem> merge(
            final List<PlaylistMetadataEntry> localPlaylists,
            final List<PlaylistRemoteEntity> remotePlaylists) {
-        final List<PlaylistLocalItem> items = new ArrayList<>(
-                localPlaylists.size() + remotePlaylists.size());
-        items.addAll(localPlaylists);
-        items.addAll(remotePlaylists);
-
-        Collections.sort(items, Comparator.comparing(PlaylistLocalItem::getOrderingName,
-                Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
-
-        return items;
+        return Stream.concat(localPlaylists.stream(), remotePlaylists.stream())
+                .sorted(Comparator.comparing(PlaylistLocalItem::getOrderingName,
+                        Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)))
+                .collect(Collectors.toList());
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt
@@ -12,8 +12,7 @@ import org.schabi.newpipe.database.BasicDAO
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_ID
 import org.schabi.newpipe.extractor.stream.StreamType
-import org.schabi.newpipe.extractor.stream.StreamType.AUDIO_LIVE_STREAM
-import org.schabi.newpipe.extractor.stream.StreamType.LIVE_STREAM
+import org.schabi.newpipe.util.StreamTypeUtil
 import java.time.OffsetDateTime

@Dao
@@ -91,8 +90,7 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
            ?: throw IllegalStateException("Stream cannot be null just after insertion.")
        newerStream.uid = existentMinimalStream.uid

-        val isNewerStreamLive = newerStream.streamType == AUDIO_LIVE_STREAM || newerStream.streamType == LIVE_STREAM
-        if (!isNewerStreamLive) {
+        if (!StreamTypeUtil.isLiveStream(newerStream.streamType)) {

            // Use the existent upload date if the newer stream does not have a better precision
            // (i.e. is an approximation). This is done to prevent unnecessary changes.
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
@@ -31,6 +31,7 @@ import org.schabi.newpipe.util.external_communication.ShareUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.stream.Collectors;

 /*
 * Created by Christian Schabesberger on 24.10.15.
@@ -65,11 +66,11 @@ public class ErrorActivity extends AppCompatActivity {
    public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
    public static final String ERROR_EMAIL_SUBJECT = "Exception in ";

-    public static final String ERROR_GITHUB_ISSUE_URL
-            = "https://github.com/TeamNewPipe/NewPipe/issues";
+    public static final String ERROR_GITHUB_ISSUE_URL =
+            "https://github.com/TeamNewPipe/NewPipe/issues";

-    public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER
-            = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+    public static final DateTimeFormatter CURRENT_TIMESTAMP_FORMATTER =
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");


    private ErrorInfo errorInfo;
@@ -182,14 +183,9 @@ public class ErrorActivity extends AppCompatActivity {
    }

    private String formErrorText(final String[] el) {
-        final StringBuilder text = new StringBuilder();
-        if (el != null) {
-            for (final String e : el) {
-                text.append("-------------------------------------\n").append(e);
-            }
-        }
-        text.append("-------------------------------------");
-        return text.toString();
+        final String separator = "-------------------------------------";
+        return Arrays.stream(el)
+                .collect(Collectors.joining(separator + "\n", separator + "\n", separator));
    }

    /**
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
@@ -7,15 +7,13 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.Info
-import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
 import org.schabi.newpipe.ktx.isNetworkRelated
-import java.io.PrintWriter
-import java.io.StringWriter
+import org.schabi.newpipe.util.ServiceHelper

@Parcelize
 class ErrorInfo(
@@ -65,7 +63,7 @@ class ErrorInfo(
    constructor(throwable: Throwable, userAction: UserAction, request: String) :
        this(throwable, userAction, SERVICE_NONE, request)
    constructor(throwable: Throwable, userAction: UserAction, request: String, serviceId: Int) :
-        this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
    constructor(throwable: Throwable, userAction: UserAction, request: String, info: Info?) :
        this(throwable, userAction, getInfoServiceName(info), request)

@@ -73,29 +71,20 @@ class ErrorInfo(
    constructor(throwable: List<Throwable>, userAction: UserAction, request: String) :
        this(throwable, userAction, SERVICE_NONE, request)
    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, serviceId: Int) :
-        this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, info: Info?) :
        this(throwable, userAction, getInfoServiceName(info), request)

    companion object {
        const val SERVICE_NONE = "none"

-        private fun getStackTrace(throwable: Throwable): String {
-            StringWriter().use { stringWriter ->
-                PrintWriter(stringWriter, true).use { printWriter ->
-                    throwable.printStackTrace(printWriter)
-                    return stringWriter.buffer.toString()
-                }
-            }
-        }
+        fun throwableToStringList(throwable: Throwable) = arrayOf(throwable.stackTraceToString())

-        fun throwableToStringList(throwable: Throwable) = arrayOf(getStackTrace(throwable))
-
-        fun throwableListToStringList(throwable: List<Throwable>) =
-            Array(throwable.size) { i -> getStackTrace(throwable[i]) }
+        fun throwableListToStringList(throwableList: List<Throwable>) =
+            throwableList.map { it.stackTraceToString() }.toTypedArray()

        private fun getInfoServiceName(info: Info?) =
-            if (info == null) SERVICE_NONE else NewPipe.getNameOfService(info.serviceId)
+            if (info == null) SERVICE_NONE else ServiceHelper.getNameOfServiceById(info.serviceId)

        @StringRes
        private fun getMessageStringId(
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
@@ -15,7 +15,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.Disposable
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
-import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
@@ -106,7 +105,7 @@ class ErrorPanelHelper(
            if (!isNullOrEmpty((errorInfo.throwable as AccountTerminatedException).message)) {
                errorServiceInfoTextView.text = context.resources.getString(
                    R.string.service_provides_reason,
-                    NewPipe.getNameOfService(ServiceHelper.getSelectedServiceId(context))
+                    ServiceHelper.getSelectedService(context)?.serviceInfo?.name ?: "<unknown>"
                )
                errorServiceInfoTextView.isVisible = true

--- a/Show More
+++ b/Show More