friendlyanon 7d86901316 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

2021-01-10 14:49:05 +01:00

..

metadata/android

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

2021-01-10 14:49:05 +01:00