Merge pull request #5456 from TeamNewPipe/release_0.20.9

Release 0.20.10

.github/CONTRIBUTING.md

@@ -1,68 +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/implement an issue/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.
-* When reporting a bug please give us a context, and a description how to reproduce it.
-* Issues that only contain a generated bug report, but no description 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
-tnp@newpipe.schabi.org to let me 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 can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
-with your GitHub account.
+* 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
 
-* Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
-* 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, not on the master branch. This is commonly known as *feature branch workflow*. You
-  may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might
-  not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
-* 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!
+* 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_ 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 merge the master branch manually and resolve the problems on your own. 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.
-* Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
-* Check if your submission can be build with the current fdroid build server setup.
-* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
-  independent solutions.
 
 ## Communication
 
-* WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* 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
-  tnp(at)schabi.org. 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, IRC or the mailing list!
+* 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.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,38 +7,59 @@ assignees: ''
 ---
 
 <!--
-Oh no, a bug! It happens. Thanks for reporting an issue with NewPipe.
-
-Use this template to notify us if you found a bug.
-
-To make it easier for us to help you please enter detailed information below.
-
-Please note, we only support the latest version of NewPipe and the master branch. Make sure you have that version installed. If you don't, upgrade & reproduce the problem before opening the issue. The release page (https://github.com/TeamNewPipe/NewPipe/releases/latest) is the go-to place to get this version. In order to check your app version, open the left drawer and click on "About".
-
-P.S.: Our contribution guidelines might be a nice document to read before you fill out the report :) You can find it at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md
+Oh no, a bug! It happens. Thanks for reporting an issue with NewPipe. To make it easier for us to help you please enter detailed information in the template we have provided below. If a section isn't relevant, just delete it, though it would be helpful to still provide as much detail as possible.
 -->
-### Version
-<!-- Which version are you using? -->
-- 
 
+<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you feel tired/lazy right now, open your issue some other time. We'll wait. -->
+
+<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
+
+### Checklist
+<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
+
+- [x] I am using the latest version - x.xx.x <!-- Check https://github.com/TeamNewPipe/NewPipe/releases -->
+- [ ] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O -->
+- [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.
+- [ ] This issue contains only one bug. I will open one issue for every bug report I want to file.
 
 ### Steps to reproduce the bug
-<!-- If you can't reproduce it, please try to give as many details as possible on how you think you got to the bug. -->
-Steps to reproduce the behavior:
+<!--
 1. Go to '...'
 2. Press on '....'
 3. Swipe down to '....'
+-->
+
+<!-- If you can't cause the bug to show up again reliably (and hence don't have a proper set of steps to give us), please still try to give as many details as possible on how you think you encountered the bug. -->
+
 
-### Expected behavior
-Tell us what you expected to happen.
 
 ### Actual behaviour
-Tell us what happens instead.
+<!-- Tell us what happens with the steps given above. -->
+
+
+
+### Expected behavior
+<!-- Tell us what you expect to happen. -->
+
+
+
+### Screenshots/Screen recordings
+<!-- If applicable, add screenshots or a screen recording to help explain your problem. GitHub supports uploading them directly in the issue text box. If your file is too big for Github to accept, feel free to paste a link from an image/video hoster here instead. -->
+
+<!-- DON'T POST SCREENSHOTS OF THE ERROR PAGE. Use the buttons given on the error page to paste the error as text in the Logs section below. -->
+
 
-### Screenshots/Screen records
-If applicable, add screenshots or a screen recording to help explain your problem. GitHub should support uploading them directly in the issue field. If your file is too big, feel free to paste a link from an image/video hoster here instead.
 
 ### Logs
-If your bug includes a crash, please head over to the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/). Copy the result. Paste it here:
+<!-- If your bug includes a crash (where you're shown the Error Report page with a bunch of info), tap on "Copy formatted report" at the bottom and paste it here: -->
 
 <!-- That's right, here! -->
+
+
+
+<!-- Please fill this out when you do not provide a log generate by NewPipe -->
+
+### Device info
+
+ - Android version/Custom ROM version:
+ - Device model:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,24 +5,42 @@ labels: enhancement
 assignees: ''
 
 ---
-<!-- Hey. Our contribution guidelines (https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) might be an appropriate
- document to read before you fill out the request :) -->
-#### Is your feature request related to a problem? Please describe it
-A clear and concise description of what the problem is.
-Example: *I want to do X, but there is no way to do it.*
+<!-- IF YOU DON'T FILL IN THE TEMPLATE PROPERLY, YOUR ISSUE IS LIABLE TO BE CLOSED. If you feel tired/lazy right now, open your issue some other time. We'll wait. -->
 
-#### Describe the solution you'd like
-A clear and concise description of what you want to happen.
+
+<!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
+
+### Checklist
+<!-- This checklist is COMPULSORY. The first box has been checked for you to show you how it is done. -->
+
+- [x] I checked, but didn't find any duplicates (open OR closed) of this issue in the repo. <!-- Seriously, check. O_O -->
+- [ ] I have read the contribution guidelines given at https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md.
+- [ ] This issue contains only one feature request. I will open one issue for every feature I want to request.
+
+
+#### Describe the feature you want
+<!-- A clear and concise description of what you wish should happen.
 Example: *I think it would be nice if you add feature Y which makes X possible.*
 
-#### (Optional) Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
-Example: *I considered Z, but that didn't turn out to be a good idea because...*
+Optionally, also describe alternatives you've considered.
+Example: *Z is also a good alternative. Not as good as Y, but at least...* or *I considered Z, but that didn't turn out to be a good idea because...* -->
+
+
+
+#### Is your feature request related to a problem? Please describe it
+<!-- A clear and concise description of what the problem is. Maybe the developers and the community could brainstorm and come up with a better solution to your problem. If they exist, link to related Issues and/or PRs for developers to keep track easier.
+Example: *I want to do X, but there is no way to do it.* -->
+
+
 
 #### Additional context
-Add any other context or screenshots about the feature request here.
-Example: *Here's a photo of my cat!*
+<!-- Add any other context, like screenshots, about the feature request here.
+Example: *Here's a photo of my cat!* -->
+
+
 
 #### How will you/everyone benefit from this feature?
-Convince us! How does it change your NewPipe experience and/or your life?
+<!-- Convince us! How does it change your NewPipe experience and/or your life?
 The better this paragraph is, the more likely a developer will think about working on it.
+Example: *This feature will help us colonize the galaxy! -->
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,26 +1,29 @@
-<!-- Hey there. Thank you so much for improving NewPipe. Please take a moment to fill out the following suggestion on how to structure this PR description. Having roughly the same layout helps everyone considerably :)-->
+<!-- Hey there. Thank you so much for improving NewPipe, and filling out the details. Having roughly the same layout helps everyone considerably :)-->
 
 #### What is it?
