Update extractor to 0.20.5

Currently translated at 12.5% (5 of 40 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/sc/

.github/CONTRIBUTING.md

@@ -1,65 +1,46 @@
 NewPipe contribution guidelines
 ===============================
 
-PLEASE READ THESE GUIDELINES CAREFULLY BEFORE ANY CONTRIBUTION!
-
 ## Crash reporting
 
-Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to
-send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
-add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+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.
+You'll see exactly what is sent, be able to add your comments, and then send it.
 
 ## Issue reporting/feature requests
 
-* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature
-hasn't been reported/requested before.
-* Check whether your issue/feature is already fixed/implemented.
-* Check if the issue still exists in the latest release/beta version.
-* If you are an Android/Java developer, you are always welcome to fix an issue or implement a feature yourself. PRs welcome!
-* We use English for development. Issues in other languages will be closed and ignored.
-* Please only add *one* issue at a time. Do not put multiple issues into one thread.
-* Follow the template! Issues or feature requests not matching the template might be closed.
+* **Already reported**? Browse the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) to make sure your issue/feature hasn't been reported/requested.
+* **Already fixed**? Check whether your issue/feature is already fixed/implemented.
+* **Still relevant**? Check if the issue still exists in the latest release/beta version.
+* **Can you fix it**? If you are an Android/Java developer, you are always welcome to fix an issue or implement a feature yourself. PRs welcome! See [Code contribution](#code-contribution) for more info.
+* **Is it in English**? Issues in other languages will be ignored unless someone translates them.
+* **Is it one issue**? Multiple issues require multiple reports, that can be linked to track their statuses.
+* **The template**: Fill it out, everyone wins. Your issue has a chance of getting fixed.
 
-## Bug Fixing
-* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to
-<a href="mailto:tnp@newpipe.schabi.org">tnp@newpipe.schabi.org</a> to let us know that you intend to help. We'll send you further instructions. You may, on request,
-register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information).
 
 ## Translation
 
-* NewPipe is translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
-with your GitHub account.
-* If the language you want to translate is not on Weblate, you can add it: see [How to add a new language](https://github.com/TeamNewPipe/NewPipe/wiki/How-to-add-a-new-language-to-NewPipe) in the wiki.
+* NewPipe is translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). Log in there with your GitHub account, or register.
+* Add the language you want to translate if it is not there already: see [How to add a new language](https://github.com/TeamNewPipe/NewPipe/wiki/How-to-add-a-new-language-to-NewPipe) in the wiki.
 
 ## Code contribution
 
-* If you want to add a feature or change one, please open an issue describing your change. This gives the team and community a chance to give feedback before you spend any time on something that could be done differently or not done at all. It also prevents two contributors from working on the same thing and one being disappointed when only one user's code can be added.
-* Stick to NewPipe's style conventions: follow [checkStyle](https://github.com/checkstyle/checkstyle). It will run each time you build the project.
-* Do not bring non-free software (e.g. binary blobs) into the project. Also, make sure you do not introduce Google
+* If you want to help out with an existing bug report or feature request, leave a comment on that issue saying you want to try your hand at it.
+* If there is no existing issue for what you want to work on, open a new one describing your changes. This gives the team and the community a chance to give feedback before you spend time on something that is already in development, should be done differently, or should be avoided completely.
+* Stick to NewPipe's style conventions of [checkStyle](https://github.com/checkstyle/checkstyle). It runs each time you build the project.
+* Do not bring non-free software (e.g. binary blobs) into the project. Make sure you do not introduce Google
   libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy).
