Merge branch 'dev' into refactor

2026-10-30 11:14:32 +00:00 · 2026-04-21 10:42:09 +08:00
commit bfefd43700
@@ -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.** { *; }
@@ -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 org.schabi.newpipe.util.Localization;

 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 = "";
@@ -1761,6 +1761,13 @@ public final class Player implements PlaybackListener, Listener {
            }
        }

+        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();
    }
@@ -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 java.util.List;
 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();

@@ -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 androidx.recyclerview.widget.RecyclerView;

 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;
@@ -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.core.Observer;
 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;
@@ -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.core.Observer;
 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;
@@ -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 org.schabi.newpipe.util.ThemeHelper;
 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;

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2018-2026 NewPipe contributors <https://newpipe.net>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 package org.schabi.newpipe.util;

 import org.schabi.newpipe.streams.io.SharpInputStream;
@@ -16,26 +21,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;

-/**
- * Created by Christian Schabesberger on 28.01.18.
- * Copyright 2018 Christian Schabesberger <chris.schabesberger@mailbox.org>
- * ZipHelper.java is part of NewPipe
- * <p>
- * License: GPL-3.0+
- * This program 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>
- * This program 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>
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 public final class ZipHelper {
    @FunctionalInterface
    public interface InputStreamConsumer {
@@ -13,11 +13,11 @@ autoservice-google = "1.1.1"
 autoservice-zacsweers = "1.2.0"
 bridge = "v2.0.2"
 cardview = "1.0.0"
-checkstyle = "13.3.0"
+checkstyle = "13.4.0"
 coil = "3.4.0"
 compose-bom = "2024.10.01"
 constraintlayout = "2.2.1"
-core = "1.17.0" # Newer versions require minSdk >= 23
+core = "1.18.0"
 desugar = "2.1.5"
 documentfile = "1.1.0"
 exoplayer = "2.19.1"
@@ -30,12 +30,12 @@ junit = "4.13.2"
 junit-ext = "1.3.0"
 kotlin = "2.3.20"
 kotlinx-coroutines-rx3 = "1.10.2"
-kotlinx-serialization-json = "1.10.0"
+kotlinx-serialization-json = "1.11.0"
 ksp = "2.3.6"
 ktlint = "1.8.0"
 lazy-column-scrollbar = "2.2.0"
 leakcanary = "2.14"
-lifecycle = "2.9.4" # Newer versions require minSdk >= 23
+lifecycle = "2.10.0"
 markwon = "4.6.2"
 material = "1.11.0" # TODO: update to newer version after bug is fixed. See https://github.com/TeamNewPipe/NewPipe/pull/13018
 media = "1.7.1"
@@ -47,7 +47,7 @@ phoenix = "3.0.0"
 preference = "1.2.1"
 prettytime = "5.0.8.Final"
 recyclerview = "1.4.0"
-room = "2.7.2" # Newer versions require minSdk >= 23
+room = "2.8.4"
 runner = "1.7.0"
 rxandroid = "3.0.2"
 rxbinding = "4.0.0"
@@ -66,9 +66,9 @@ teamnewpipe-nanojson = "e9d656ddb49a412a5a0a5d5ef20ca7ef09549996"
 # 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.
-teamnewpipe-newpipe-extractor = "v0.26.1"
-webkit = "1.14.0" # Newer versions require minSdk >= 23
-work = "2.10.5"  # Newer versions require minSdk >= 23
+teamnewpipe-newpipe-extractor = "1512cf3222b0c5d87a249e6ac231b98090c42623"
+webkit = "1.15.0"
+work = "2.11.2"

 [libraries]
 about-libraries-compose-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "about-libraries" }