PlayerUIList: make UI list private

The `R.id` link from the comment cannot be resolved, so let’s not link
it for now.

We are using some exoplayer2 resources, let’s silence the warning.

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@ NewPipe contribution guidelines
 ## Crash reporting
 
 Report crashes through the **automated crash report system** of NewPipe.
-This way all the data needed for debugging is included in your bugreport for GitHub.
+This way all the data needed for debugging is included in your bug report for GitHub.
 You'll see *exactly* what is sent, be able to add **your comments**, and then send it.
 
 ## Issue reporting/feature requests

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

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

.github/workflows/image-minimizer.js

@@ -32,12 +32,12 @@ module.exports = async ({github, context}) => {
     }
 
     // Regex for finding images (simple variant) ![ALT_TEXT](https://*.githubusercontent.com/<number>/<variousHexStringsAnd->.<fileExtension>)
-    const REGEX_USER_CONTENT_IMAGE_LOOKUP = /\!\[(.*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
-    const REGEX_ASSETS_IMAGE_LOCKUP = /\!\[(.*)\]\((https:\/\/github\.com\/[-\w\d]+\/[-\w\d]+\/assets\/\d+\/[\-0-9a-f]{32,512})\)/gm;
+    const REGEX_USER_CONTENT_IMAGE_LOOKUP = /\!\[([^\]]*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
+    const REGEX_ASSETS_IMAGE_LOOKUP = /\!\[([^\]]*)\]\((https:\/\/github\.com\/(?:user-attachments\/assets|[-\w\d]+\/[-\w\d]+\/assets\/\d+)\/[\-0-9a-f]{32,512})\)/gm;
 
     // Check if we found something
     let foundSimpleImages = REGEX_USER_CONTENT_IMAGE_LOOKUP.test(initialBody)
-        || REGEX_ASSETS_IMAGE_LOCKUP.test(initialBody);
+        || REGEX_ASSETS_IMAGE_LOOKUP.test(initialBody);
     if (!foundSimpleImages) {
         console.log('Found no simple images to process');
         return;
@@ -52,7 +52,7 @@ module.exports = async ({github, context}) => {
 
     // Try to find and replace the images with minimized ones
     let newBody = await replaceAsync(initialBody, REGEX_USER_CONTENT_IMAGE_LOOKUP, minimizeAsync);
-    newBody = await replaceAsync(newBody, REGEX_ASSETS_IMAGE_LOCKUP, minimizeAsync);
+    newBody = await replaceAsync(newBody, REGEX_ASSETS_IMAGE_LOOKUP, minimizeAsync);
     
     if (!wasMatchModified) {
         console.log('Nothing was modified. Skipping update');

.gitignore

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

app/check-dependencies.gradle

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

app/proguard-rules.pro

@@ -5,10 +5,17 @@
 
 ## Rules for NewPipeExtractor
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
+## Rules for Rhino and Rhino Engine
+-keep class org.mozilla.javascript.* { *; }
 -keep class org.mozilla.javascript.** { *; }
+-keep class org.mozilla.javascript.engine.** { *; }
 -keep class org.mozilla.classfile.ClassFileWriter
 -dontwarn org.mozilla.javascript.JavaToJSONConverters
 -dontwarn org.mozilla.javascript.tools.**
+-keep class javax.script.** { *; }
+-dontwarn javax.script.**
+-keep class jdk.dynalink.** { *; }
+-dontwarn jdk.dynalink.**
 
 ## Rules for ExoPlayer
 -keep class com.google.android.exoplayer2.** { *; }

app/src/main/AndroidManifest.xml

@@ -64,6 +64,9 @@
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService"/>
+            </intent-filter>
         </service>
 
         <activity
@@ -77,6 +80,11 @@
             android:exported="false"
             android:label="@string/settings" />
 
+        <activity
+            android:name=".settings.SettingsV2Activity"
+            android:exported="true"
+            android:label="@string/settings" />
+
         <activity
             android:name=".about.AboutActivity"
             android:exported="false"
@@ -424,5 +432,10 @@
         <meta-data
             android:name="com.samsung.android.multidisplay.keep_process_alive"
             android:value="true" />
+        <!-- Android Auto -->
+        <meta-data android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+        <meta-data android:name="com.google.android.gms.car.notification.SmallIcon"
+            android:resource="@mipmap/ic_launcher" />
     </application>
 </manifest>

app/src/main/assets/po_token.html

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

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

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

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

@@ -48,6 +48,11 @@ public final class DownloaderImpl extends Downloader {
         this.mCookies = new HashMap<>();
     }
 
+    @NonNull
+    public OkHttpClient getClient() {
+        return client;
+    }
+
     /**
      * It's recommended to call exactly once in the entire lifetime of the application.
      *
@@ -137,7 +142,8 @@ public final class DownloaderImpl extends Downloader {
         }
 
         final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
-                .method(httpMethod, requestBody).url(url)
+                .method(httpMethod, requestBody)
+                .url(url)
                 .addHeader("User-Agent", USER_AGENT);
 
         final String cookies = getCookies(url);
@@ -145,38 +151,33 @@ public final class DownloaderImpl extends Downloader {
             requestBuilder.addHeader("Cookie", cookies);
         }
 
-        for (final Map.Entry<String, List<String>> pair : headers.entrySet()) {
-            final String headerName = pair.getKey();
-            final List<String> headerValueList = pair.getValue();
+        headers.forEach((headerName, headerValueList) -> {
+            requestBuilder.removeHeader(headerName);
+            headerValueList.forEach(headerValue ->
+                    requestBuilder.addHeader(headerName, headerValue));
+        });
 
-            if (headerValueList.size() > 1) {
-                requestBuilder.removeHeader(headerName);
-                for (final String headerValue : headerValueList) {
-                    requestBuilder.addHeader(headerName, headerValue);
-                }
-            } else if (headerValueList.size() == 1) {
-                requestBuilder.header(headerName, headerValueList.get(0));
+        try (
+                okhttp3.Response response = client.newCall(requestBuilder.build()).execute()
+        ) {
+            if (response.code() == 429) {
+                throw new ReCaptchaException("reCaptcha Challenge requested", url);
             }
 
+            String responseBodyToReturn = null;
+            try (ResponseBody body = response.body()) {
+                if (body != null) {
+                    responseBodyToReturn = body.string();
+                }
+            }
+
+            final String latestUrl = response.request().url().toString();
+            return new Response(
+                    response.code(),
+                    response.message(),
+                    response.headers().toMultimap(),
+                    responseBodyToReturn,
+                    latestUrl);
         }
-
-        final okhttp3.Response response = client.newCall(requestBuilder.build()).execute();
-
-        if (response.code() == 429) {
-            response.close();
-
-            throw new ReCaptchaException("reCaptcha Challenge requested", url);
-        }
-
-        final ResponseBody body = response.body();
-        String responseBodyToReturn = null;
-
-        if (body != null) {
-            responseBodyToReturn = body.string();
-        }
-
-        final String latestUrl = response.request().url().toString();
-        return new Response(response.code(), response.message(), response.headers().toMultimap(),
-                responseBodyToReturn, latestUrl);
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.database.playlist;
 
+import androidx.annotation.Nullable;
+
 import org.schabi.newpipe.database.LocalItem;
 
 public interface PlaylistLocalItem extends LocalItem {
@@ -10,4 +12,7 @@ public interface PlaylistLocalItem extends LocalItem {
     long getUid();
 
     void setDisplayIndex(long displayIndex);
+
+    @Nullable
+    String getThumbnailUrl();
 }

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

@@ -9,6 +9,8 @@ import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_STREAM_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_THUMBNAIL_URL;
 
+import androidx.annotation.Nullable;
+
 public class PlaylistMetadataEntry implements PlaylistLocalItem {
     public static final String PLAYLIST_STREAM_COUNT = "streamCount";
 
@@ -71,4 +73,10 @@ public class PlaylistMetadataEntry implements PlaylistLocalItem {
     public void setDisplayIndex(final long displayIndex) {
         this.displayIndex = displayIndex;
     }
+
+    @Nullable
+    @Override
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
 }

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

@@ -34,7 +34,7 @@ public interface PlaylistRemoteDAO extends BasicDAO<PlaylistRemoteEntity> {
 
     @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
             + REMOTE_PLAYLIST_ID + " = :playlistId")
-    Flowable<List<PlaylistRemoteEntity>> getPlaylist(long playlistId);
+    Flowable<PlaylistRemoteEntity> getPlaylist(long playlistId);
 
     @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE "
             + REMOTE_PLAYLIST_URL + " = :url AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")

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

@@ -2,6 +2,7 @@ package org.schabi.newpipe.database.playlist.model;
 
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -134,6 +135,8 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
         this.name = name;
     }
 
+    @Nullable
+    @Override
     public String getThumbnailUrl() {
         return thumbnailUrl;
     }

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

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

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

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

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

@@ -9,7 +9,6 @@ import com.google.auto.service.AutoService;
 import org.acra.config.CoreConfiguration;
 import org.acra.sender.ReportSender;
 import org.acra.sender.ReportSenderFactory;
-import org.schabi.newpipe.App;
 
 /*
  * Created by Christian Schabesberger on 13.09.16.

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

@@ -26,7 +26,7 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.stream.Collectors;
@@ -67,10 +67,6 @@ public class ErrorActivity extends AppCompatActivity {
     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");
-
-
     private ErrorInfo errorInfo;
     private String currentTimeStamp;
 
@@ -107,7 +103,9 @@ public class ErrorActivity extends AppCompatActivity {
 
         // important add guru meditation
         addGuruMeditation();
-        currentTimeStamp = CURRENT_TIMESTAMP_FORMATTER.format(LocalDateTime.now());
+        // print current time, as zoned ISO8601 timestamp
+        final ZonedDateTime now = ZonedDateTime.now();
+        currentTimeStamp = now.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 
         activityErrorBinding.errorReportEmailButton.setOnClickListener(v ->
                 openPrivacyPolicyDialog(this, "EMAIL"));
@@ -250,6 +248,9 @@ public class ErrorActivity extends AppCompatActivity {
                     .append("\n* __Content Language:__ ").append(getContentLanguageString())
                     .append("\n* __App Language:__ ").append(getAppLanguage())
                     .append("\n* __Service:__ ").append(errorInfo.getServiceName())
+                    .append("\n* __Timestamp:__ ").append(currentTimeStamp)
+                    .append("\n* __Package:__ ").append(getPackageName())
+                    .append("\n* __Service:__ ").append(errorInfo.getServiceName())
                     .append("\n* __Version:__ ").append(BuildConfig.VERSION_NAME)
                     .append("\n* __OS:__ ").append(getOsString()).append("\n");
 

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

@@ -185,10 +185,8 @@ public class ReCaptchaActivity extends AppCompatActivity {
             final int abuseEnd = url.indexOf("+path");
 
             try {
-                String abuseCookie = url.substring(abuseStart + 13, abuseEnd);
-                abuseCookie = Utils.decodeUrlUtf8(abuseCookie);
-                handleCookies(abuseCookie);
-            } catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
+                handleCookies(Utils.decodeUrlUtf8(url.substring(abuseStart + 13, abuseEnd)));
+            } catch (final StringIndexOutOfBoundsException e) {
                 if (MainActivity.DEBUG) {
                     Log.e(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
                             + abuseStart + " and ending at " + abuseEnd + " for url " + url, e);

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

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