Merge branch 'dev' of https://github.com/TeamNewPipe/NewPipe into dev

� Conflicts:
�	README.md
�	app/build.gradle
�	app/src/androidTest/java/org/schabi/newpipelegacy/report/ErrorInfoTest.java
�	app/src/main/java/org/schabi/newpipe/settings/NotificationSettingsFragment.java
�	app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
�	app/src/main/java/org/schabi/newpipelegacy/App.java
�	app/src/main/java/org/schabi/newpipelegacy/CheckForNewAppVersionTask.java
�	app/src/main/java/org/schabi/newpipelegacy/MainActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/ReCaptchaActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/RouterActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/about/AboutActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/about/License.java
�	app/src/main/java/org/schabi/newpipelegacy/about/LicenseFragmentHelper.java
�	app/src/main/java/org/schabi/newpipelegacy/about/SoftwareComponent.java
�	app/src/main/java/org/schabi/newpipelegacy/database/feed/dao/FeedDAO.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/feed/dao/FeedGroupDAO.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/feed/model/FeedLastUpdatedEntity.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/history/dao/StreamHistoryDAO.java
�	app/src/main/java/org/schabi/newpipelegacy/database/history/model/StreamHistoryEntry.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/playlist/PlaylistStreamEntry.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/playlist/dao/PlaylistStreamDAO.java
�	app/src/main/java/org/schabi/newpipelegacy/database/stream/StreamStatisticsEntry.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/stream/dao/StreamDAO.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/stream/model/StreamEntity.kt
�	app/src/main/java/org/schabi/newpipelegacy/database/subscription/SubscriptionDAO.kt
�	app/src/main/java/org/schabi/newpipelegacy/download/DownloadActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/download/DownloadDialog.java
�	app/src/main/java/org/schabi/newpipelegacy/fragments/BaseStateFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/fragments/MainFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/fragments/detail/VideoDetailFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/fragments/list/playlist/PlaylistFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/fragments/list/search/SearchFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedDatabaseManager.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedFragment.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/feed/FeedViewModel.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/feed/service/FeedEventManager.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/feed/service/FeedLoadService.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/history/StatisticsPlaylistFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/local/holder/LocalPlaylistStreamItemHolder.java
�	app/src/main/java/org/schabi/newpipelegacy/local/holder/LocalStatisticStreamItemHolder.java
�	app/src/main/java/org/schabi/newpipelegacy/local/playlist/LocalPlaylistFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionFragment.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionManager.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionViewModel.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/SubscriptionsImportFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/dialog/FeedGroupDialog.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/dialog/FeedGroupDialogViewModel.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/dialog/FeedGroupReorderDialog.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/dialog/FeedGroupReorderDialogViewModel.kt
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/services/BaseImportExportService.java
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/services/SubscriptionsExportService.java
�	app/src/main/java/org/schabi/newpipelegacy/local/subscription/services/SubscriptionsImportService.java
�	app/src/main/java/org/schabi/newpipelegacy/player/BackgroundPlayerActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/player/BasePlayer.java
�	app/src/main/java/org/schabi/newpipelegacy/player/MainPlayer.java
�	app/src/main/java/org/schabi/newpipelegacy/player/ServicePlayerActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/player/VideoPlayerImpl.java
�	app/src/main/java/org/schabi/newpipelegacy/player/event/PlayerGestureListener.java
�	app/src/main/java/org/schabi/newpipelegacy/player/playqueue/PlayQueue.java
�	app/src/main/java/org/schabi/newpipelegacy/report/ErrorActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/ContentSettingsFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/HistorySettingsFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/MainSettingsFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/NotificationSettingsFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/SelectChannelFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/SelectKioskFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/SelectPlaylistFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/SettingMigrations.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/SettingsActivity.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/tabs/ChooseTabsFragment.java
�	app/src/main/java/org/schabi/newpipelegacy/settings/tabs/Tab.java
�	app/src/main/java/org/schabi/newpipelegacy/streams/OggFromWebMWriter.java
�	app/src/main/java/org/schabi/newpipelegacy/streams/SrtFromTtmlWriter.java
�	app/src/main/java/org/schabi/newpipelegacy/util/ExtractorHelper.java
�	app/src/main/java/org/schabi/newpipelegacy/util/NavigationHelper.java
�	app/src/main/java/us/shandian/giga/postprocessing/OggFromWebmDemuxer.java
�	app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
�	app/src/main/java/us/shandian/giga/ui/common/Deleter.java
�	app/src/test/java/org/schabi/newpipelegacy/util/ExceptionUtilsTest.kt
�	checkstyle-suppressions.xml

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,7 +15,7 @@ Oh no, a bug! It happens. Thanks for reporting an issue with NewPipe. To make it
 <!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
 
 ### Checklist
-<!-- The first box has been checked for you to show you how it is done. -->
+<!-- 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 -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -11,7 +11,7 @@ assignees: ''
 <!-- The comments between these brackets won't show up in the submitted issue (as you can see in the Preview). -->
 
 ### Checklist
-<!-- The first box has been checked for you to show you how it is done. -->
+<!-- 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.

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - 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