-- [ ] Bug fix
-- [ ] Feature
+- [ ] Bugfix (user facing)
+- [ ] Feature (user facing)
+- [ ] Codebase improvement (dev facing)
+- [ ] Meta improvement to the project (dev facing)
 
-#### Long description of the changes in your PR
-<!-- While bullet points are the norm in this section, feel free to write a text instead if you can't fit it in a list -->
+#### Description of the changes in your PR
+<!-- While bullet points are the norm in this section, feel free to write free-form text instead of a list -->
 - record videos
 - create clones
 - take over the world
 
 #### Fixes the following issue(s)
-<!-- Also add reddit or other links which are relevant to your change. -->
+<!-- Also add any other links relevant to your change. -->
 - 
 
 #### Relies on the following changes
 <!-- Delete this if it doesn't apply to you. -->
 - 
 
-#### Testing apk
-<!-- Ensure that you have your changes on a new branch which has a meaningful name. This name will be used as a suffix for the app ID to allow installing and testing multiple versions of NewPipe. Do NOT name your branches like "patch-0" and "feature-1". For example, if your PR implements a bug fix for comments, an appropriate branch name would be "commentfix". -->
-debug.zip
+#### APK testing 
+<!-- Use a new, meaningfully named branch. The name is used as a suffix for the app ID to allow installing and testing multiple versions of NewPipe, e.g. "commentfix", if your PR implements a bugfix for comments. (No names like "patch-0" and "feature-1".)  -->
+<!-- Remove the following line if you directly link the APK created by the CI pipeline. Directly linking is preferred if you need to let users test.-->
+On the website the APK can be found by going to the "Checks" tab below the title and then on "artifacts" on the right.
 
-#### Agreement
-- [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
+#### Due diligence
+- [ ] I read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md).

.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: create and checkout branch
+        # push events already checked out the branch
+        if: github.event_name == 'pull_request'
+        run: git checkout -B ${{ github.head_ref }}
+
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 1.8
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - name: Build debug APK and run Tests
+        run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
+        with:
+          name: app
+          path: app/build/outputs/apk/debug/*.apk

.gitignore

@@ -10,3 +10,11 @@
 *~
 .weblate
 *.class
+
+# vscode / eclipse files
+*.classpath
+*.project
+*.settings
+bin/
+.vscode/
+*.code-workspace

.travis.yml

@@ -1,18 +0,0 @@
-language: android
-jdk:
-    - oraclejdk8
-android:
-  components:
-    # The BuildTools version used by NewPipe
-    - tools
-    - build-tools-28.0.3
-
-    # The SDK version used to compile NewPipe
-    - android-28
-
-before_install: 
-  - yes | sdkmanager "platforms;android-28"
-script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
-
-licenses:
-  - '.+'

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

@@ -30,49 +30,63 @@ class AppDatabaseTest {
         private const val DEFAULT_SECOND_URL = "https://www.youtube.com/watch?v=ncQU6iBn5Fc"
     }
 
-    @get:Rule val testHelper = MigrationTestHelper(InstrumentationRegistry.getInstrumentation(),
-            AppDatabase::class.java.canonicalName, FrameworkSQLiteOpenHelperFactory());
+    @get:Rule
+    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()
@@ -109,10 +123,12 @@ 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

@@ -1,37 +1,38 @@
 package org.schabi.newpipe.report;
 
 import android.os.Parcel;
-import androidx.test.filters.LargeTest;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+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;
 
 /**
- * Instrumented tests for {@link ErrorInfo}
+ * Instrumented tests for {@link ErrorInfo}.
  */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class ErrorInfoTest {
 
     @Test
-    public void errorInfo_testParcelable() {
-        ErrorInfo info = ErrorInfo.make(UserAction.USER_REPORT, "youtube", "request", R.string.general_error);
+    public void errorInfoTestParcelable() {
+        final ErrorInfo info = ErrorInfo.make(UserAction.USER_REPORT, "youtube", "request",
+                R.string.general_error);
         // Obtain a Parcel object and write the parcelable object to it:
-        Parcel parcel = Parcel.obtain();
+        final Parcel parcel = Parcel.obtain();
         info.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
-        ErrorInfo infoFromParcel = ErrorInfo.CREATOR.createFromParcel(parcel);
+        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.java

@@ -1,104 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import androidx.annotation.NonNull;
-import androidx.multidex.MultiDex;
-
-import com.facebook.stetho.Stetho;
-import com.facebook.stetho.okhttp3.StethoInterceptor;
-import com.squareup.leakcanary.AndroidHeapDumper;
-import com.squareup.leakcanary.DefaultLeakDirectoryProvider;
-import com.squareup.leakcanary.HeapDumper;
-import com.squareup.leakcanary.LeakCanary;
-import com.squareup.leakcanary.LeakDirectoryProvider;
-import com.squareup.leakcanary.RefWatcher;
-
-import org.schabi.newpipe.extractor.downloader.Downloader;
-
-import java.io.File;
-import java.util.concurrent.TimeUnit;
-
-import okhttp3.OkHttpClient;
-
-public class DebugApp extends App {
-    private static final String TAG = DebugApp.class.toString();
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        MultiDex.install(this);
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        initStetho();
-    }
-
-    @Override
-    protected Downloader getDownloader() {
-        return DownloaderImpl.init(new OkHttpClient.Builder()
-                .addNetworkInterceptor(new StethoInterceptor()));
-    }
-
-    private void initStetho() {
-        // Create an InitializerBuilder
-        Stetho.InitializerBuilder initializerBuilder =
-                Stetho.newInitializerBuilder(this);
-
-        // Enable Chrome DevTools
-        initializerBuilder.enableWebKitInspector(
-                Stetho.defaultInspectorModulesProvider(this)
-        );
-
-        // Enable command line interface
-        initializerBuilder.enableDumpapp(
-                Stetho.defaultDumperPluginsProvider(getApplicationContext())
-        );
-
-        // Use the InitializerBuilder to generate an Initializer
-        Stetho.Initializer initializer = initializerBuilder.build();
-
-        // Initialize Stetho with the Initializer
-        Stetho.initialize(initializer);
-    }
-
-    @Override
-    protected boolean isDisposedRxExceptionsReported() {
-        return PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean(getString(R.string.allow_disposed_exceptions_key), false);
-    }
-
-    @Override
-    protected RefWatcher installLeakCanary() {
-        return LeakCanary.refWatcher(this)
-                .heapDumper(new ToggleableHeapDumper(this))
-                // give each object 10 seconds to be gc'ed, before leak canary gets nosy on it
-                .watchDelay(10, TimeUnit.SECONDS)
-                .buildAndInstall();
-    }
-
-    public static class ToggleableHeapDumper implements HeapDumper {
-        private final HeapDumper dumper;
-        private final SharedPreferences preferences;
-        private final String dumpingAllowanceKey;
-
-        ToggleableHeapDumper(@NonNull final Context context) {
-            LeakDirectoryProvider leakDirectoryProvider = new DefaultLeakDirectoryProvider(context);
-            this.dumper = new AndroidHeapDumper(context, leakDirectoryProvider);
-            this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
-            this.dumpingAllowanceKey = context.getString(R.string.allow_heap_dumping_key);
-        }
-
-        private boolean isDumpingAllowed() {
-            return preferences.getBoolean(dumpingAllowanceKey, false);
-        }
-
-        @Override
-        public File dumpHeap() {
-            return isDumpingAllowed() ? dumper.dumpHeap() : HeapDumper.RETRY_LATER;
-        }
-    }
-}

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

@@ -0,0 +1,61 @@
+package org.schabi.newpipe
+
+import androidx.preference.PreferenceManager
+import com.facebook.stetho.Stetho
+import com.facebook.stetho.okhttp3.StethoInterceptor
+import leakcanary.AppWatcher
+import leakcanary.LeakCanary
+import okhttp3.OkHttpClient
+import org.schabi.newpipe.extractor.downloader.Downloader
+
+class DebugApp : App() {
+    override fun onCreate() {
+        super.onCreate()
+        initStetho()
+
+        // 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
+                )
+        )
+    }
+
+    override fun getDownloader(): Downloader {
+        val downloader = DownloaderImpl.init(
+            OkHttpClient.Builder()
+                .addNetworkInterceptor(StethoInterceptor())
+        )
+        setCookiesToDownloader(downloader)
+        return downloader
+    }
+
+    private fun initStetho() {
+        // Create an InitializerBuilder
+        val initializerBuilder = Stetho.newInitializerBuilder(this)
+
+        // Enable Chrome DevTools
+        initializerBuilder.enableWebKitInspector(Stetho.defaultInspectorModulesProvider(this))
+
+        // Enable command line interface
+        initializerBuilder.enableDumpapp(
+            Stetho.defaultDumperPluginsProvider(applicationContext)
+        )
+
+        // Use the InitializerBuilder to generate an Initializer
+        val initializer = initializerBuilder.build()
+
+        // Initialize Stetho with the Initializer
+        Stetho.initialize(initializer)
+    }
+
+    override fun isDisposedRxExceptionsReported(): Boolean {
+        return PreferenceManager.getDefaultSharedPreferences(this)
+            .getBoolean(getString(R.string.allow_disposed_exceptions_key), false)
+    }
+}