-* Make changes on a separate branch with a meaningful name, not on the master neither dev branch. This is commonly known as *feature branch workflow*. You
-  may then send your changes as a pull request (PR) on GitHub.
-* When submitting changes, you confirm that your code is licensed under the terms of the
-  [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
-  description. Untested code will **not** be merged!
+* Make changes on a separate branch with a meaningful name, not on the _master_ branch or the _dev_ branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request (PR) on GitHub.
+* Please test (compile and run) your code before submitting changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you must rebase the dev branch manually and resolve the problems on your own. You can find help [on the wiki](https://github.com/TeamNewPipe/NewPipe/wiki/How-to-merge-a-PR). That makes the maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contribute a PR. Unmaintained code is a hassle for core developers. If you do not intend to maintain features you plan to contribute, please rethink your submission, or clearly state that in the PR description.
+* Respond if someone requests changes or otherwise raises issues about your PRs.
+* Send PRs that only cover one specific issue/solution/bug. Do not send PRs that are huge and consist of multiple independent solutions.
 * Try to figure out yourself why builds on our CI fail.
-* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job,
-  but if not, you are asked to rebase the dev branch manually and resolve the problems on your own. You can find help [on the wiki](https://github.com/TeamNewPipe/NewPipe/wiki/How-to-merge-a-PR). That will make the
-  maintainers' jobs way easier.
-* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for
-  the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again
-  about submission, or clearly state that in the description of your PR.
-* Respond yourselves if someone requests changes or otherwise raises issues about your PRs.
-* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
-  independent solutions.
 
 ## Communication
 
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
-  [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
-* If you want to get in touch with the core team or one of our other contributors you can send an email to
-  <a href="mailto:tnp@newpipe.schabi.org">tnp@newpipe.schabi.org</a>. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue
-  tracker described above!
-* Feel free to post suggestions, changes, ideas etc. on GitHub or IRC!
+* The [#newpipe](irc:irc.freenode.net/newpipe) channel on freenode has the core team and other developers in it. [Click here for webchat](https://webchat.freenode.net/?channels=newpipe)!
+* You can also use a Matrix account to join the Newpipe channel at [#freenode_#newpipe:matrix.org](https://matrix.to/#/#freenode_#newpipe:matrix.org).
+* Post suggestions, changes, ideas etc. on GitHub or IRC.

README.md

@@ -20,7 +20,7 @@
 
 <b>WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY.</b>
 
-<b>PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.</b>
+<b>PUTTING NEWPIPE OR ANY FORK OF IT INTO THE GOOGLE PLAY STORE VIOLATES THEIR TERMS AND CONDITIONS.</b>
 
 ## Screenshots
 
@@ -87,7 +87,7 @@ When a change to the NewPipe code occurs (due to either adding features or bug f
  3. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it as soon as we publish a release.
  4. Update via F-droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
 
-We recommend method 2 for most users. APKs installed using method 2 or 3 are compatible with each other, but not with those installed using method 4. This is due to the same signing key (ours) being using for 2 and 3, but a different signing key (F-Droid's) being used for 4. Building a debug APK using method 1 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app.
+We recommend method 2 for most users. APKs installed using method 2 or 3 are compatible with each other, but not with those installed using method 4. This is due to the same signing key (ours) being used for 2 and 3, but a different signing key (F-Droid's) being used for 4. Building a debug APK using method 1 excludes a key entirely. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app.
 
 In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality was broken and F-Droid doesn't have the update yet), we recommend following this procedure:
 1. Back up your data via Settings > Content > Export Database so you keep your history, subscriptions, and playlists

app/build.gradle

@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 957
-        versionName "0.20.3"
+        versionCode 959
+        versionName "0.20.5"
 
         multiDexEnabled true
 
@@ -89,20 +89,20 @@ android {
 
 ext {
     icepickVersion = '3.2.0'
-    checkstyleVersion = '8.36.2'
+    checkstyleVersion = '8.37'
     stethoVersion = '1.5.1'
-    leakCanaryVersion = '2.2'
+    leakCanaryVersion = '2.5'
     exoPlayerVersion = '2.11.8'
     androidxLifecycleVersion = '2.2.0'
-    androidxRoomVersion = '2.2.5'
-    groupieVersion = '2.8.0'
-    markwonVersion = '4.3.1'
+    androidxRoomVersion = '2.3.0-alpha03'
+    groupieVersion = '2.8.1'
+    markwonVersion = '4.6.0'
     googleAutoServiceVersion = '1.0-rc7'
 }
 
 configurations {
     checkstyle
-//    ktlint
+    ktlint
 }
 
 checkstyle {
@@ -130,81 +130,85 @@ task runCheckstyle(type: Checkstyle) {
     }
 }
 
-//task runKtlint(type: JavaExec) {
-//    main = "com.pinterest.ktlint.Main"
-//    classpath = configurations.ktlint
-//    args "src/**/*.kt"
-//}
-//
-//task formatKtlint(type: JavaExec) {
-//    main = "com.pinterest.ktlint.Main"
-//    classpath = configurations.ktlint
-//    args "-F", "src/**/*.kt"
-//}
+def outputDir = "${project.buildDir}/reports/ktlint/"
+def inputFiles = project.fileTree(dir: "src", include: "**/*.kt")
+
+task runKtlint(type: JavaExec) {
+    inputs.files(inputFiles)
+    outputs.dir(outputDir)
+    main = "com.pinterest.ktlint.Main"
+    classpath = configurations.ktlint
+    args "src/**/*.kt"
+}
+
+task formatKtlint(type: JavaExec) {
+    inputs.files(inputFiles)
+    outputs.dir(outputDir)
+    main = "com.pinterest.ktlint.Main"
+    classpath = configurations.ktlint
+    args "-F", "src/**/*.kt"
+}
 
 afterEvaluate {
-    preDebugBuild.dependsOn runCheckstyle //, runKtlint
+    preDebugBuild.dependsOn formatKtlint, runCheckstyle, runKtlint
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
 
     implementation "frankiesardo:icepick:${icepickVersion}"
     kapt "frankiesardo:icepick-processor:${icepickVersion}"
 
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
-//    ktlint "com.pinterest:ktlint:0.35.0"
+    ktlint "com.pinterest:ktlint:0.39.0"
 
     debugImplementation "com.facebook.stetho:stetho:${stethoVersion}"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
     implementation "com.squareup.leakcanary:leakcanary-object-watcher-android:${leakCanaryVersion}"
+    implementation "com.squareup.leakcanary:plumber-android:${leakCanaryVersion}"
 
     implementation "androidx.multidex:multidex:2.0.1"
 
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
-
-    androidTestImplementation "androidx.test.ext:junit:1.1.1"
-    androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0", {
-        exclude module: 'support-annotations'
-    }
-
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:6701b0fe718f6bdc385221341fa473e8aaab560e'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:175df679e05b24b6094570d719cc11f8dfc17c68'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"
 
+    //noinspection GradleDependency --> do not update okhttp to keep supporting Android 4.4 users
     implementation "com.squareup.okhttp3:okhttp:3.12.12"
 
     implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
     implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
 
-    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.google.android.material:material:1.2.1"
 
     compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}"
     kapt "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
 
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.preference:preference:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
 
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
-    implementation "androidx.room:room-rxjava2:${androidxRoomVersion}"
+    implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
     kapt "androidx.room:room-compiler:${androidxRoomVersion}"
 
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+
     implementation "com.xwray:groupie:${groupieVersion}"
     implementation "com.xwray:groupie-kotlin-android-extensions:${groupieVersion}"
 
@@ -216,13 +220,22 @@ dependencies {
 
     implementation "com.nononsenseapps:filepicker:4.2.1"
 
-    implementation "ch.acra:acra-core:5.5.0"
+    implementation "ch.acra:acra-core:5.7.0"
 
-    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0"
+    implementation "io.reactivex.rxjava3:rxjava:3.0.7"
+    implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
+    implementation "com.jakewharton.rxbinding4:rxbinding:4.0.0"
 
     implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
+
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
+
+    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.room:room-testing:${androidxRoomVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0", {
+        exclude module: 'support-annotations'
+    }
 }
 
 static String getGitWorkingBranch() {

app/src/androidTest/java/org/schabi/newpipe/database/AppDatabaseTest.kt

@@ -31,49 +31,62 @@ class AppDatabaseTest {
     }
 
     @get:Rule
-    val testHelper = MigrationTestHelper(InstrumentationRegistry.getInstrumentation(),
-            AppDatabase::class.java.canonicalName, FrameworkSQLiteOpenHelperFactory())
+    val testHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        AppDatabase::class.java.canonicalName, FrameworkSQLiteOpenHelperFactory()
+    )
 
     @Test
     fun migrateDatabaseFrom2to3() {
         val databaseInV2 = testHelper.createDatabase(AppDatabase.DATABASE_NAME, Migrations.DB_VER_2)
 
         databaseInV2.run {
-            insert("streams", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-                // put("uid", null)
-                put("service_id", DEFAULT_SERVICE_ID)
-                put("url", DEFAULT_URL)
-                put("title", DEFAULT_TITLE)
-                put("stream_type", DEFAULT_TYPE.name)
-                put("duration", DEFAULT_DURATION)
-                put("uploader", DEFAULT_UPLOADER_NAME)
-                put("thumbnail_url", DEFAULT_THUMBNAIL)
-            })
-            insert("streams", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-                // put("uid", null)
-                put("service_id", DEFAULT_SECOND_SERVICE_ID)
-                put("url", DEFAULT_SECOND_URL)
-                // put("title", null)
-                // put("stream_type", null)
-                // put("duration", null)
-                // put("uploader", null)
-                // put("thumbnail_url", null)
-            })
-            insert("streams", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
-                // put("uid", null)
-                put("service_id", DEFAULT_SERVICE_ID)
-                // put("url", null)
-                // put("title", null)
-                // put("stream_type", null)
-                // put("duration", null)
-                // put("uploader", null)
-                // put("thumbnail_url", null)
-            })
+            insert(
+                "streams", SQLiteDatabase.CONFLICT_FAIL,
+                ContentValues().apply {
+                    // put("uid", null)
+                    put("service_id", DEFAULT_SERVICE_ID)
+                    put("url", DEFAULT_URL)
+                    put("title", DEFAULT_TITLE)
+                    put("stream_type", DEFAULT_TYPE.name)
+                    put("duration", DEFAULT_DURATION)
+                    put("uploader", DEFAULT_UPLOADER_NAME)
+                    put("thumbnail_url", DEFAULT_THUMBNAIL)
+                }
+            )
+            insert(
+                "streams", SQLiteDatabase.CONFLICT_FAIL,
+                ContentValues().apply {
+                    // put("uid", null)
+                    put("service_id", DEFAULT_SECOND_SERVICE_ID)
+                    put("url", DEFAULT_SECOND_URL)
+                    // put("title", null)
+                    // put("stream_type", null)
+                    // put("duration", null)
+                    // put("uploader", null)
+                    // put("thumbnail_url", null)
+                }
+            )
+            insert(
+                "streams", SQLiteDatabase.CONFLICT_FAIL,
+                ContentValues().apply {
+                    // put("uid", null)
+                    put("service_id", DEFAULT_SERVICE_ID)
+                    // put("url", null)
+                    // put("title", null)
+                    // put("stream_type", null)
+                    // put("duration", null)
+                    // put("uploader", null)
+                    // put("thumbnail_url", null)
+                }
+            )
             close()
         }
 
-        testHelper.runMigrationsAndValidate(AppDatabase.DATABASE_NAME, Migrations.DB_VER_3,
-                true, Migrations.MIGRATION_2_3)
+        testHelper.runMigrationsAndValidate(
+            AppDatabase.DATABASE_NAME, Migrations.DB_VER_3,
+            true, Migrations.MIGRATION_2_3
+        )
 
         val migratedDatabaseV3 = getMigratedDatabase()
         val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst()
@@ -110,9 +123,11 @@ class AppDatabaseTest {
     }
 
     private fun getMigratedDatabase(): AppDatabase {
-        val database: AppDatabase = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
-                AppDatabase::class.java, AppDatabase.DATABASE_NAME)
-                .build()
+        val database: AppDatabase = Room.databaseBuilder(
+            ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, AppDatabase.DATABASE_NAME
+        )
+            .build()
         testHelper.closeWhenFinished(database)
         return database
     }

app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java

@@ -8,7 +8,6 @@ import androidx.test.filters.LargeTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.report.ErrorActivity.ErrorInfo;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,10 +28,10 @@ public class ErrorInfoTest {
         parcel.setDataPosition(0);
         final ErrorInfo infoFromParcel = ErrorInfo.CREATOR.createFromParcel(parcel);
 
-        assertEquals(UserAction.USER_REPORT, infoFromParcel.userAction);
-        assertEquals("youtube", infoFromParcel.serviceName);
-        assertEquals("request", infoFromParcel.request);
-        assertEquals(R.string.general_error, infoFromParcel.message);
+        assertEquals(UserAction.USER_REPORT, infoFromParcel.getUserAction());
+        assertEquals("youtube", infoFromParcel.getServiceName());
+        assertEquals("request", infoFromParcel.getRequest());
+        assertEquals(R.string.general_error, infoFromParcel.getMessage());
 
         parcel.recycle();
     }

app/src/debug/java/org/schabi/newpipe/DebugApp.kt

@@ -15,14 +15,22 @@ class DebugApp : App() {
 
         // Give each object 10 seconds to be GC'ed, before LeakCanary gets nosy on it
         AppWatcher.config = AppWatcher.config.copy(watchDurationMillis = 10000)
-        LeakCanary.config = LeakCanary.config.copy(dumpHeap = PreferenceManager
-                .getDefaultSharedPreferences(this).getBoolean(getString(
-                        R.string.allow_heap_dumping_key), false))
+        LeakCanary.config = LeakCanary.config.copy(
+            dumpHeap = PreferenceManager
+                .getDefaultSharedPreferences(this).getBoolean(
+                    getString(
+                        R.string.allow_heap_dumping_key
+                    ),
+                    false
+                )
+        )
     }
 
     override fun getDownloader(): Downloader {
-        val downloader = DownloaderImpl.init(OkHttpClient.Builder()
-                .addNetworkInterceptor(StethoInterceptor()))
+        val downloader = DownloaderImpl.init(
+            OkHttpClient.Builder()
+                .addNetworkInterceptor(StethoInterceptor())
+        )
         setCookiesToDownloader(downloader)
         return downloader
     }
@@ -36,7 +44,8 @@ class DebugApp : App() {
 
         // Enable command line interface
         initializerBuilder.enableDumpapp(
-                Stetho.defaultDumperPluginsProvider(applicationContext))
+            Stetho.defaultDumperPluginsProvider(applicationContext)
+        )
 
         // Use the InitializerBuilder to generate an Initializer
         val initializer = initializerBuilder.build()
@@ -47,6 +56,6 @@ class DebugApp : App() {
 
     override fun isDisposedRxExceptionsReported(): Boolean {
         return PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean(getString(R.string.allow_disposed_exceptions_key), false)
+            .getBoolean(getString(R.string.allow_disposed_exceptions_key), false)
     }
 }

app/src/main/AndroidManifest.xml

@@ -305,8 +305,7 @@
                 <data android:host="peertube.cpy.re" />
                 <data android:host="peertube.mastodon.host" />
                 <data android:host="peertube.fr" />
-                <data android:host="peertube.live" />
-                <data android:host="peertube.video" />
+                <data android:host="tilvids.com" />
                 <data android:host="tube.privacytools.io" />
                 <data android:host="video.ploud.fr" />
                 <data android:host="video.lqdn.fr" />

app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapterMenuWorkaround.java

@@ -86,8 +86,8 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     private final int mBehavior;
     private FragmentTransaction mCurTransaction = null;
 
-    private ArrayList<Fragment.SavedState> mSavedState = new ArrayList<Fragment.SavedState>();
-    private ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
+    private final ArrayList<Fragment.SavedState> mSavedState = new ArrayList<Fragment.SavedState>();
+    private final ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
     private Fragment mCurrentPrimaryItem = null;
 
     /**

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

@@ -8,6 +8,7 @@ import android.os.Build;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 
@@ -22,6 +23,7 @@ import org.acra.config.CoreConfigurationBuilder;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ExceptionUtils;
@@ -36,13 +38,13 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.CompositeException;
-import io.reactivex.exceptions.MissingBackpressureException;
-import io.reactivex.exceptions.OnErrorNotImplementedException;
-import io.reactivex.exceptions.UndeliverableException;
-import io.reactivex.functions.Consumer;
-import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
+import io.reactivex.rxjava3.exceptions.UndeliverableException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
@@ -66,7 +68,7 @@ public class App extends MultiDexApplication {
     protected static final String TAG = App.class.toString();
     private static App app;
 
-    private Disposable disposable = null;
+    @Nullable private Disposable disposable = null;
 
     @NonNull
     public static App getApp() {
@@ -226,7 +228,7 @@ public class App extends MultiDexApplication {
                     ace,
                     null,
                     null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                             "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
     }

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

@@ -12,6 +12,7 @@ import android.net.Uri;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.ContextCompat;
@@ -21,12 +22,11 @@ import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
 
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.ErrorInfo;
 import org.schabi.newpipe.report.UserAction;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -35,11 +35,10 @@ import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public final class CheckForNewAppVersion {
     private CheckForNewAppVersion() { }
@@ -57,48 +56,43 @@ public final class CheckForNewAppVersion {
      * @param application The application
      * @return String with the apk's SHA1 fingeprint in hexadecimal
      */
+    @NonNull
     private static String getCertificateSHA1Fingerprint(@NonNull final Application application) {
-        final PackageManager pm = application.getPackageManager();
-        final String packageName = application.getPackageName();
-        final int flags = PackageManager.GET_SIGNATURES;
-        PackageInfo packageInfo = null;
-
+        final PackageInfo packageInfo;
         try {
-            packageInfo = pm.getPackageInfo(packageName, flags);
+            packageInfo = application.getPackageManager().getPackageInfo(
+                    application.getPackageName(), PackageManager.GET_SIGNATURES);
         } catch (final PackageManager.NameNotFoundException e) {
             ErrorActivity.reportError(application, e, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                             "Could not find package info", R.string.app_ui_crash));
+            return "";
         }
 
-        final Signature[] signatures = packageInfo.signatures;
-        final byte[] cert = signatures[0].toByteArray();
-        final InputStream input = new ByteArrayInputStream(cert);
-
-        X509Certificate c = null;
-
+        final X509Certificate c;
         try {
+            final Signature[] signatures = packageInfo.signatures;
+            final byte[] cert = signatures[0].toByteArray();
+            final InputStream input = new ByteArrayInputStream(cert);
             final CertificateFactory cf = CertificateFactory.getInstance("X509");
             c = (X509Certificate) cf.generateCertificate(input);
         } catch (final CertificateException e) {
             ErrorActivity.reportError(application, e, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                             "Certificate error", R.string.app_ui_crash));
+            return "";
         }
 
-        String hexString = null;
-
         try {
             final MessageDigest md = MessageDigest.getInstance("SHA1");
             final byte[] publicKey = md.digest(c.getEncoded());
-            hexString = byte2HexFormatted(publicKey);
+            return byte2HexFormatted(publicKey);
         } catch (NoSuchAlgorithmException | CertificateEncodingException e) {
             ErrorActivity.reportError(application, e, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                             "Could not retrieve SHA1 key", R.string.app_ui_crash));
+            return "";
         }
-
-        return hexString;
     }
 
     private static String byte2HexFormatted(final byte[] arr) {
@@ -163,66 +157,66 @@ public final class CheckForNewAppVersion {
     }
 
     private static boolean isConnected(@NonNull final App app) {
-        final ConnectivityManager cm = ContextCompat.getSystemService(app,
-                ConnectivityManager.class);
-        return cm.getActiveNetworkInfo() != null
-                && cm.getActiveNetworkInfo().isConnected();
+        final ConnectivityManager connectivityManager =
+                ContextCompat.getSystemService(app, ConnectivityManager.class);
+        return connectivityManager != null && connectivityManager.getActiveNetworkInfo() != null
+                && connectivityManager.getActiveNetworkInfo().isConnected();
     }
 
     public static boolean isGithubApk(@NonNull final App app) {
         return getCertificateSHA1Fingerprint(app).equals(GITHUB_APK_SHA1);
     }
 
-    @NonNull
+    @Nullable
     public static Disposable checkNewVersion(@NonNull final App app) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
         // Check if user has enabled/disabled update checking
         // and if the current apk is a github one or not.
-        if (!prefs.getBoolean(app.getString(R.string.update_app_key), true)
-                || !isGithubApk(app)) {
-            return Disposables.empty();
+        if (!prefs.getBoolean(app.getString(R.string.update_app_key), true) || !isGithubApk(app)) {
+            return null;
         }
 
-        return Observable.fromCallable(() -> {
-            if (!isConnected(app)) {
-                return null;
-            }
+        return Maybe
+                .fromCallable(() -> {
+                    if (!isConnected(app)) {
+                        return null;
+                    }
 
-            // Make a network request to get latest NewPipe data.
-            try {
-                return DownloaderImpl.getInstance().get(NEWPIPE_API_URL).responseBody();
-            } catch (IOException | ReCaptchaException e) {
-                // connectivity problems, do not alarm user and fail silently
-                if (DEBUG) {
-                    Log.w(TAG, Log.getStackTraceString(e));
-                }
-            }
-
-            return null;
-        })
+                    // Make a network request to get latest NewPipe data.
+                    return DownloaderImpl.getInstance().get(NEWPIPE_API_URL).responseBody();
+                })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(response -> {
-                    // Parse the json from the response.
-                    if (response != null) {
-                        try {
-                            final JsonObject githubStableObject = JsonParser.object().from(response)
-                                    .getObject("flavors").getObject("github").getObject("stable");
+                .subscribe(
+                        response -> {
+                            // Parse the json from the response.
+                            try {
+                                final JsonObject githubStableObject = JsonParser.object()
+                                        .from(response).getObject("flavors").getObject("github")
+                                        .getObject("stable");
 
-                            final String versionName = githubStableObject.getString("version");
-                            final int versionCode = githubStableObject.getInt("version_code");
-                            final String apkLocationUrl = githubStableObject.getString("apk");
+                                final String versionName = githubStableObject
+                                        .getString("version");
+                                final int versionCode = githubStableObject
+                                        .getInt("version_code");
+                                final String apkLocationUrl = githubStableObject
+                                        .getString("apk");
 
-                            compareAppVersionAndShowNotification(app, versionName, apkLocationUrl,
-                                    versionCode);
-                        } catch (final JsonParserException e) {
+                                compareAppVersionAndShowNotification(app, versionName,
+                                        apkLocationUrl, versionCode);
+                            } catch (final JsonParserException e) {
+                                // connectivity problems, do not alarm user and fail silently
+                                if (DEBUG) {
+                                    Log.w(TAG, "Could not get NewPipe API: invalid json", e);
+                                }
+                            }
+                        },
+                        e -> {
                             // connectivity problems, do not alarm user and fail silently
                             if (DEBUG) {
-                                Log.w(TAG, Log.getStackTraceString(e));
+                                Log.w(TAG, "Could not get NewPipe API: network problem", e);
                             }
-                        }
-                    }
-                });
+                        });
     }
 }

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

@@ -50,8 +50,8 @@ public final class DownloaderImpl extends Downloader {
     public static final String YOUTUBE_DOMAIN = "youtube.com";
 
     private static DownloaderImpl instance;
-    private Map<String, String> mCookies;
-    private OkHttpClient client;
+    private final Map<String, String> mCookies;
+    private final OkHttpClient client;
 
     private DownloaderImpl(final OkHttpClient.Builder builder) {
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {

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

@@ -139,8 +139,7 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        if (getSupportFragmentManager() != null
-                && getSupportFragmentManager().getBackStackEntryCount() == 0) {
+        if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
             initFragments();
         }
 

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

@@ -66,13 +66,13 @@ import java.util.List;
 
 import icepick.Icepick;
 import icepick.State;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
@@ -519,7 +519,7 @@ public class RouterActivity extends AppCompatActivity {
         disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((@NonNull StreamInfo result) -> {
+                .subscribe(result -> {
                     final List<VideoStream> sortedVideoStreams = ListHelper
                             .getSortedStreamVideosList(this, result.getVideoStreams(),
                                     result.getVideoOnlyStreams(), false);
@@ -534,9 +534,8 @@ public class RouterActivity extends AppCompatActivity {
                     downloadDialog.show(fm, "downloadDialog");
                     fm.executePendingTransactions();
                     downloadDialog.requireDialog().setOnDismissListener(dialog -> finish());
-                }, (@NonNull Throwable throwable) -> {
-                    showUnsupportedUrlDialog(currentUrl);
-                }));
+                }, throwable ->
+                        showUnsupportedUrlDialog(currentUrl)));
     }
 
     @Override

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

@@ -31,7 +31,7 @@ public class AboutActivity extends AppCompatActivity {
     /**
      * List of all software components.
      */
-    private static final SoftwareComponent[] SOFTWARE_COMPONENTS = new SoftwareComponent[]{
+    private static final SoftwareComponent[] SOFTWARE_COMPONENTS = {
             new SoftwareComponent("Giga Get", "2014 - 2015", "Peter Cai",
                     "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL3),
             new SoftwareComponent("NewPipe Extractor", "2017 - 2020", "Christian Schabesberger",

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

@@ -1,80 +0,0 @@
-package org.schabi.newpipe.about;
-
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.io.Serializable;
-
-/**
- * Class for storing information about a software license.
- */
-public class License implements Parcelable, Serializable {
-    public static final Creator<License> CREATOR = new Creator<License>() {
-        @Override
-        public License createFromParcel(final Parcel source) {
-            return new License(source);
-        }
-
-        @Override
-        public License[] newArray(final int size) {
-            return new License[size];
-        }
-    };
-    private final String abbreviation;
-    private final String name;
-    private String filename;
-
-    public License(final String name, final String abbreviation, final String filename) {
-        if (name == null) {
-            throw new NullPointerException("name is null");
-        }
-        if (abbreviation == null) {
-            throw new NullPointerException("abbreviation is null");
-        }
-        if (filename == null) {
-            throw new NullPointerException("filename is null");
-        }
-        this.name = name;
-        this.filename = filename;
-        this.abbreviation = abbreviation;
-    }
-
-    protected License(final Parcel in) {
-        this.filename = in.readString();
-        this.abbreviation = in.readString();
-        this.name = in.readString();
-    }
-
-    public Uri getContentUri() {
-        return new Uri.Builder()
-                .scheme("file")
-                .path("/android_asset")
-                .appendPath(filename)
-                .build();
-    }
-
-    public String getAbbreviation() {
-        return abbreviation;
-    }
-
-    public String getFilename() {
-        return filename;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(final Parcel dest, final int flags) {
-        dest.writeString(this.filename);
-        dest.writeString(this.abbreviation);
-        dest.writeString(this.name);
-    }
-
-    public String getName() {
-        return name;
-    }
-}

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

@@ -0,0 +1,19 @@
+package org.schabi.newpipe.about
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.android.parcel.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 {
+    val contentUri: Uri
+        get() = Uri.Builder()
+            .scheme("file")
+            .path("/android_asset")
+            .appendPath(filename)
+            .build()
+}

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

@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 /**
  * Fragment containing the software licenses.

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

@@ -16,11 +16,10 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
@@ -37,14 +36,12 @@ public final class LicenseFragmentHelper {
                                               @NonNull final License license) {
         final StringBuilder licenseContent = new StringBuilder();
         final String webViewData;
-        try {
-            final BufferedReader in = new BufferedReader(new InputStreamReader(
-                    context.getAssets().open(license.getFilename()), StandardCharsets.UTF_8));
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(
+                context.getAssets().open(license.getFilename()), StandardCharsets.UTF_8))) {
             String str;
             while ((str = in.readLine()) != null) {
                 licenseContent.append(str);
             }
-            in.close();
 
             // split the HTML file and insert the stylesheet into the HEAD of the file
             webViewData = licenseContent.toString().replace("</head>",
@@ -57,7 +54,7 @@ public final class LicenseFragmentHelper {
     }
 
     /**
-     * @param context
+     * @param context the Android context
      * @return String which is a CSS stylesheet according to the context's theme
      */
     private static String getLicenseStylesheet(@NonNull final Context context) {
@@ -88,7 +85,7 @@ public final class LicenseFragmentHelper {
 
     static Disposable showLicense(@Nullable final Context context, @NonNull final License license) {
         if (context == null) {
-            return Disposables.empty();
+            return Disposable.empty();
         }
 
         return Observable.fromCallable(() -> getFormattedLicense(context, license))

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

@@ -1,83 +0,0 @@
-package org.schabi.newpipe.about;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class SoftwareComponent implements Parcelable {
-    public static final Creator<SoftwareComponent> CREATOR = new Creator<SoftwareComponent>() {
-        @Override
-        public SoftwareComponent createFromParcel(final Parcel source) {
-            return new SoftwareComponent(source);
-        }
-
-        @Override
-        public SoftwareComponent[] newArray(final int size) {
-            return new SoftwareComponent[size];
-        }
-    };
-
-    private final License license;
-    private final String name;
-    private final String years;
-    private final String copyrightOwner;
-    private final String link;
-    private final String version;
-
-    public SoftwareComponent(final String name, final String years, final String copyrightOwner,
-                             final String link, final License license) {
-        this.name = name;
-        this.years = years;
-        this.copyrightOwner = copyrightOwner;
-        this.link = link;
-        this.license = license;
-        this.version = null;
-    }
-
-    protected SoftwareComponent(final Parcel in) {
-        this.name = in.readString();
-        this.license = in.readParcelable(License.class.getClassLoader());
-        this.copyrightOwner = in.readString();
-        this.link = in.readString();
-        this.years = in.readString();
-        this.version = in.readString();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getYears() {
-        return years;
-    }
-
-    public String getCopyrightOwner() {
-        return copyrightOwner;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public License getLicense() {
-        return license;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(final Parcel dest, final int flags) {
-        dest.writeString(name);
-        dest.writeParcelable(license, flags);
-        dest.writeString(copyrightOwner);
-        dest.writeString(link);
-        dest.writeString(years);
-        dest.writeString(version);
-    }
-}

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

@@ -0,0 +1,16 @@
+package org.schabi.newpipe.about
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@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

app/src/main/java/org/schabi/newpipe/database/BasicDAO.java

@@ -9,7 +9,7 @@ import androidx.room.Update;
 import java.util.Collection;
 import java.util.List;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 @Dao
 public interface BasicDAO<Entity> {

app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt

@@ -6,19 +6,20 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
-import io.reactivex.Flowable
-import java.time.OffsetDateTime
+import io.reactivex.rxjava3.core.Flowable
 import org.schabi.newpipe.database.feed.model.FeedEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
+import java.time.OffsetDateTime
 
 @Dao
 abstract class FeedDAO {
     @Query("DELETE FROM feed")
     abstract fun deleteAll(): Int
 
-    @Query("""
+    @Query(
+        """
         SELECT s.* FROM streams s
 
         INNER JOIN feed f
@@ -27,10 +28,12 @@ abstract class FeedDAO {
         ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
 
         LIMIT 500
-        """)
+        """
+    )
     abstract fun getAllStreams(): Flowable<List<StreamEntity>>
 
-    @Query("""
+    @Query(
+        """
         SELECT s.* FROM streams s
 
         INNER JOIN feed f
@@ -46,10 +49,12 @@ abstract class FeedDAO {
 
         ORDER BY s.upload_date IS NULL DESC, s.upload_date DESC, s.uploader ASC
         LIMIT 500
-        """)
+        """
+    )
     abstract fun getAllStreamsFromGroup(groupId: Long): Flowable<List<StreamEntity>>
 
-    @Query("""
+    @Query(
+        """
         DELETE FROM feed WHERE
 
         feed.stream_id IN (
@@ -60,10 +65,12 @@ abstract class FeedDAO {
 
             WHERE s.upload_date < :offsetDateTime
         )
-        """)
+        """
+    )
     abstract fun unlinkStreamsOlderThan(offsetDateTime: OffsetDateTime)
 
-    @Query("""
+    @Query(
+        """
         DELETE FROM feed
         
         WHERE feed.subscription_id = :subscriptionId
@@ -76,7 +83,8 @@ abstract class FeedDAO {
 
             WHERE s.stream_type = "LIVE_STREAM" OR s.stream_type = "AUDIO_LIVE_STREAM"
         )
-        """)
+        """
+    )
     abstract fun unlinkOldLivestreams(subscriptionId: Long)
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
@@ -100,12 +108,14 @@ abstract class FeedDAO {
         }
     }
 
-    @Query("""
+    @Query(
+        """
         SELECT MIN(lu.last_updated) FROM feed_last_updated lu
 
         INNER JOIN feed_group_subscription_join fgs
         ON fgs.subscription_id = lu.subscription_id AND fgs.group_id = :groupId
-        """)
+        """
+    )
     abstract fun oldestSubscriptionUpdate(groupId: Long): Flowable<List<OffsetDateTime>>
 
     @Query("SELECT MIN(last_updated) FROM feed_last_updated")
@@ -114,7 +124,8 @@ abstract class FeedDAO {
     @Query("SELECT COUNT(*) FROM feed_last_updated WHERE last_updated IS NULL")
     abstract fun notLoadedCount(): Flowable<Long>
 
-    @Query("""
+    @Query(
+        """
         SELECT COUNT(*) FROM subscriptions s
         
         INNER JOIN feed_group_subscription_join fgs
@@ -124,20 +135,24 @@ abstract class FeedDAO {
         ON s.uid = lu.subscription_id 
 
         WHERE lu.last_updated IS NULL
-        """)
+        """
+    )
     abstract fun notLoadedCountForGroup(groupId: Long): Flowable<Long>
 
-    @Query("""
+    @Query(
+        """
         SELECT s.* FROM subscriptions s
 
         LEFT JOIN feed_last_updated lu
         ON s.uid = lu.subscription_id 
 
         WHERE lu.last_updated IS NULL OR lu.last_updated < :outdatedThreshold
-        """)
+        """
+    )
     abstract fun getAllOutdated(outdatedThreshold: OffsetDateTime): Flowable<List<SubscriptionEntity>>
 
-    @Query("""
+    @Query(
+        """
         SELECT s.* FROM subscriptions s
 
         INNER JOIN feed_group_subscription_join fgs
@@ -147,6 +162,7 @@ abstract class FeedDAO {
         ON s.uid = lu.subscription_id
 
         WHERE lu.last_updated IS NULL OR lu.last_updated < :outdatedThreshold
-        """)
+        """
+    )
     abstract fun getAllOutdatedForGroup(groupId: Long, outdatedThreshold: OffsetDateTime): Flowable<List<SubscriptionEntity>>
 }

app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedGroupDAO.kt

@@ -6,8 +6,8 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
-import io.reactivex.Flowable
-import io.reactivex.Maybe
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Maybe
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity
 

app/src/main/java/org/schabi/newpipe/database/feed/model/FeedEntity.kt

@@ -10,21 +10,24 @@ import org.schabi.newpipe.database.feed.model.FeedEntity.Companion.SUBSCRIPTION_
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
 
-@Entity(tableName = FEED_TABLE,
-        primaryKeys = [STREAM_ID, SUBSCRIPTION_ID],
-        indices = [Index(SUBSCRIPTION_ID)],
-        foreignKeys = [
-            ForeignKey(
-                    entity = StreamEntity::class,
-                    parentColumns = [StreamEntity.STREAM_ID],
-                    childColumns = [STREAM_ID],
-                    onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true),
-            ForeignKey(
-                    entity = SubscriptionEntity::class,
-                    parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
-                    childColumns = [SUBSCRIPTION_ID],
-                    onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true)
-        ]
+@Entity(
+    tableName = FEED_TABLE,
+    primaryKeys = [STREAM_ID, SUBSCRIPTION_ID],
+    indices = [Index(SUBSCRIPTION_ID)],
+    foreignKeys = [
+        ForeignKey(
+            entity = StreamEntity::class,
+            parentColumns = [StreamEntity.STREAM_ID],
+            childColumns = [STREAM_ID],
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
+        ),
+        ForeignKey(
+            entity = SubscriptionEntity::class,
+            parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
+            childColumns = [SUBSCRIPTION_ID],
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
+        )
+    ]
 )
 data class FeedEntity(
     @ColumnInfo(name = STREAM_ID)

app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupEntity.kt

@@ -9,8 +9,8 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity.Companion.SORT_ORD
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
 @Entity(
-        tableName = FEED_GROUP_TABLE,
-        indices = [Index(SORT_ORDER)]
+    tableName = FEED_GROUP_TABLE,
+    indices = [Index(SORT_ORDER)]
 )
 data class FeedGroupEntity(
     @PrimaryKey(autoGenerate = true)

app/src/main/java/org/schabi/newpipe/database/feed/model/FeedGroupSubscriptionEntity.kt

@@ -11,22 +11,24 @@ import org.schabi.newpipe.database.feed.model.FeedGroupSubscriptionEntity.Compan
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
 
 @Entity(
-        tableName = FEED_GROUP_SUBSCRIPTION_TABLE,
-        primaryKeys = [GROUP_ID, SUBSCRIPTION_ID],
-        indices = [Index(SUBSCRIPTION_ID)],
-        foreignKeys = [
-            ForeignKey(
-                    entity = FeedGroupEntity::class,
-                    parentColumns = [FeedGroupEntity.ID],
-                    childColumns = [GROUP_ID],
-                    onDelete = CASCADE, onUpdate = CASCADE, deferred = true),
+    tableName = FEED_GROUP_SUBSCRIPTION_TABLE,
+    primaryKeys = [GROUP_ID, SUBSCRIPTION_ID],
+    indices = [Index(SUBSCRIPTION_ID)],
+    foreignKeys = [
+        ForeignKey(
+            entity = FeedGroupEntity::class,
+            parentColumns = [FeedGroupEntity.ID],
+            childColumns = [GROUP_ID],
+            onDelete = CASCADE, onUpdate = CASCADE, deferred = true
+        ),
 
-            ForeignKey(
-                    entity = SubscriptionEntity::class,
-                    parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
-                    childColumns = [SUBSCRIPTION_ID],
-                    onDelete = CASCADE, onUpdate = CASCADE, deferred = true)
-        ]
+        ForeignKey(
+            entity = SubscriptionEntity::class,
+            parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
+            childColumns = [SUBSCRIPTION_ID],
+            onDelete = CASCADE, onUpdate = CASCADE, deferred = true
+        )
+    ]
 )
 data class FeedGroupSubscriptionEntity(
     @ColumnInfo(name = GROUP_ID)

app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt

@@ -4,20 +4,21 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.FEED_LAST_UPDATED_TABLE
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.SUBSCRIPTION_ID
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
+import java.time.OffsetDateTime
 
 @Entity(
-        tableName = FEED_LAST_UPDATED_TABLE,
-        foreignKeys = [
-            ForeignKey(
-                    entity = SubscriptionEntity::class,
-                    parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
-                    childColumns = [SUBSCRIPTION_ID],
-                    onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true)
-        ]
+    tableName = FEED_LAST_UPDATED_TABLE,
+    foreignKeys = [
+        ForeignKey(
+            entity = SubscriptionEntity::class,
+            parentColumns = [SubscriptionEntity.SUBSCRIPTION_UID],
+            childColumns = [SUBSCRIPTION_ID],
+            onDelete = ForeignKey.CASCADE, onUpdate = ForeignKey.CASCADE, deferred = true
+        )
+    ]
 )
 data class FeedLastUpdatedEntity(
     @PrimaryKey

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java

@@ -8,7 +8,7 @@ import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 
 import java.util.List;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.CREATION_DATE;
 import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.ID;

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

@@ -10,7 +10,7 @@ import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 
 import java.util.List;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;
@@ -20,6 +20,9 @@ import static org.schabi.newpipe.database.stream.StreamStatisticsEntry.STREAM_LA
 import static org.schabi.newpipe.database.stream.StreamStatisticsEntry.STREAM_WATCH_COUNT;
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_ID;
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID_ALIAS;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_PROGRESS_TIME;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
 
 @Dao
 public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity> {
@@ -73,6 +76,12 @@ public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity
             + "  SUM(" + STREAM_REPEAT_COUNT + ") AS " + STREAM_WATCH_COUNT
             + " FROM " + STREAM_HISTORY_TABLE + " GROUP BY " + JOIN_STREAM_ID + ")"
 
-            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID)
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID
+
+            + " LEFT JOIN "
+            + "(SELECT " + JOIN_STREAM_ID + " AS " + JOIN_STREAM_ID_ALIAS + ", "
+            +  STREAM_PROGRESS_TIME
+            + " FROM " + STREAM_STATE_TABLE + " )"
+            + " ON " + STREAM_ID + " = " + JOIN_STREAM_ID_ALIAS)
     public abstract Flowable<List<StreamStatisticsEntry>> getStatistics();
 }

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

@@ -2,8 +2,8 @@ package org.schabi.newpipe.database.history.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.stream.model.StreamEntity
+import java.time.OffsetDateTime
 
 data class StreamHistoryEntry(
     @Embedded
@@ -25,6 +25,6 @@ data class StreamHistoryEntry(
 
     fun hasEqualValues(other: StreamHistoryEntry): Boolean {
         return this.streamEntity.uid == other.streamEntity.uid && streamId == other.streamId &&
-                accessDate.isEqual(other.accessDate)
+            accessDate.isEqual(other.accessDate)
     }
 }

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.kt

@@ -5,12 +5,17 @@ import androidx.room.Embedded
 import org.schabi.newpipe.database.LocalItem
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
+import org.schabi.newpipe.database.stream.model.StreamStateEntity
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
+import kotlin.jvm.Throws
 
 class PlaylistStreamEntry(
     @Embedded
     val streamEntity: StreamEntity,
 
+    @ColumnInfo(name = StreamStateEntity.STREAM_PROGRESS_TIME, defaultValue = "0")
+    val progressTime: Long,
+
     @ColumnInfo(name = PlaylistStreamEntity.JOIN_STREAM_ID)
     val streamId: Long,
 

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

@@ -8,7 +8,7 @@ import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
 
 import java.util.List;
 
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;