Merge dev into refactor

app/build.gradle.kts

@@ -24,13 +24,8 @@ val gitWorkingBranch = providers.exec {
     commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
 }.standardOutput.asText.map { it.trim() }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 kotlin {
+    jvmToolchain(21)
     compilerOptions {
         // TODO: Drop annotation default target when it is stable
         freeCompilerArgs.addAll(
@@ -142,13 +137,6 @@ ksp {
 // Custom dependency configuration for ktlint
 val ktlint by configurations.creating
 
-// https://checkstyle.org/#JRE_and_JDK
-tasks.withType<Checkstyle>().configureEach {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
-}
-
 checkstyle {
     configDirectory = rootProject.file("checkstyle")
     isIgnoreFailures = false
@@ -220,7 +208,6 @@ 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 {

app/proguard-rules.pro

@@ -16,11 +16,6 @@
 -dontwarn javax.script.**
 -keep class jdk.dynalink.** { *; }
 -dontwarn jdk.dynalink.**
-# Rules for jsoup
-# Ignore intended-to-be-optional re2j classes - only needed if using re2j for jsoup regex
-# jsoup safely falls back to JDK regex if re2j not on classpath, but has concrete re2j refs
-# See https://github.com/jhy/jsoup/issues/2459 - may be resolved in future, then this may be removed
--dontwarn com.google.re2j.**
 
 ## Rules for ExoPlayer
 -keep class com.google.android.exoplayer2.** { *; }

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

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2024 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.fragments.list.kiosk;
 
 import android.os.Bundle;
@@ -33,30 +38,6 @@
 
 import io.reactivex.rxjava3.core.Single;
 
-/**
- * Created by Christian Schabesberger on 23.09.17.
- * <p>
- * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
- * KioskFragment.java is part of NewPipe.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
 public class KioskFragment extends BaseListInfoFragment<StreamInfoItem, KioskInfo> {
     @State
     String kioskId = "";

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

@@ -1761,6 +1761,13 @@ public void play() {
             }
         }
 
+        if (isStopped()) {
+            // Some phones suspend a paused player after 10 minutes. This causes the player to
+            // enter STATE_IDLE, causing playback to fail. So we try to recover from that here.
+            setRecovery();
+            reloadPlayQueueManager();
+        }
+
         simpleExoPlayer.play();
         saveStreamProgressState();
     }

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

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2016-2026 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.player.playqueue;
 
 import android.content.Context;
@@ -22,30 +27,6 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 
-/**
- * Created by Christian Schabesberger on 01.08.16.
- * <p>
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * InfoListAdapter.java is part of NewPipe.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
 public class PlayQueueAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private static final String TAG = PlayQueueAdapter.class.toString();
 

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

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2016-2021 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.player.playqueue;
 
 import android.view.View;
@@ -8,30 +13,6 @@
 
 import org.schabi.newpipe.R;
 
-/**
- * Created by Christian Schabesberger on 01.08.16.
- * <p>
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamInfoItemHolder.java is part of NewPipe.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
 public class PlayQueueItemHolder extends RecyclerView.ViewHolder {
     public final TextView itemVideoTitleView;
     public final TextView itemDurationView;

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

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.settings;
 
 import android.content.DialogInterface;
@@ -33,27 +38,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-/**
- * Created by Christian Schabesberger on 26.09.17.
- * SelectChannelFragment.java is part of NewPipe.
- * <p>
- * 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.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
 public class SelectChannelFragment extends DialogFragment {
 
     private OnSelectedListener onSelectedListener = null;

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

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2025 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.settings;
 
 import android.content.DialogInterface;
@@ -30,27 +35,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-/**
- * Created by Christian Schabesberger on 26.09.17.
- * SelectChannelFragment.java is part of NewPipe.
- * <p>
- * 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.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
 public class SelectFeedGroupFragment extends DialogFragment {
 
     private OnSelectedListener onSelectedListener = null;

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

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2022 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.settings;
 
 import android.os.Bundle;
@@ -25,27 +30,6 @@
 import java.util.List;
 import java.util.Vector;
 
-/**
- * Created by Christian Schabesberger on 09.10.17.
- * SelectKioskFragment.java is part of NewPipe.
- * <p>
- * 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.
- * </p>
- * <p>
- * 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.
- * </p>
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
- * </p>
- */
-
 public class SelectKioskFragment extends DialogFragment {
     private SelectKioskAdapter selectKioskAdapter = null;
 

app/src/main/java/org/schabi/newpipe/ui/components/about/Library.kt

@@ -29,9 +29,7 @@ import com.mikepenz.aboutlibraries.entity.Library
 import com.mikepenz.aboutlibraries.entity.License
 import com.mikepenz.aboutlibraries.entity.Organization
 import com.mikepenz.aboutlibraries.entity.Scm
-import com.mikepenz.aboutlibraries.ui.compose.m3.util.author
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableSet
+import com.mikepenz.aboutlibraries.ui.compose.util.author
 import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.external_communication.ShareUtils
 
@@ -140,7 +138,7 @@ private class LibraryProvider : CollectionPreviewParameterProvider<Library>(
             name = "NewPipeExtractor",
             description = "NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.",
             website = "https://newpipe.net",
-            developers = listOf(Developer("TeamNewPipe", "https://newpipe.net")).toImmutableList(),
+            developers = listOf(Developer("TeamNewPipe", "https://newpipe.net")),
             organization = Organization("TeamNewPipe", "https://newpipe.net"),
             scm = Scm(null, null, "https://github.com/TeamNewPipe/NewPipeExtractor"),
             licenses = setOf(
@@ -160,15 +158,15 @@ private class LibraryProvider : CollectionPreviewParameterProvider<Library>(
                     licenseContent = LoremIpsum().values.first(),
                     hash = "4321"
                 )
-            ).toImmutableSet()
+            )
         ),
         Library(
             uniqueId = "org.schabi.newpipe.extractor",
             artifactVersion = "v0.24.3",
             name = "NewPipeExtractor",
             description = "NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.",
             website = null,
-            developers = listOf<Developer>().toImmutableList(),
+            developers = listOf<Developer>(),
             organization = null,
             scm = null,
             licenses = setOf(
@@ -180,7 +178,7 @@ private class LibraryProvider : CollectionPreviewParameterProvider<Library>(
                     licenseContent = LoremIpsum().values.first(),
                     hash = "1234"
                 )
-            ).toImmutableSet()
+            )
         )
     )
 )