app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java

@@ -0,0 +1,27 @@
+package org.schabi.newpipe.settings;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import org.schabi.newpipe.R;
+
+import leakcanary.LeakCanary;
+
+public class DebugSettingsFragment extends BasePreferenceFragment {
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        findPreference(getString(R.string.show_memory_leaks_key))
+                .setOnPreferenceClickListener(preference -> {
+                    startActivity(LeakCanary.INSTANCE.newLeakDisplayActivityIntent());
+                    return true;
+                });
+    }
+
+    @Override
+    public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+        addPreferencesFromResource(R.xml.debug_settings);
+    }
+}

app/src/debug/res/xml/main_settings.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="general_preferences"
+    android:title="@string/settings">
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.VideoAudioSettingsFragment"
+        android:icon="?attr/ic_headset"
+        android:title="@string/settings_category_video_audio_title"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.DownloadSettingsFragment"
+        android:icon="?attr/ic_file_download"
+        android:title="@string/settings_category_downloads_title"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.AppearanceSettingsFragment"
+        android:icon="?attr/ic_palette"
+        android:title="@string/settings_category_appearance_title"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.HistorySettingsFragment"
+        android:icon="?attr/ic_history"
+        android:title="@string/settings_category_history_title"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.ContentSettingsFragment"
+        android:icon="?attr/ic_language"
+        android:title="@string/content"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.NotificationSettingsFragment"
+        android:icon="?attr/ic_play_arrow"
+        android:title="@string/settings_category_notification_title"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.UpdateSettingsFragment"
+        android:icon="?attr/ic_settings_update"
+        android:key="update_pref_screen_key"
+        android:title="@string/settings_category_updates_title"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceScreen
+        android:fragment="org.schabi.newpipe.settings.DebugSettingsFragment"
+        android:icon="?attr/ic_bug_report"
+        android:key="@string/debug_pref_screen_key"
+        android:title="@string/settings_category_debug_title"
+        app:iconSpaceReserved="false" />
+</PreferenceScreen>

app/src/main/assets/epl1.html

