Merge pull request #7858 from TeamNewPipe/release/0.22.0

Release 0.22.0

.github/CONTRIBUTING.md

@@ -1,68 +1,85 @@
 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
+Report crashes through the **automated crash report system** of NewPipe.
-send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
+This way all the data needed for debugging is included in your bugreport for GitHub.
-add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+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
+* **Already reported**? Browse the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) to make sure your issue/feature hasn't been reported/requested.
-hasn't been reported/requested before
+* **Already fixed**? Check whether your issue/feature is already fixed/implemented.
-* Check whether your issue/feature is already fixed/implemented
+* **Still relevant**? Check if the issue still exists in the latest release/beta version.
-* 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.
-* If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
+* **Is it in English**? Issues in other languages will be ignored unless someone translates them.
-* We use English for development. Issues in other languages will be closed and ignored.
+* **Is it one issue**? Multiple issues require multiple reports, that can be linked to track their statuses.
-* Please only add *one* issue at a time. Do not put multiple issues into one thread.
+* **The template**: Fill it out, everyone wins. Your issue has a chance of getting fixed.
-* 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.
 
-## 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
+* NewPipe is translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). Log in there with your GitHub account, or register.
-with your GitHub account.
+* 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 :))
+### Guidelines
-* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google
+
-  libraries.
+* Stick to NewPipe's *style conventions* of [checkStyle](https://github.com/checkstyle/checkstyle) and [ktlint](https://github.com/pinterest/ktlint). They run each time you build the project.
-* Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
+* 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
+* In particular **do not bring non-free software** (e.g. binary blobs) into the project. Make sure you do not introduce any closed-source library from Google.
-  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)
+### Before starting development
-* 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).
+* 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.
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
+* If there is no existing issue for what you want to work on, **open a new one**  describing the changes you are planning to introduce. 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.
-  description. Untested code will **not** be merged!
+* 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.
+* Create PRs that cover only **one specific issue/solution/bug**. Do not create PRs that are huge monoliths and could have been split into multiple independent contributions.
+* NewPipe uses [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor) to fetch data from services. If you need to change something there, you must test your changes in NewPipe. Telling NewPipe to use your extractor version can be accomplished by editing the `app/build.gradle` file: the comments under the "NewPipe libraries" section of `dependencies` will help you out.
+
+### Kotlin in NewPipe
+* NewPipe will remain mostly Java for time being
+* Contributions containing a simple conversion from Java to Kotlin should be avoided. Conversions to Kotlin should only be done if Kotlin actually brings improvements like bug fixes or better performance which are not, or only with much more effort, implementable in Java. The core team sees Java as an easier to learn and generally well adopted programming language.
+
+### Creating a Pull Request (PR)
+
+* 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!
+* Respond if someone requests changes or otherwise raises issues about your PRs.
 * 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,