@@ -0,0 +1,245 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0050)https://www.eclipse.org/org/documents/epl-v10.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+
+    <title>Eclipse Public License - Version 1.0</title>
+
+</head>
+
+<body cz-shortcut-listen="true" lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+    DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+    AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+    code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+    originate from and are distributed by that particular Contributor. A
+    Contribution 'originates' from a Contributor if it was added to the
+    Program by such Contributor itself or anyone acting on such
+    Contributor's behalf. Contributions do not include additions to the
+    Program which: (i) are separate modules of software distributed in
+    conjunction with the Program under their own license agreement, and (ii)
+    are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+    the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+    Contributor which are necessarily infringed by the use or sale of its
+    Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+    with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+    this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+    Contributor hereby grants Recipient a non-exclusive, worldwide,
+    royalty-free copyright license to reproduce, prepare derivative works
+    of, publicly display, publicly perform, distribute and sublicense the
+    Contribution of such Contributor, if any, and such derivative works, in
+    source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+    Contributor hereby grants Recipient a non-exclusive, worldwide,
+    royalty-free patent license under Licensed Patents to make, use, sell,
+    offer to sell, import and otherwise transfer the Contribution of such
+    Contributor, if any, in source code and object code form. This patent
+    license shall apply to the combination of the Contribution and the
+    Program if, at the time the Contribution is added by the Contributor,
+    such addition of the Contribution causes such combination to be covered
+    by the Licensed Patents. The patent license shall not apply to any other
+    combinations which include the Contribution. No hardware per se is
+    licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+    grants the licenses to its Contributions set forth herein, no assurances
+    are provided by any Contributor that the Program does not infringe the
+    patent or other intellectual property rights of any other entity. Each
+    Contributor disclaims any liability to Recipient for claims brought by
+    any other entity based on infringement of intellectual property rights
+    or otherwise. As a condition to exercising the rights and licenses
+    granted hereunder, each Recipient hereby assumes sole responsibility to
+    secure any other intellectual property rights needed, if any. For
+    example, if a third party patent license is required to allow Recipient
+    to distribute the Program, it is Recipient's responsibility to acquire
+    that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+    has sufficient copyright rights in its Contribution, if any, to grant
+    the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+    form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+    Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+    all warranties and conditions, express and implied, including warranties
+    or conditions of title and non-infringement, and implied warranties or
+    conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+    all liability for damages, including direct, indirect, special,
+    incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+    Agreement are offered by that Contributor alone and not by any other
+    party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+    from such Contributor, and informs licensees how to obtain it in a
+    reasonable manner on or through a medium customarily used for software
+    exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+    copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+    within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+    Contribution, if any, in a manner that reasonably allows subsequent
+    Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+    responsibilities with respect to end users, business partners and the
+    like. While this license is intended to facilitate the commercial use of
+    the Program, the Contributor who includes the Program in a commercial
+    product offering should do so in a manner which does not create
+    potential liability for other Contributors. Therefore, if a Contributor
+    includes the Program in a commercial product offering, such Contributor
+    ("Commercial Contributor") hereby agrees to defend and
+    indemnify every other Contributor ("Indemnified Contributor")
+    against any losses, damages and costs (collectively "Losses")
+    arising from claims, lawsuits and other legal actions brought by a third
+    party against the Indemnified Contributor to the extent caused by the
+    acts or omissions of such Commercial Contributor in connection with its
+    distribution of the Program in a commercial product offering. The
+    obligations in this section do not apply to any claims or Losses
+    relating to any actual or alleged intellectual property infringement. In
+    order to qualify, an Indemnified Contributor must: a) promptly notify
+    the Commercial Contributor in writing of such claim, and b) allow the
+    Commercial Contributor to control, and cooperate with the Commercial
+    Contributor in, the defense and any related settlement negotiations. The
+    Indemnified Contributor may participate in any such claim at its own
+    expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+    product offering, Product X. That Contributor is then a Commercial
+    Contributor. If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone. Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those
+    performance claims and warranties, and if a court requires any other
+    Contributor to pay any damages as a result, the Commercial Contributor
+    must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+    PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+    OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+    ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+    OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+    responsible for determining the appropriateness of using and
+    distributing the Program and assumes all risks associated with its
+    exercise of rights under this Agreement , including but not limited to
+    the risks and costs of program errors, compliance with applicable laws,
+    damage to or loss of data, programs or equipment, and unavailability or
+    interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+    NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+    WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+    DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further action
+    by the parties hereto, such provision shall be reformed to the minimum
+    extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+    (including a cross-claim or counterclaim in a lawsuit) alleging that the
+    Program itself (excluding combinations of the Program with other
+    software or hardware) infringes such Recipient's patent(s), then such
+    Recipient's rights granted under Section 2(b) shall terminate as of the
+    date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+    fails to comply with any of the material terms or conditions of this
+    Agreement and does not cure such failure in a reasonable period of time
+    after becoming aware of such noncompliance. If all Recipient's rights
+    under this Agreement terminate, Recipient agrees to cease use and
+    distribution of the Program as soon as reasonably practicable. However,
+    Recipient's obligations under this Agreement and any licenses granted by
+    Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+    Agreement, but in order to avoid inconsistency the Agreement is
+    copyrighted and may only be modified in the following manner. The
+    Agreement Steward reserves the right to publish new versions (including
+    revisions) of this Agreement from time to time. No one other than the
+    Agreement Steward has the right to modify this Agreement. The Eclipse
+    Foundation is the initial Agreement Steward. The Eclipse Foundation may
+    assign the responsibility to serve as the Agreement Steward to a
+    suitable separate entity. Each new version of the Agreement will be
+    given a distinguishing version number. The Program (including
+    Contributions) may always be distributed subject to the version of the
+    Agreement under which it was received. In addition, after a new version
+    of the Agreement is published, Contributor may elect to distribute the
+    Program (including its Contributions) under the new version. Except as
+    expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+    rights or licenses to the intellectual property of any Contributor under
+    this Agreement, whether expressly, by implication, estoppel or
+    otherwise. All rights in the Program not expressly granted under this
+    Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+    the intellectual property laws of the United States of America. No party
+    to this Agreement will bring a legal action under this Agreement more
+    than one year after the cause of action arose. Each party waives its
+    rights to a jury trial in any resulting litigation.</p>
+
+
+</body>
+</html>

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

@@ -38,12 +38,15 @@ import java.util.ArrayList;
  * This is a copy from {@link androidx.fragment.app.FragmentStatePagerAdapter}.
  * <p>
  * It includes a workaround to fix the menu visibility when the adapter is restored.
+ * </p>
  * <p>
  * When restoring the state of this adapter, all the fragments' menu visibility were set to false,
- * effectively disabling the menu from the user until he switched pages or another event that triggered the
- * menu to be visible again happened.
+ * effectively disabling the menu from the user until he switched pages or another event
+ * that triggered the menu to be visible again happened.
+ * </p>
  * <p>
- * <br><b>Check out the changes in:</b>
+ * <b>Check out the changes in:</b>
+ * </p>
  * <ul>
  *     <li>{@link #saveState()}</li>
  *     <li>{@link #restoreState(Parcelable, ClassLoader)}</li>
@@ -83,13 +86,13 @@ 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;
 
     /**
-     * Constructor for {@link FragmentStatePagerAdapterMenuWorkaround} that sets the fragment manager for the
-     * adapter. This is the equivalent of calling
+     * Constructor for {@link FragmentStatePagerAdapterMenuWorkaround}
+     * that sets the fragment manager for the adapter. This is the equivalent of calling
      * {@link #FragmentStatePagerAdapterMenuWorkaround(FragmentManager, int)} and passing in
      * {@link #BEHAVIOR_SET_USER_VISIBLE_HINT}.
      *
@@ -101,7 +104,7 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
      * {@link #BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT}
      */
     @Deprecated
-    public FragmentStatePagerAdapterMenuWorkaround(@NonNull FragmentManager fm) {
+    public FragmentStatePagerAdapterMenuWorkaround(@NonNull final FragmentManager fm) {
         this(fm, BEHAVIOR_SET_USER_VISIBLE_HINT);
     }
 
@@ -117,20 +120,21 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
      * @param fm fragment manager that will interact with this adapter
      * @param behavior determines if only current fragments are in a resumed state
      */
-    public FragmentStatePagerAdapterMenuWorkaround(@NonNull FragmentManager fm,
-                                     @Behavior int behavior) {
+    public FragmentStatePagerAdapterMenuWorkaround(@NonNull final FragmentManager fm,
+                                                   @Behavior final int behavior) {
         mFragmentManager = fm;
         mBehavior = behavior;
     }
 
     /**
-     * Return the Fragment associated with a specified position.
+     * @param position the position of the item you want
+     * @return the {@link Fragment} associated with a specified position
      */
     @NonNull
     public abstract Fragment getItem(int position);
 
     @Override
-    public void startUpdate(@NonNull ViewGroup container) {
+    public void startUpdate(@NonNull final ViewGroup container) {
         if (container.getId() == View.NO_ID) {
             throw new IllegalStateException("ViewPager with adapter " + this
                     + " requires a view id");
@@ -140,13 +144,13 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     @SuppressWarnings("deprecation")
     @NonNull
     @Override
-    public Object instantiateItem(@NonNull ViewGroup container, int position) {
+    public Object instantiateItem(@NonNull final ViewGroup container, final int position) {
         // If we already have this item instantiated, there is nothing
         // to do.  This can happen when we are restoring the entire pager
         // from its saved state, where the fragment manager has already
         // taken care of restoring the fragments we previously had instantiated.
         if (mFragments.size() > position) {
-            Fragment f = mFragments.get(position);
+            final Fragment f = mFragments.get(position);
             if (f != null) {
                 return f;
             }
@@ -156,10 +160,12 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
             mCurTransaction = mFragmentManager.beginTransaction();
         }
 
-        Fragment fragment = getItem(position);
-        if (DEBUG) Log.v(TAG, "Adding item #" + position + ": f=" + fragment);
+        final Fragment fragment = getItem(position);
+        if (DEBUG) {
+            Log.v(TAG, "Adding item #" + position + ": f=" + fragment);
+        }
         if (mSavedState.size() > position) {
-            Fragment.SavedState fss = mSavedState.get(position);
+            final Fragment.SavedState fss = mSavedState.get(position);
             if (fss != null) {
                 fragment.setInitialSavedState(fss);
             }
@@ -183,14 +189,17 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     }
 
     @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-        Fragment fragment = (Fragment) object;
+    public void destroyItem(@NonNull final ViewGroup container, final int position,
+                            @NonNull final Object object) {
+        final Fragment fragment = (Fragment) object;
 
         if (mCurTransaction == null) {
             mCurTransaction = mFragmentManager.beginTransaction();
         }
-        if (DEBUG) Log.v(TAG, "Removing item #" + position + ": f=" + object
-                + " v=" + ((Fragment)object).getView());
+        if (DEBUG) {
+            Log.v(TAG, "Removing item #" + position + ": f=" + object
+                    + " v=" + ((Fragment) object).getView());
+        }
         while (mSavedState.size() <= position) {
             mSavedState.add(null);
         }
@@ -206,8 +215,9 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
 
     @Override
     @SuppressWarnings({"ReferenceEquality", "deprecation"})
-    public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-        Fragment fragment = (Fragment)object;
+    public void setPrimaryItem(@NonNull final ViewGroup container, final int position,
+                               @NonNull final Object object) {
+        final Fragment fragment = (Fragment) object;
         if (fragment != mCurrentPrimaryItem) {
             if (mCurrentPrimaryItem != null) {
                 mCurrentPrimaryItem.setMenuVisibility(false);
@@ -235,7 +245,7 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     }
 
     @Override
-    public void finishUpdate(@NonNull ViewGroup container) {
+    public void finishUpdate(@NonNull final ViewGroup container) {
         if (mCurTransaction != null) {
             mCurTransaction.commitNowAllowingStateLoss();
             mCurTransaction = null;
@@ -243,12 +253,12 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     }
 
     @Override
-    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-        return ((Fragment)object).getView() == view;
+    public boolean isViewFromObject(@NonNull final View view, @NonNull final Object object) {
+        return ((Fragment) object).getView() == view;
     }
 
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    private final String SELECTED_FRAGMENT = "selected_fragment";
+    private final String selectedFragment = "selected_fragment";
     //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
     @Override
@@ -257,23 +267,23 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
         Bundle state = null;
         if (mSavedState.size() > 0) {
             state = new Bundle();
-            Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
+            final Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
             mSavedState.toArray(fss);
             state.putParcelableArray("states", fss);
         }
-        for (int i=0; i<mFragments.size(); i++) {
-            Fragment f = mFragments.get(i);
+        for (int i = 0; i < mFragments.size(); i++) {
+            final Fragment f = mFragments.get(i);
             if (f != null && f.isAdded()) {
                 if (state == null) {
                     state = new Bundle();
                 }
-                String key = "f" + i;
+                final String key = "f" + i;
                 mFragmentManager.putFragment(state, key, f);
 
                 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                 // Check if it's the same fragment instance
                 if (f == mCurrentPrimaryItem) {
-                    state.putString(SELECTED_FRAGMENT, key);
+                    state.putString(selectedFragment, key);
                 }
                 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
             }
@@ -282,29 +292,30 @@ public abstract class FragmentStatePagerAdapterMenuWorkaround extends PagerAdapt
     }
 
     @Override
-    public void restoreState(@Nullable Parcelable state, @Nullable ClassLoader loader) {
+    public void restoreState(@Nullable final Parcelable state, @Nullable final ClassLoader loader) {
         if (state != null) {
-            Bundle bundle = (Bundle)state;
+            final Bundle bundle = (Bundle) state;
             bundle.setClassLoader(loader);
-            Parcelable[] fss = bundle.getParcelableArray("states");
+            final Parcelable[] fss = bundle.getParcelableArray("states");
             mSavedState.clear();
             mFragments.clear();
             if (fss != null) {
-                for (int i=0; i<fss.length; i++) {
-                    mSavedState.add((Fragment.SavedState)fss[i]);
+                for (final Parcelable parcelable : fss) {
+                    mSavedState.add((Fragment.SavedState) parcelable);
                 }
             }
-            Iterable<String> keys = bundle.keySet();
-            for (String key: keys) {
+            final Iterable<String> keys = bundle.keySet();
+            for (final String key : keys) {
                 if (key.startsWith("f")) {
-                    int index = Integer.parseInt(key.substring(1));
-                    Fragment f = mFragmentManager.getFragment(bundle, key);
+                    final int index = Integer.parseInt(key.substring(1));
+                    final Fragment f = mFragmentManager.getFragment(bundle, key);
                     if (f != null) {
                         while (mFragments.size() <= index) {
                             mFragments.add(null);
                         }
                         //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                        final boolean wasSelected = bundle.getString(SELECTED_FRAGMENT, "").equals(key);
+                        final boolean wasSelected = bundle.getString(selectedFragment, "")
+                                .equals(key);
                         f.setMenuVisibility(wasSelected);
                         //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                         mFragments.set(index, f);

app/src/main/java/com/google/android/material/appbar/FlingBehavior.java

@@ -1,24 +1,81 @@
 package com.google.android.material.appbar;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
+import android.view.View;
 import android.widget.OverScroller;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
+import org.schabi.newpipe.R;
+
 import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
 
-// check this https://stackoverflow.com/questions/56849221/recyclerview-fling-causes-laggy-while-appbarlayout-is-scrolling/57997489#57997489
+// See https://stackoverflow.com/questions/56849221#57997489
 public final class FlingBehavior extends AppBarLayout.Behavior {
+    private final Rect focusScrollRect = new Rect();
 
-    public FlingBehavior(Context context, AttributeSet attrs) {
+    public FlingBehavior(final Context context, final AttributeSet attrs) {
         super(context, attrs);
     }
 
+    private boolean allowScroll = true;
+    private final Rect globalRect = new Rect();
+    private final List<Integer> skipInterceptionOfElements = Arrays.asList(
+            R.id.itemsListPanel, R.id.playbackSeekBar,
+            R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
+
     @Override
-    public boolean onInterceptTouchEvent(CoordinatorLayout parent, AppBarLayout child, MotionEvent ev) {
+    public boolean onRequestChildRectangleOnScreen(
+            @NonNull final CoordinatorLayout coordinatorLayout, @NonNull final AppBarLayout child,
+            @NonNull final Rect rectangle, final boolean immediate) {
+        focusScrollRect.set(rectangle);
+
+        coordinatorLayout.offsetDescendantRectToMyCoords(child, focusScrollRect);
+
+        final int height = coordinatorLayout.getHeight();
+
+        if (focusScrollRect.top <= 0 && focusScrollRect.bottom >= height) {
+            // the child is too big to fit inside ourselves completely, ignore request
+            return false;
+        }
+
+        final int dy;
+
+        if (focusScrollRect.bottom > height) {
+            dy =  focusScrollRect.top;
+        } else if (focusScrollRect.top < 0) {
+            // scrolling up
+            dy = -(height - focusScrollRect.bottom);
+        } else {
+            // nothing to do
+            return false;
+        }
+
+        final int consumed = scroll(coordinatorLayout, child, dy, getMaxDragOffset(child), 0);
+
+        return consumed == dy;
+    }
+
+    public boolean onInterceptTouchEvent(final CoordinatorLayout parent, final AppBarLayout child,
+                                         final MotionEvent ev) {
+        for (final Integer element : skipInterceptionOfElements) {
+            final View view = child.findViewById(element);
+            if (view != null) {
+                final boolean visible = view.getGlobalVisibleRect(globalRect);
+                if (visible && globalRect.contains((int) ev.getRawX(), (int) ev.getRawY())) {
+                    allowScroll = false;
+                    return false;
+                }
+            }
+        }
+        allowScroll = true;
         switch (ev.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
                 // remove reference to old nested scrolling child
@@ -32,16 +89,37 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
         return super.onInterceptTouchEvent(parent, child, ev);
     }
 
+    @Override
+    public boolean onStartNestedScroll(@NonNull final CoordinatorLayout parent,
+                                       @NonNull final AppBarLayout child,
+                                       @NonNull final View directTargetChild,
+                                       final View target,
+                                       final int nestedScrollAxes,
+                                       final int type) {
+        return allowScroll && super.onStartNestedScroll(
+                parent, child, directTargetChild, target, nestedScrollAxes, type);
+    }
+
+    @Override
+    public boolean onNestedFling(@NonNull final CoordinatorLayout coordinatorLayout,
+                                 @NonNull final AppBarLayout child,
+                                 @NonNull final View target, final float velocityX,
+                                 final float velocityY, final boolean consumed) {
+        return allowScroll && super.onNestedFling(
+                coordinatorLayout, child, target, velocityX, velocityY, consumed);
+    }
+
     @Nullable
     private OverScroller getScrollerField() {
         try {
-            Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass().getSuperclass();
+            final Class<?> headerBehaviorType = this.getClass()
+                    .getSuperclass().getSuperclass().getSuperclass();
             if (headerBehaviorType != null) {
-                Field field = headerBehaviorType.getDeclaredField("scroller");
+                final Field field = headerBehaviorType.getDeclaredField("scroller");
                 field.setAccessible(true);
                 return ((OverScroller) field.get(this));
             }
-        } catch (NoSuchFieldException | IllegalAccessException e) {
+        } catch (final NoSuchFieldException | IllegalAccessException e) {
             // ?
         }
         return null;
@@ -50,33 +128,37 @@ public final class FlingBehavior extends AppBarLayout.Behavior {
     @Nullable
     private Field getLastNestedScrollingChildRefField() {
         try {
-            Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass();
+            final Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass();
             if (headerBehaviorType != null) {
-                Field field = headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
+                final Field field
+                        = headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
                 field.setAccessible(true);
                 return field;
             }
-        } catch (NoSuchFieldException e) {
+        } catch (final NoSuchFieldException e) {
             // ?
         }
         return null;
     }
 
-    private void resetNestedScrollingChild(){
-        Field field = getLastNestedScrollingChildRefField();
-        if(field != null){
+    private void resetNestedScrollingChild() {
+        final Field field = getLastNestedScrollingChildRefField();
+        if (field != null) {
             try {
-                Object value = field.get(this);
-                if(value != null) field.set(this, null);
-            } catch (IllegalAccessException e) {
+                final Object value = field.get(this);
+                if (value != null) {
+                    field.set(this, null);
+                }
+            } catch (final IllegalAccessException e) {
                 // ?
             }
         }
     }
 
     private void stopAppBarLayoutFling() {
-        OverScroller scroller = getScrollerField();
-        if (scroller != null) scroller.forceFinished(true);
+        final OverScroller scroller = getScrollerField();
+        if (scroller != null) {
+            scroller.forceFinished(true);
+        }
     }
-
-}
+}

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

@@ -23,17 +23,25 @@ package org.schabi.newpipe;
 /**
  * Singleton:
  * Used to send data between certain Activity/Services within the same process.
- * This can be considered as an ugly hack inside the Android universe. **/
+ * This can be considered as an ugly hack inside the Android universe.
+ **/
 public class ActivityCommunicator {
 
     private static ActivityCommunicator activityCommunicator;
+    private volatile Class returnActivity;
 
     public static ActivityCommunicator getCommunicator() {
-        if(activityCommunicator == null) {
+        if (activityCommunicator == null) {
             activityCommunicator = new ActivityCommunicator();
         }
         return activityCommunicator;
     }
 
-    public volatile Class returnActivity;
+    public Class getReturnActivity() {
+        return returnActivity;
+    }
+
+    public void setReturnActivity(final Class returnActivity) {
+        this.returnActivity = returnActivity;
+    }
 }

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

@@ -2,32 +2,31 @@ package org.schabi.newpipe;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.squareup.leakcanary.RefWatcher;
 
 import icepick.Icepick;
 import icepick.State;
+import leakcanary.AppWatcher;
 
 public abstract class BaseFragment extends Fragment {
+    public static final ImageLoader IMAGE_LOADER = ImageLoader.getInstance();
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
     protected final boolean DEBUG = MainActivity.DEBUG;
-
     protected AppCompatActivity activity;
-    public static final ImageLoader imageLoader = ImageLoader.getInstance();
-
-    //These values are used for controlling framgents when they are part of the frontpage
+    //These values are used for controlling fragments when they are part of the frontpage
     @State
     protected boolean useAsFrontPage = false;
-    protected boolean mIsVisibleToUser = false;
+    private boolean mIsVisibleToUser = false;
 
-    public void useAsFrontPage(boolean value) {
+    public void useAsFrontPage(final boolean value) {
         useAsFrontPage = value;
     }
 
@@ -36,7 +35,7 @@ public abstract class BaseFragment extends Fragment {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
         activity = (AppCompatActivity) context;
     }
@@ -48,43 +47,49 @@ public abstract class BaseFragment extends Fragment {
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+    public void onCreate(final Bundle savedInstanceState) {
+        if (DEBUG) {
+            Log.d(TAG, "onCreate() called with: "
+                    + "savedInstanceState = [" + savedInstanceState + "]");
+        }
         super.onCreate(savedInstanceState);
         Icepick.restoreInstanceState(this, savedInstanceState);
-        if (savedInstanceState != null) onRestoreInstanceState(savedInstanceState);
+        if (savedInstanceState != null) {
+            onRestoreInstanceState(savedInstanceState);
+        }
     }
 
 
     @Override
-    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         if (DEBUG) {
-            Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
+            Log.d(TAG, "onViewCreated() called with: "
+                    + "rootView = [" + rootView + "], "
+                    + "savedInstanceState = [" + savedInstanceState + "]");
         }
         initViews(rootView, savedInstanceState);
         initListeners();
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
         Icepick.saveInstanceState(this, outState);
     }
 
-    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+    protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
 
-        RefWatcher refWatcher = App.getRefWatcher(getActivity());
-        if (refWatcher != null) refWatcher.watch(this);
+        AppWatcher.INSTANCE.getObjectWatcher().watch(this);
     }
 
     @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
+    public void setUserVisibleHint(final boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
         mIsVisibleToUser = isVisibleToUser;
     }
@@ -93,7 +98,7 @@ public abstract class BaseFragment extends Fragment {
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected void initViews(View rootView, Bundle savedInstanceState) {
+    protected void initViews(final View rootView, final Bundle savedInstanceState) {
     }
 
     protected void initListeners() {
@@ -103,10 +108,12 @@ public abstract class BaseFragment extends Fragment {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    public void setTitle(String title) {
-        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
-        if((!useAsFrontPage || mIsVisibleToUser)
-            && (activity != null && activity.getSupportActionBar() != null)) {
+    public void setTitle(final String title) {
+        if (DEBUG) {
+            Log.d(TAG, "setTitle() called with: title = [" + title + "]");
+        }
+        if ((!useAsFrontPage || mIsVisibleToUser)
+                && (activity != null && activity.getSupportActionBar() != null)) {
             activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
             activity.getSupportActionBar().setTitle(title);
         }

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

@@ -0,0 +1,245 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.net.ConnectivityManager;
+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;
+import androidx.preference.PreferenceManager;
+import com.grack.nanojson.JsonObject;
+import com.grack.nanojson.JsonParser;
+import com.grack.nanojson.JsonParserException;
+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;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.ErrorInfo;
+import org.schabi.newpipe.report.UserAction;
+
+public final class CheckForNewAppVersion {
+    private CheckForNewAppVersion() { }
+
+    private static final boolean DEBUG = MainActivity.DEBUG;
+    private static final String TAG = CheckForNewAppVersion.class.getSimpleName();
+
+    private static final String GITHUB_APK_SHA1
+            = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
+    private static final String NEWPIPE_API_URL = "https://newpipe.net/api/data.json";
+
+    /**
+     * Method to get the APK's SHA1 key. See https://stackoverflow.com/questions/9293019/#22506133.
+     *
+     * @param application The application
+     * @return String with the APK's SHA1 fingerprint in hexadecimal
+     */
+    @NonNull
+    private static String getCertificateSHA1Fingerprint(@NonNull final Application application) {
+        final PackageInfo packageInfo;
+        try {
+            packageInfo = application.getPackageManager().getPackageInfo(
+                    application.getPackageName(), PackageManager.GET_SIGNATURES);
+        } catch (final PackageManager.NameNotFoundException e) {
+            ErrorActivity.reportError(application, e, null, null,
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not find package info", R.string.app_ui_crash));
+            return "";
+        }
+
+        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,
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Certificate error", R.string.app_ui_crash));
+            return "";
+        }
+
+        try {
+            final MessageDigest md = MessageDigest.getInstance("SHA1");
+            final byte[] publicKey = md.digest(c.getEncoded());
+            return byte2HexFormatted(publicKey);
+        } catch (NoSuchAlgorithmException | CertificateEncodingException e) {
+            ErrorActivity.reportError(application, e, null, null,
+                    ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+            return "";
+        }
+    }
+
+    private static String byte2HexFormatted(final byte[] arr) {
+        final StringBuilder str = new StringBuilder(arr.length * 2);
+
+        for (int i = 0; i < arr.length; i++) {
+            String h = Integer.toHexString(arr[i]);
+            final int l = h.length();
+            if (l == 1) {
+                h = "0" + h;
+            }
+            if (l > 2) {
+                h = h.substring(l - 2, l);
+            }
+            str.append(h.toUpperCase());
+            if (i < (arr.length - 1)) {
+                str.append(':');
+            }
+        }
+        return str.toString();
+    }
+
+    /**
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
+     *
+     * @param application    The application
+     * @param versionName    Name of new version
+     * @param apkLocationUrl Url with the new apk
+     * @param versionCode    Code of new version
+     */
+    private static void compareAppVersionAndShowNotification(@NonNull final Application application,
+                                                             final String versionName,
+                                                             final String apkLocationUrl,
+                                                             final int versionCode) {
+        final int notificationId = 2000;
+
+        if (BuildConfig.VERSION_CODE < versionCode) {
+            // A pending intent to open the apk location url in the browser.
+            final Intent viewIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+
+            final Intent intent = new Intent(Intent.ACTION_CHOOSER);
+            intent.putExtra(Intent.EXTRA_INTENT, viewIntent);
+            intent.putExtra(Intent.EXTRA_TITLE, R.string.open_with);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            final PendingIntent pendingIntent
+                    = PendingIntent.getActivity(application, 0, intent, 0);
+
+            final String channelId = application
+                    .getString(R.string.app_update_notification_channel_id);
+            final NotificationCompat.Builder notificationBuilder
+                    = new NotificationCompat.Builder(application, channelId)
+                    .setSmallIcon(R.drawable.ic_newpipe_update)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+                    .setContentTitle(application
+                            .getString(R.string.app_update_notification_content_title))
+                    .setContentText(application
+                            .getString(R.string.app_update_notification_content_text)
+                            + " " + versionName);
+
+            final NotificationManagerCompat notificationManager
+                    = NotificationManagerCompat.from(application);
+            notificationManager.notify(notificationId, notificationBuilder.build());
+        }
+    }
+
+    private static boolean isConnected(@NonNull final App app) {
+        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);
+    }
+
+    @Nullable
+    public static Disposable checkNewVersion(@NonNull final App app) {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
+        final NewVersionManager manager = new NewVersionManager();
+
+        // 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 null;
+        }
+
+        // Check if the last request has happened a certain time ago
+        // to reduce the number of API requests.
+        final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0);
+        if (!manager.isExpired(expiry)) {
+            return null;
+        }
+
+        return Maybe
+            .fromCallable(() -> {
+                if (!isConnected(app)) {
+                    return null;
+                }
+
+                // Make a network request to get latest NewPipe data.
+                return DownloaderImpl.getInstance().get(NEWPIPE_API_URL);
+            })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        response -> {
+                            try {
+                                // Store a timestamp which needs to be exceeded,
+                                // before a new request to the API is made.
+                                final long newExpiry = manager
+                                    .coerceExpiry(response.getHeader("expires"));
+                                prefs.edit()
+                                    .putLong(app.getString(R.string.update_expiry_key), newExpiry)
+                                    .apply();
+                            } catch (final Exception e) {
+                                if (DEBUG) {
+                                    Log.w(TAG, "Could not extract and save new expiry date", e);
+                                }
+                            }
+
+                            // Parse the json from the response.
+                            try {
+                                final JsonObject githubStableObject = JsonParser.object()
+                                    .from(response.responseBody()).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");
+
+                                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, "Could not get NewPipe API: network problem", e);
+                            }
+                        });
+    }
+}

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

@@ -1,238 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Application;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.Signature;
-import android.net.ConnectivityManager;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.preference.PreferenceManager;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import android.util.Log;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.schabi.newpipe.report.ErrorActivity;
-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;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.concurrent.TimeUnit;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-/**
- * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
- * If there is a newer version we show a notification, informing the user. On tapping
- * the notification, the user will be directed to the download link.
- */
-public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
-
-    private static final boolean DEBUG = MainActivity.DEBUG;
-    private static final String TAG = CheckForNewAppVersionTask.class.getSimpleName();
-    private static final Application app = App.getApp();
-    private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
-    private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
-    private static final int timeoutPeriod = 30;
-
-    private SharedPreferences mPrefs;
-    private OkHttpClient client;
-
-    @Override
-    protected void onPreExecute() {
-
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
-
-        // Check if user has enabled/ disabled update checking
-        // and if the current apk is a github one or not.
-        if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
-                || !isGithubApk()) {
-            this.cancel(true);
-        }
-    }
-
-    @Override
-    protected String doInBackground(Void... voids) {
-        
-        if(isCancelled() || !isConnected()) return null;
-
-        // Make a network request to get latest NewPipe data.
-        if (client == null) {
-
-            client = new OkHttpClient
-                    .Builder()
-                    .readTimeout(timeoutPeriod, TimeUnit.SECONDS)
-                    .build();
-        }
-
-        Request request = new Request.Builder()
-                .url(newPipeApiUrl)
-                .build();
-
-        try {
-            Response response = client.newCall(request).execute();
-            return response.body().string();
-        } catch (IOException ex) {
-            // connectivity problems, do not alarm user and fail silently
-            if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
-        }
-
-        return null;
-    }
-
-    @Override
-    protected void onPostExecute(String response) {
-
-        // Parse the json from the response.
-        if (response != null) {
-
-            try {
-                JSONObject mainObject = new JSONObject(response);
-                JSONObject flavoursObject = mainObject.getJSONObject("flavors");
-                JSONObject githubObject = flavoursObject.getJSONObject("github");
-                JSONObject githubStableObject = githubObject.getJSONObject("stable");
-
-                String versionName = githubStableObject.getString("version");
-                String versionCode = githubStableObject.getString("version_code");
-                String apkLocationUrl = githubStableObject.getString("apk");
-
-                compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
-
-            } catch (JSONException ex) {
-                // connectivity problems, do not alarm user and fail silently
-                if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
-            }
-        }
-    }
-
-    /**
-     * Method to compare the current and latest available app version.
-     * If a newer version is available, we show the update notification.
-     * @param versionName
-     * @param apkLocationUrl
-     */
-    private void compareAppVersionAndShowNotification(String versionName,
-                                                      String apkLocationUrl,
-                                                      String versionCode) {
-
-        int NOTIFICATION_ID = 2000;
-
-        if (BuildConfig.VERSION_CODE < Integer.valueOf(versionCode)) {
-
-            // A pending intent to open the apk location url in the browser.
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
-            PendingIntent pendingIntent
-                    = PendingIntent.getActivity(app, 0, intent, 0);
-
-            NotificationCompat.Builder notificationBuilder = new NotificationCompat
-                    .Builder(app, app.getString(R.string.app_update_notification_channel_id))
-                    .setSmallIcon(R.drawable.ic_newpipe_update)
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setContentIntent(pendingIntent)
-                    .setAutoCancel(true)
-                    .setContentTitle(app.getString(R.string.app_update_notification_content_title))
-                    .setContentText(app.getString(R.string.app_update_notification_content_text)
-                            + " " + versionName);
-
-            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
-            notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
-        }
-    }
-
-    /**
-     * Method to get the apk's SHA1 key.
-     * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
-     */
-    private static String getCertificateSHA1Fingerprint() {
-
-        PackageManager pm = app.getPackageManager();
-        String packageName = app.getPackageName();
-        int flags = PackageManager.GET_SIGNATURES;
-        PackageInfo packageInfo = null;
-
-        try {
-            packageInfo = pm.getPackageInfo(packageName, flags);
-        } catch (PackageManager.NameNotFoundException ex) {
-            ErrorActivity.reportError(app, ex, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
-                            "Could not find package info", R.string.app_ui_crash));
-        }
-
-        Signature[] signatures = packageInfo.signatures;
-        byte[] cert = signatures[0].toByteArray();
-        InputStream input = new ByteArrayInputStream(cert);
-
-        CertificateFactory cf = null;
-        X509Certificate c = null;
-
-        try {
-            cf = CertificateFactory.getInstance("X509");
-            c = (X509Certificate) cf.generateCertificate(input);
-        } catch (CertificateException ex) {
-            ErrorActivity.reportError(app, ex, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
-                            "Certificate error", R.string.app_ui_crash));
-        }
-
-        String hexString = null;
-
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA1");
-            byte[] publicKey = md.digest(c.getEncoded());
-            hexString = byte2HexFormatted(publicKey);
-        } catch (NoSuchAlgorithmException ex1) {
-            ErrorActivity.reportError(app, ex1, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
-                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
-        } catch (CertificateEncodingException ex2) {
-            ErrorActivity.reportError(app, ex2, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
-                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
-        }
-
-        return hexString;
-    }
-
-    private static String byte2HexFormatted(byte[] arr) {
-
-        StringBuilder str = new StringBuilder(arr.length * 2);
-
-        for (int i = 0; i < arr.length; i++) {
-            String h = Integer.toHexString(arr[i]);
-            int l = h.length();
-            if (l == 1) h = "0" + h;
-            if (l > 2) h = h.substring(l - 2, l);
-            str.append(h.toUpperCase());
-            if (i < (arr.length - 1)) str.append(':');
-        }
-        return str.toString();
-    }
-
-    public static boolean isGithubApk() {
-
-        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
-    }
-    
-    private boolean isConnected() {
-     
-        ConnectivityManager cm = 
-                (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return cm.getActiveNetworkInfo() != null
-				&& cm.getActiveNetworkInfo().isConnected();
-    }
-}