+* 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* your branch on the `dev` branch manually and resolve the conflicts on your own. You can find help [on the wiki](https://github.com/TeamNewPipe/NewPipe/wiki/How-to-merge-a-PR). Doing this makes the maintainers' job way easier.
-  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.
+## IDE setup & building the app
-* 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
+### Basic setup
-  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.
+NewPipe is developed using [Android Studio](https://developer.android.com/studio/). Learn more about how to install it and how it works in the [official documentation](https://developer.android.com/studio/intro). In particular, make sure you have accepted Android Studio's SDK licences. Once Android Studio is ready, setting up the NewPipe project is fairly simple:
-* Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
+- Clone the NewPipe repository with `git clone https://github.com/TeamNewPipe/NewPipe.git` (or use the link from your own fork, if you want to open a PR).
-* Check if your submission can be build with the current fdroid build server setup.
+- Open the folder you just cloned with Android Studio.
-* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
+- Build and run it just like you would do with any other app, with the green triangle in the top bar.
-  independent solutions.
+
+You may find [SonarLint](https://www.sonarlint.org/intellij)'s **inspections** useful in helping you to write good code and prevent bugs.
+
+### checkStyle setup
+
+The [checkStyle](https://github.com/checkstyle/checkstyle) plugin verifies that Java code abides by the project style. It runs automatically each time you build the project. If you want to view errors directly in the editor, instead of having to skim through the build output, you can install an Android Studio plugin:
+- Go to `File -> Settings -> Plugins`, search for `checkstyle` and install `CheckStyle-IDEA`.
+- Go to `File -> Settings -> Tools -> Checkstyle`.
+- Add NewPipe's configuration file by clicking the `+` in the right toolbar of the "Configuration File" list.
+- Under the "Use a local Checkstyle file" bullet, click on `Browse` and pick the file named `checkstyle.xml` in the project's root folder.
+- Enable "Store relative to project location" so that moving the directory around does not create issues.
+- Insert a description in the top bar, then click `Next` and then `Finish`.
+- Activate the configuration file you just added by enabling the checkbox on the left.
+- Click `Ok` and you are done.
+
+### ktlint setup
+
+The [ktlint](https://github.com/pinterest/ktlint) plugin does the same job as checkStyle for Kotlin files. Installing the related plugin is as simple as going to `File -> Settings -> Plugins`, searching for `ktlint` and installing `Ktlint (unofficial)`.
 
 ## Communication
 
-* WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
+* The #newpipe channel on Libera Chat (`ircs://irc.libera.chat:6697/newpipe`) has the core team and other developers in it. [Click here for webchat](https://web.libera.chat/#newpipe)!
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
+* You can also use a Matrix account to join the NewPipe channel at [#newpipe:libera.chat](https://matrix.to/#/#newpipe:libera.chat). Some convenient clients, available both for phone and desktop, are listed at that link.
-  [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* You can post your suggestions, changes, ideas etc. on either GitHub or IRC.
-* 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!

.github/FUNDING.yml

@@ -1 +1,2 @@
 liberapay: TeamNewPipe
+custom: 'https://newpipe.net/donate/'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,44 +0,0 @@
----
-name: Bug report
-about: Create a bug report to help us improve
-labels: bug
-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
--->
-### Version
-<!-- Which version are you using? -->
-- 
-
-
-### 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 '....'
-
-### Expected behavior
-Tell us what you expected to happen.
-
-### Actual behaviour
-Tell us what happens instead.
-
-### 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:
-
-<!-- That's right, here! -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,113 @@
+name: Bug report
+description: Create a bug report to help us improve
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for helping to make NewPipe better by reporting a bug. :hugs:
+
+        Please fill in as much information as possible about your bug so that we don't have to play "information ping-pong" and can help you immediately.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      options:
+        - label: "I am able to reproduce the bug with the [latest version](https://github.com/TeamNewPipe/NewPipe/releases/latest)."
+          required: true
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+          required: true
+        - label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
+          required: true
+        - label: "This issue contains only one bug."
+          required: true
+        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
+          required: true
+
+  - type: input
+    id: app-version
+    attributes:
+     label: Affected version
+     description: "In which NewPipe version did you encounter the bug?"
+     placeholder: "x.xx.x - Can be seen in the app from the 'About' section in the sidebar"
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce the bug
+      description: |
+        What did you do for the bug to show up?
+        
+        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.
+      placeholder: |
+        1. Go to '...'
+        2. Press on '....'
+        3. Swipe down to '....'
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: |
+        Tell us what you expect to happen.
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: |
+        Tell us what happens with the steps given above.
+
+  - type: textarea
+    id: screen-media
+    attributes:
+      label: Screenshots/Screen recordings
+      description: |
+        A picture or video is worth a thousand words.
+        
+        If applicable, add screenshots or a screen recording to help explain your problem.
+        GitHub supports uploading them directly in the text box.
+        If your file is too big for Github to accept, try to compress it (ZIP-file) or feel free to paste a link to an image/video hoster here instead.
+        
+        :heavy_exclamation_mark: DON'T POST SCREENSHOTS OF THE ERROR PAGE.
+        Instead, follow the instructions in the "Logs" section below.
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: |
+        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.
+
+  - type: input
+    id: device-os-info
+    attributes:
+     label: Affected Android/Custom ROM version
+     description: |
+      With what operating system (+ version) did you encounter the bug?
+     placeholder: "Example: Android 12 / LineageOS 18.1"
+
+  - type: input
+    id: device-model-info
+    attributes:
+     label: Affected device model
+     description: |
+      On what device did you encounter the bug?
+     placeholder: "Example: Huawei P20 lite (ANE-LX1) / Samsung Galaxy S20"
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: |
+        Any other information you'd like to include, for instance that 
+        * the affected device is foldable or a TV
+        * you have disabled all animations on your device
+        * your cat disabled your network connection
+        * ...
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 IRC
+    url: https://web.libera.chat/#newpipe
+    about: Chat with us via IRC for quick Q/A
+  - name: 💬 Matrix
+    url: https://matrix.to/#/#newpipe:libera.chat
+    about: Chat with us via Matrix for quick Q/A

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,28 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-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.*
-
-#### Describe the solution you'd like
-A clear and concise description of what you want to 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...*
-
-#### Additional context
-Add any other context or 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?
-The better this paragraph is, the more likely a developer will think about working on it.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,51 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for helping to make NewPipe better by suggesting a feature. :hugs:
+
+        Your ideas are highly welcome! The app is made for you, the users, after all.
+        
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      options:
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+          required: true
+        - label: "I'm aware that this is a request for NewPipe itself and that requests for adding a new service need to be made at [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor/issues)."
+          required: true
+        - label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
+          required: true
+        - label: "This issue contains only one feature request."
+          required: true
+        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
+          required: true
+
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Feature description
+      description: |
+        Explain how you want the app's look or behavior to change to suit your needs.
+    validations:
+      required: true
+
+  - type: textarea
+    id: why-is-the-feature-requested
+    attributes:
+      label: Why do you want this feature?
+      description: |
+        Describe any problem or limitation you come across while using the app which would be solved by this feature.
+    validations:
+      required: true
+      
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Any other information you'd like to include, for instance sketches, mockups, pictures of cats, etc.

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,35 @@
+name: Question
+description: Ask about anything NewPipe-related
+labels: [question]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this issue! :hugs:
+
+        Note that you can also ask questions on our [IRC channel](https://web.libera.chat/#newpipe).
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      options:
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/TeamNewPipe/NewPipe/issues) or [closed](https://github.com/TeamNewPipe/NewPipe/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+          required: true
+        - label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
+          required: true
+        - label: "I have read and understood the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/dev/.github/CONTRIBUTING.md)."
+          required: true
+
+  - type: textarea
+    id: what-is-the-question
+    attributes:
+      label: What is/are your question(s)?
+    validations:
+      required: true
+      
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Any other information you'd like to include, for instance sketches, mockups, pictures of cats, etc.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,26 +1,34 @@
-<!-- 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
+- [ ] Bugfix (user facing)
-- [ ] Feature
+- [ ] Feature (user facing)
+- [ ] Codebase improvement (dev facing)
+- [ ] Meta improvement to the project (dev facing)
 
-#### Long description of the changes in your PR
+#### 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 -->
+<!-- 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
 
+#### Before/After Screenshots/Screen Record
+<!-- If your PR changes the app's UI in any way, please include screenshots or a video showing exactly what changed, so that developers and users can pinpoint it easily. Delete this if it doesn't apply to your PR.-->
+- Before:
+- After:
+
 #### Fixes the following issue(s)
-<!-- Also add reddit or other links which are relevant to your change. -->
+<!-- Prefix issues with "Fixes" so that GitHub closes them when the PR is merged (note that each "Fixes #" should be in its own item). Also add any other relevant links. -->
-- 
+- Fixes #
 
 #### Relies on the following changes
-<!-- Delete this if it doesn't apply to you. -->
+<!-- Delete this if it doesn't apply to your PR. -->
 - 
 
-#### Testing apk
+#### APK testing 
-<!-- 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". -->
+<!-- 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".)  -->
-debug.zip
+<!-- 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.-->
+The APK can be found by going to the "Checks" tab below the title. On the left pane, click on "CI", scroll down to "artifacts" and click "app" to download the zip file which contains the debug APK of this PR.
 
-#### Agreement
+#### Due diligence
-- [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
+- [ ] I read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md).

.github/workflows/ci.yml

@@ -0,0 +1,116 @@
+name: CI
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+      - master
+    paths-ignore:
+      - 'README.md'
+      - 'doc/**'
+      - 'fastlane/**'
+      - 'assets/**'
+      - '.github/**/*.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+  push:
+    branches:
+      - dev
+      - master
+    paths-ignore:
+      - 'README.md'
+      - 'doc/**'
+      - 'fastlane/**'
+      - 'assets/**'
+      - '.github/**/*.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+
+jobs:
+  build-and-test-jvm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
+
+      - 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 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Build debug APK and run jvm tests
+        run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
+        with:
+          name: app
+          path: app/build/outputs/apk/debug/*.apk
+
+  test-android:
+    # macos has hardware acceleration. See android-emulator-runner action
+    runs-on: macos-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        # api-level 19 is min sdk, but throws errors related to desugaring
+        api-level: [ 21, 29 ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Run android tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
+          emulator-build: 7425822
+          script: ./gradlew connectedCheck --stacktrace
+        
+      - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: android-test-report-api${{ matrix.api-level }}
+          path: app/build/reports/androidTests/connected/**
+
+  sonar:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11 # Sonar requires JDK 11
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew build sonarqube --info

.github/workflows/image-minimizer.js

@@ -0,0 +1,107 @@
+/*
+ * Script for minimizing big images (jpg,gif,png) when they are uploaded to GitHub and not edited otherwise
+ */
+module.exports = async ({github, context}) => {
+    const IGNORE_KEY = '<!-- IGNORE IMAGE MINIFY -->';
+    const IGNORE_ALT_NAME_END = 'ignoreImageMinify';
+    const IMG_MAX_HEIGHT_PX = 600;
+
+    // Get the body of the image
+    let initialBody = null;
+    if (context.eventName == 'issue_comment') {
+        initialBody = context.payload.comment.body;
+    } else if (context.eventName == 'issues') {
+        initialBody = context.payload.issue.body;
+    } else {
+        console.log('Aborting: No body found');
+        return;
+    }
+    console.log(`Found body: \n${initialBody}\n`);
+
+    // Check if we should ignore the currently processing element
+    if (initialBody.includes(IGNORE_KEY)) {
+        console.log('Ignoring: Body contains IGNORE_KEY');
+        return;
+    }
+
+    // Regex for finding images (simple variant) ![ALT_TEXT](https://*.githubusercontent.com/<number>/<variousHexStringsAnd->.<fileExtension>)
+    const REGEX_IMAGE_LOOKUP = /\!\[(.*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
+
+    // Check if we found something
+    let foundSimpleImages = REGEX_IMAGE_LOOKUP.test(initialBody);
+    if (!foundSimpleImages) {
+        console.log('Found no simple images to process');
+        return;
+    }
+
+    console.log('Found at least one simple image to process');
+
+    // Require the probe lib for getting the image dimensions
+    const probe = require('probe-image-size');
+
+    // Try to find and replace the images with minimized ones
+    let newBody = await replaceAsync(initialBody, REGEX_IMAGE_LOOKUP, async (match, g1, g2) => {
+        console.log(`Found match '${match}'`);
+        
+        if (g1.endsWith(IGNORE_ALT_NAME_END)) {
+            console.log(`Ignoring match '${match}': IGNORE_ALT_NAME_END`);
+            return match;
+        }
+        
+        let shouldModifiy = false;
+        try {
+            console.log(`Probing ${g2}`);
+            let probeResult = await probe(g2);
+            if (probeResult == null) {
+                throw 'No probeResult';
+            }
+            if (probeResult.hUnits != 'px') {
+                throw `Unexpected probeResult.hUnits (expected px but got ${probeResult.hUnits})`;
+            }
+            
+            shouldModifiy = probeResult.height > IMG_MAX_HEIGHT_PX;
+        } catch(e) {
+            console.log('Probing failed:', e);
+            // Immediately abort
+            return match;
+        }
+        
+        if (shouldModifiy) {
+            console.log(`Modifying match '${match}'`);
+            return `<img alt="${g1}" src="${g2}" height=${IMG_MAX_HEIGHT_PX} />`;
+        }
+        
+        console.log(`Match '${match}' is ok/will not be modified`);
+        return match;
+    });
+
+    // Update the corresponding element
+    if (context.eventName == 'issue_comment') {
+        console.log('Updating comment with id', context.payload.comment.id);
+        await github.rest.issues.updateComment({
+            comment_id: context.payload.comment.id,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: newBody
+        })
+    } else if (context.eventName == 'issues') {
+        console.log('Updating issue', context.payload.issue.number);
+        await github.rest.issues.update({
+            issue_number: context.payload.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: newBody
+        });
+    }
+
+    // Asnyc replace function from https://stackoverflow.com/a/48032528
+    async function replaceAsync(str, regex, asyncFn) {
+        const promises = [];
+        str.replace(regex, (match, ...args) => {
+            const promise = asyncFn(match, ...args);
+            promises.push(promise);
+        });
+        const data = await Promise.all(promises);
+        return str.replace(regex, () => data.shift());
+    }
+}

.github/workflows/image-minimizer.yml

@@ -0,0 +1,29 @@
+name: Image Minimizer
+
+on:
+  issue_comment:
+    types: [created, edited]
+  issues:
+    types: [opened, edited]
+
+jobs:
+  try-minimize:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16
+
+      - name: Install probe-image-size
+        run: npm i probe-image-size@7.2.3 --ignore-scripts
+
+      - name: Minimize simple images
+        uses: actions/github-script@v5
+        timeout-minutes: 3
+        with:
+          script: |
+            const script = require('.github/workflows/image-minimizer.js');
+            await script({github, context});

.github/workflows/no-response.yml

@@ -0,0 +1,20 @@
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Run daily at midnight.
+    - cron: '0 0 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          daysUntilClose: 14
+          responseRequiredLabel: waiting-for-author

.gitignore

@@ -1,12 +1,20 @@
-.gitignore
+.gradle/
-.gradle
+local.properties
-/local.properties
 .DS_Store
-/build
+build/
-/captures
+captures/
-/app/app.iml
+.idea/
-/.idea
+*.iml
-/*.iml
 *~
 .weblate
 *.class
+app/debug/
+app/release/
+
+# 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/.gitignore

@@ -1,3 +0,0 @@
-.gitignore
-/build
-*.iml

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

@@ -1,118 +0,0 @@
-package org.schabi.newpipe.database
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import androidx.room.Room
-import androidx.room.testing.MigrationTestHelper
-import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.schabi.newpipe.extractor.stream.StreamType
-
-@RunWith(AndroidJUnit4::class)
-class AppDatabaseTest {
-    companion object {
-        private const val DEFAULT_SERVICE_ID = 0
-        private const val DEFAULT_URL = "https://www.youtube.com/watch?v=cDphUib5iG4"
-        private const val DEFAULT_TITLE = "Test Title"
-        private val DEFAULT_TYPE = StreamType.VIDEO_STREAM
-        private const val DEFAULT_DURATION = 480L
-        private const val DEFAULT_UPLOADER_NAME = "Uploader Test"
-        private const val DEFAULT_THUMBNAIL = "https://example.com/example.jpg"
-
-        private const val DEFAULT_SECOND_SERVICE_ID = 0
-        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());
-
-    @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)
-            })
-            close()
-        }
-
-        testHelper.runMigrationsAndValidate(AppDatabase.DATABASE_NAME, Migrations.DB_VER_3,
-                true, Migrations.MIGRATION_2_3);
-
-        val migratedDatabaseV3 = getMigratedDatabase()
-        val listFromDB = migratedDatabaseV3.streamDAO().all.blockingFirst()
-
-        // Only expect 2, the one with the null url will be ignored
-        assertEquals(2, listFromDB.size)
-
-        val streamFromMigratedDatabase = listFromDB[0]
-        assertEquals(DEFAULT_SERVICE_ID, streamFromMigratedDatabase.serviceId)
-        assertEquals(DEFAULT_URL, streamFromMigratedDatabase.url)
-        assertEquals(DEFAULT_TITLE, streamFromMigratedDatabase.title)
-        assertEquals(DEFAULT_TYPE, streamFromMigratedDatabase.streamType)
-        assertEquals(DEFAULT_DURATION, streamFromMigratedDatabase.duration)
-        assertEquals(DEFAULT_UPLOADER_NAME, streamFromMigratedDatabase.uploader)
-        assertEquals(DEFAULT_THUMBNAIL, streamFromMigratedDatabase.thumbnailUrl)
-        assertNull(streamFromMigratedDatabase.viewCount)
-        assertNull(streamFromMigratedDatabase.textualUploadDate)
-        assertNull(streamFromMigratedDatabase.uploadDate)
-        assertNull(streamFromMigratedDatabase.isUploadDateApproximation)
-
-        val secondStreamFromMigratedDatabase = listFromDB[1]
-        assertEquals(DEFAULT_SECOND_SERVICE_ID, secondStreamFromMigratedDatabase.serviceId)
-        assertEquals(DEFAULT_SECOND_URL, secondStreamFromMigratedDatabase.url)
-        assertEquals("", secondStreamFromMigratedDatabase.title)
-        // Should fallback to VIDEO_STREAM
-        assertEquals(StreamType.VIDEO_STREAM, secondStreamFromMigratedDatabase.streamType)
-        assertEquals(0, secondStreamFromMigratedDatabase.duration)
-        assertEquals("", secondStreamFromMigratedDatabase.uploader)
-        assertEquals("", secondStreamFromMigratedDatabase.thumbnailUrl)
-        assertNull(secondStreamFromMigratedDatabase.viewCount)
-        assertNull(secondStreamFromMigratedDatabase.textualUploadDate)
-        assertNull(secondStreamFromMigratedDatabase.uploadDate)
-        assertNull(secondStreamFromMigratedDatabase.isUploadDateApproximation)
-    }
-
-    private fun getMigratedDatabase(): AppDatabase {
-        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/error/ErrorInfoTest.java

@@ -0,0 +1,46 @@
+package org.schabi.newpipe.error;
+
+import android.os.Parcel;
+
+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.extractor.ServiceList;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Instrumented tests for {@link ErrorInfo}.
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ErrorInfoTest {
+
+    @Test
+    public void errorInfoTestParcelable() {
+        final ErrorInfo info = new ErrorInfo(new ParsingException("Hello"),
+                UserAction.USER_REPORT, "request", ServiceList.YouTube.getServiceId());
+        // Obtain a Parcel object and write the parcelable object to it:
+        final Parcel parcel = Parcel.obtain();
+        info.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        final ErrorInfo infoFromParcel = (ErrorInfo) ErrorInfo.CREATOR.createFromParcel(parcel);
+
+        assertTrue(Arrays.toString(infoFromParcel.getStackTraces())
+                .contains(ErrorInfoTest.class.getSimpleName()));
+        assertEquals(UserAction.USER_REPORT, infoFromParcel.getUserAction());
+        assertEquals(ServiceList.YouTube.getServiceInfo().getName(),
+                infoFromParcel.getServiceName());
+        assertEquals("request", infoFromParcel.getRequest());
+        assertEquals(R.string.parsing_error, infoFromParcel.getMessageStringId());
+
+        parcel.recycle();
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt

@@ -0,0 +1,178 @@
+package org.schabi.newpipe.local.history
+
+import androidx.test.core.app.ApplicationProvider
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.schabi.newpipe.database.AppDatabase
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry
+import org.schabi.newpipe.testUtil.TestDatabase
+import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+
+class HistoryRecordManagerTest {
+
+    private lateinit var manager: HistoryRecordManager
+    private lateinit var database: AppDatabase
+
+    @get:Rule
+    val trampolineScheduler = TrampolineSchedulerRule()
+
+    @Before
+    fun setup() {
+        database = TestDatabase.createReplacingNewPipeDatabase()
+        manager = HistoryRecordManager(ApplicationProvider.getApplicationContext())
+    }
+
+    @After
+    fun cleanUp() {
+        database.close()
+    }
+
+    @Test
+    fun onSearched() {
+        manager.onSearched(0, "Hello").test().await().assertValue(1)
+
+        // For some reason the Flowable returned by getAll() never completes, so we can't assert
+        // that the number of Lists it returns is exactly 1, we can only check if the first List is
+        // correct. Why on earth has a Flowable been used instead of a Single for getAll()?!?
+        val entities = database.searchHistoryDAO().all.blockingFirst()
+        assertThat(entities).hasSize(1)
+        assertThat(entities[0].id).isEqualTo(1)
+        assertThat(entities[0].serviceId).isEqualTo(0)
+        assertThat(entities[0].search).isEqualTo("Hello")
+    }
+
+    @Test
+    fun deleteSearchHistory() {
+        val entries = listOf(
+            SearchHistoryEntry(time.minusSeconds(1), 0, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 2, "A"),
+            SearchHistoryEntry(time.minusSeconds(3), 1, "B"),
+            SearchHistoryEntry(time.minusSeconds(4), 0, "B"),
+        )
+
+        // make sure all 4 were inserted
+        database.searchHistoryDAO().insertAll(entries)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries)
+
+        // try to delete only "A" entries, "B" entries should be untouched
+        manager.deleteSearchHistory("A").test().await().assertValue(2)
+        val entities = database.searchHistoryDAO().all.blockingFirst()
+        assertThat(entities).hasSize(2)
+        assertThat(entities).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
+            .containsExactly(*entries.subList(2, 4).toTypedArray())
+
+        // assert that nothing happens if we delete a search query that does exist in the db
+        manager.deleteSearchHistory("A").test().await().assertValue(0)
+        val entities2 = database.searchHistoryDAO().all.blockingFirst()
+        assertThat(entities2).hasSize(2)
+        assertThat(entities2).usingElementComparator { o1, o2 -> if (o1.hasEqualValues(o2)) 0 else 1 }
+            .containsExactly(*entries.subList(2, 4).toTypedArray())
+
+        // delete all remaining entries
+        manager.deleteSearchHistory("B").test().await().assertValue(2)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
+    }
+
+    @Test
+    fun deleteCompleteSearchHistory() {
+        val entries = listOf(
+            SearchHistoryEntry(time.minusSeconds(1), 1, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 2, "B"),
+            SearchHistoryEntry(time.minusSeconds(3), 0, "C"),
+        )
+
+        // make sure all 3 were inserted
+        database.searchHistoryDAO().insertAll(entries)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).hasSameSizeAs(entries)
+
+        // should remove everything
+        manager.deleteCompleteSearchHistory().test().await().assertValue(entries.size)
+        assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
+    }
+
+    private fun insertShuffledRelatedSearches(relatedSearches: Collection<SearchHistoryEntry>) {
+
+        // shuffle to make sure the order of items returned by queries depends only on
+        // SearchHistoryEntry.creationDate, not on the actual insertion time, so that we can
+        // verify that the `ORDER BY` clause does its job
+        database.searchHistoryDAO().insertAll(relatedSearches.shuffled())
+
+        // make sure all entries were inserted
+        assertEquals(
+            relatedSearches.size,
+            database.searchHistoryDAO().all.blockingFirst().size
+        )
+    }
+
+    @Test
+    fun getRelatedSearches_emptyQuery() {
+        insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)
+
+        // make sure correct number of searches is returned and in correct order
+        val searches = manager.getRelatedSearches("", 6, 4).blockingFirst()
+        assertThat(searches).containsExactly(
+            RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
+            RELATED_SEARCHES_ENTRIES[4].search, // B
+            RELATED_SEARCHES_ENTRIES[5].search, // AA
+            RELATED_SEARCHES_ENTRIES[2].search, // BA
+        )
+    }
+
+    @Test
+    fun getRelatedSearches_emptyQuery_manyDuplicates() {
+        insertShuffledRelatedSearches(
+            listOf(
+                SearchHistoryEntry(time.minusSeconds(9), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(8), 3, "AB"),
+                SearchHistoryEntry(time.minusSeconds(7), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(6), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(5), 3, "BA"),
+                SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(3), 3, "A"),
+                SearchHistoryEntry(time.minusSeconds(2), 0, "A"),
+                SearchHistoryEntry(time.minusSeconds(1), 2, "AA"),
+            )
+        )
+
+        val searches = manager.getRelatedSearches("", 9, 3).blockingFirst()
+        assertThat(searches).containsExactly("AA", "A", "BA")
+    }
+
+    @Test
+    fun getRelatedSearched_nonEmptyQuery() {
+        insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)
+
+        // make sure correct number of searches is returned and in correct order
+        val searches = manager.getRelatedSearches("A", 3, 5).blockingFirst()
+        assertThat(searches).containsExactly(
+            RELATED_SEARCHES_ENTRIES[6].search, // A (even if in two places)
+            RELATED_SEARCHES_ENTRIES[5].search, // AA
+            RELATED_SEARCHES_ENTRIES[1].search, // BA
+        )
+
+        // also make sure that the string comparison is case insensitive
+        val searches2 = manager.getRelatedSearches("a", 3, 5).blockingFirst()
+        assertThat(searches).isEqualTo(searches2)
+    }
+
+    companion object {
+        private val time = OffsetDateTime.of(LocalDateTime.of(2000, 1, 1, 1, 1), ZoneOffset.UTC)
+
+        private val RELATED_SEARCHES_ENTRIES = listOf(
+            SearchHistoryEntry(time.minusSeconds(7), 2, "AC"),
+            SearchHistoryEntry(time.minusSeconds(6), 0, "ABC"),
+            SearchHistoryEntry(time.minusSeconds(5), 1, "BA"),
+            SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
+            SearchHistoryEntry(time.minusSeconds(2), 0, "B"),
+            SearchHistoryEntry(time.minusSeconds(3), 2, "AA"),
+            SearchHistoryEntry(time.minusSeconds(1), 1, "A"),
+        )
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt

@@ -0,0 +1,77 @@
+package org.schabi.newpipe.local.playlist
+
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.schabi.newpipe.database.AppDatabase
+import org.schabi.newpipe.database.stream.model.StreamEntity
+import org.schabi.newpipe.extractor.stream.StreamType
+import org.schabi.newpipe.testUtil.TestDatabase
+import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
+
+class LocalPlaylistManagerTest {
+
+    private lateinit var manager: LocalPlaylistManager
+    private lateinit var database: AppDatabase
+
+    @get:Rule
+    val trampolineScheduler = TrampolineSchedulerRule()
+
+    @Before
+    fun setup() {
+        database = TestDatabase.createReplacingNewPipeDatabase()
+        manager = LocalPlaylistManager(database)
+    }
+
+    @After
+    fun cleanUp() {
+        database.close()
+    }
+
+    @Test
+    fun createPlaylist() {
+        val NEWPIPE_URL = "https://newpipe.net/"
+        val stream = StreamEntity(
+            serviceId = 1, url = NEWPIPE_URL, title = "title",
+            streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
+            uploaderUrl = NEWPIPE_URL
+        )
+
+        val result = manager.createPlaylist("name", listOf(stream))
+
+        // This should not behave like this.
+        // Currently list of all stream ids is returned instead of playlist id
+        result.test().await().assertValue(listOf(1L))
+    }
+
+    @Test
+    fun createPlaylist_emptyPlaylistMustReturnEmpty() {
+        val result = manager.createPlaylist("name", emptyList())
+
+        // This should not behave like this.
+        // It should throw an error because currently the result is null
+        result.test().await().assertComplete()
+        manager.playlists.test().awaitCount(1).assertValue(emptyList())
+    }
+
+    @Test()
+    fun createPlaylist_nonExistentStreamsAreUpserted() {
+        val stream = StreamEntity(
+            serviceId = 1, url = "https://newpipe.net/", title = "title",
+            streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
+            uploaderUrl = "https://newpipe.net/"
+        )
+        database.streamDAO().insert(stream)
+        val upserted = StreamEntity(
+            serviceId = 1, url = "https://newpipe.net/2", title = "title2",
+            streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader",
+            uploaderUrl = "https://newpipe.net/"
+        )
+
+        val result = manager.createPlaylist("name", listOf(stream, upserted))
+
+        result.test().await().assertComplete()
+        database.streamDAO().all.test().awaitCount(1).assertValue(listOf(stream, upserted))
+    }
+}

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

@@ -1,37 +0,0 @@
-package org.schabi.newpipe.report;
-
-import android.os.Parcel;
-import androidx.test.filters.LargeTest;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-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}
- */
-@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);
-        // Obtain a Parcel object and write the parcelable object to it:
-        Parcel parcel = Parcel.obtain();
-        info.writeToParcel(parcel, 0);
-        parcel.setDataPosition(0);
-        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);
-
-        parcel.recycle();
-    }
-}

app/src/androidTest/java/org/schabi/newpipe/testUtil/TestDatabase.kt

@@ -0,0 +1,32 @@
+package org.schabi.newpipe.testUtil
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Assert.assertSame
+import org.schabi.newpipe.NewPipeDatabase
+import org.schabi.newpipe.database.AppDatabase
+
+class TestDatabase {
+    companion object {
+        fun createReplacingNewPipeDatabase(): AppDatabase {
+            val database = Room.inMemoryDatabaseBuilder(
+                ApplicationProvider.getApplicationContext(),
+                AppDatabase::class.java
+            )
+                .allowMainThreadQueries()
+                .build()
+
+            val databaseField = NewPipeDatabase::class.java.getDeclaredField("databaseInstance")
+            databaseField.isAccessible = true
+            databaseField.set(NewPipeDatabase::class, database)
+
+            assertSame(
+                "Mocking database failed!",
+                database,
+                NewPipeDatabase.getInstance(ApplicationProvider.getApplicationContext())
+            )
+
+            return database
+        }
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/testUtil/TrampolineSchedulerRule.kt

@@ -0,0 +1,37 @@
+package org.schabi.newpipe.testUtil
+
+import io.reactivex.rxjava3.android.plugins.RxAndroidPlugins
+import io.reactivex.rxjava3.plugins.RxJavaPlugins
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/**
+ * Always run on [Schedulers.trampoline].
+ * This executes the task in the current thread in FIFO manner.
+ * This ensures that tasks are run quickly inside the tests
+ * and not scheduled away to another thread for later execution
+ */
+class TrampolineSchedulerRule : TestRule {
+
+    private val scheduler = Schedulers.trampoline()
+
+    override fun apply(base: Statement, description: Description): Statement =
+        object : Statement() {
+            override fun evaluate() {
+                try {
+                    RxJavaPlugins.setComputationSchedulerHandler { scheduler }
+                    RxJavaPlugins.setIoSchedulerHandler { scheduler }
+                    RxJavaPlugins.setNewThreadSchedulerHandler { scheduler }
+                    RxJavaPlugins.setSingleSchedulerHandler { scheduler }
+                    RxAndroidPlugins.setInitMainThreadSchedulerHandler { scheduler }
+
+                    base.evaluate()
+                } finally {
+                    RxJavaPlugins.reset()
+                    RxAndroidPlugins.reset()
+                }
+            }
+        }
+}

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/DebugSettingsBVDLeakCanary.java

@@ -0,0 +1,20 @@
+package org.schabi.newpipe.settings;
+
+import android.content.Intent;
+
+import leakcanary.LeakCanary;
+
+/**
+ * Build variant dependent (BVD) leak canary API implementation for the debug settings fragment.
+ * This class is loaded via reflection by
+ * {@link DebugSettingsFragment.DebugSettingsBVDLeakCanaryAPI}.
+ */
+@SuppressWarnings("unused") // Class is used but loaded via reflection
+public class DebugSettingsBVDLeakCanary
+        implements DebugSettingsFragment.DebugSettingsBVDLeakCanaryAPI {
+
+    @Override
+    public Intent getNewLeakDisplayActivityIntent() {
+        return LeakCanary.INSTANCE.newLeakDisplayActivityIntent();
+    }
+}

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>