From 2b8837609bed291969961f351e5d128fb90bb65f Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sat, 19 Dec 2020 14:48:03 +0100
Subject: [PATCH 01/31] dynamically get package name

it fixes issues with forks or debug builds, e.g. when you open two newpipe apps (with debug or fork apps), close one notification, it closes all newpipe notifications
fixes https://github.com/TeamNewPipe/NewPipe/issues/4653
---
 app/src/main/java/org/schabi/newpipe/App.java |  4 +++-
 .../fragments/detail/VideoDetailFragment.java | 18 ++++++++--------
 .../local/feed/service/FeedLoadService.kt     |  3 ++-
 .../services/SubscriptionsExportService.java  |  3 ++-
 .../services/SubscriptionsImportService.java  |  3 ++-
 .../org/schabi/newpipe/player/MainPlayer.java | 21 ++++++++++---------
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index e6dce4d67..7e3466f67 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -67,8 +67,10 @@ import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 public class App extends MultiDexApplication {
     protected static final String TAG = App.class.toString();
     private static App app;
+    public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
 
-    @Nullable private Disposable disposable = null;
+    @Nullable
+    private Disposable disposable = null;
 
     @NonNull
     public static App getApp() {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 427cff06e..d0a1584a9 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -145,15 +145,15 @@ public final class VideoDetailFragment
     private static final float MAX_PLAYER_HEIGHT = 0.7f;
 
     public static final String ACTION_SHOW_MAIN_PLAYER =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_SHOW_MAIN_PLAYER";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_SHOW_MAIN_PLAYER";
     public static final String ACTION_HIDE_MAIN_PLAYER =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER";
     public static final String ACTION_PLAYER_STARTED =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_PLAYER_STARTED";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_PLAYER_STARTED";
     public static final String ACTION_VIDEO_FRAGMENT_RESUMED =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED";
     public static final String ACTION_VIDEO_FRAGMENT_STOPPED =
-            "org.schabi.newpipe.VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED";
+            App.PACKAGE_NAME + ".VideoDetailFragment.ACTION_VIDEO_FRAGMENT_STOPPED";
 
     private static final String COMMENTS_TAB_TAG = "COMMENTS";
     private static final String RELATED_TAB_TAG = "NEXT VIDEO";
@@ -494,10 +494,10 @@ public final class VideoDetailFragment
 
                     final PlaylistAppendDialog d = PlaylistAppendDialog.fromStreamInfo(currentInfo);
                     disposables.add(
-                        PlaylistAppendDialog.onPlaylistFound(getContext(),
-                            () -> d.show(getFM(), TAG),
-                            () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
-                        )
+                            PlaylistAppendDialog.onPlaylistFound(getContext(),
+                                    () -> d.show(getFM(), TAG),
+                                    () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
+                            )
                     );
                 }
                 break;
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
index 2a0aa1c90..45e8855e7 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt
@@ -43,6 +43,7 @@ import io.reactivex.rxjava3.processors.PublishProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.reactivestreams.Subscriber
 import org.reactivestreams.Subscription
+import org.schabi.newpipe.App
 import org.schabi.newpipe.MainActivity.DEBUG
 import org.schabi.newpipe.R
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity
@@ -68,7 +69,7 @@ class FeedLoadService : Service() {
     companion object {
         private val TAG = FeedLoadService::class.java.simpleName
         private const val NOTIFICATION_ID = 7293450
-        private const val ACTION_CANCEL = "org.schabi.newpipe.local.feed.service.FeedLoadService.CANCEL"
+        private const val ACTION_CANCEL = App.PACKAGE_NAME + ".local.feed.service.FeedLoadService.CANCEL"
 
         /**
          * How often the notification will be updated.
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java
index 982701d1f..5dfb1bfe5 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java
@@ -27,6 +27,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.extractor.subscription.SubscriptionItem;
@@ -50,7 +51,7 @@ public class SubscriptionsExportService extends BaseImportExportService {
      * A {@link LocalBroadcastManager local broadcast} will be made with this action
      * when the export is successfully completed.
      */
-    public static final String EXPORT_COMPLETE_ACTION = "org.schabi.newpipe.local.subscription"
+    public static final String EXPORT_COMPLETE_ACTION = App.PACKAGE_NAME + ".local.subscription"
             + ".services.SubscriptionsExportService.EXPORT_COMPLETE";
 
     private Subscription subscription;
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
index b1c67719c..90d0afe37 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
@@ -29,6 +29,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -66,7 +67,7 @@ public class SubscriptionsImportService extends BaseImportExportService {
      * A {@link LocalBroadcastManager local broadcast} will be made with this action
      * when the import is successfully completed.
      */
-    public static final String IMPORT_COMPLETE_ACTION = "org.schabi.newpipe.local.subscription"
+    public static final String IMPORT_COMPLETE_ACTION = App.PACKAGE_NAME + ".local.subscription"
             + ".services.SubscriptionsImportService.IMPORT_COMPLETE";
 
     /**
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index 63f6a400e..49c836346 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -33,6 +33,7 @@ import android.view.WindowManager;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;
 
@@ -64,25 +65,25 @@ public final class MainPlayer extends Service {
     //////////////////////////////////////////////////////////////////////////*/
 
     static final String ACTION_CLOSE
-            = "org.schabi.newpipe.player.MainPlayer.CLOSE";
+            = App.PACKAGE_NAME + ".player.MainPlayer.CLOSE";
     static final String ACTION_PLAY_PAUSE
-            = "org.schabi.newpipe.player.MainPlayer.PLAY_PAUSE";
+            = App.PACKAGE_NAME + ".player.MainPlayer.PLAY_PAUSE";
     static final String ACTION_OPEN_CONTROLS
-            = "org.schabi.newpipe.player.MainPlayer.OPEN_CONTROLS";
+            = App.PACKAGE_NAME + ".player.MainPlayer.OPEN_CONTROLS";
     static final String ACTION_REPEAT
-            = "org.schabi.newpipe.player.MainPlayer.REPEAT";
+            = App.PACKAGE_NAME + ".player.MainPlayer.REPEAT";
     static final String ACTION_PLAY_NEXT
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_PLAY_NEXT";
     static final String ACTION_PLAY_PREVIOUS
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_PLAY_PREVIOUS";
     static final String ACTION_FAST_REWIND
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_FAST_REWIND";
     static final String ACTION_FAST_FORWARD
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_FAST_FORWARD";
     static final String ACTION_SHUFFLE
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_SHUFFLE";
     public static final String ACTION_RECREATE_NOTIFICATION
-            = "org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION";
+            = App.PACKAGE_NAME + ".player.MainPlayer.ACTION_RECREATE_NOTIFICATION";
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service's LifeCycle

From b5bf0d7e1d2e47fbac39333e194671eafb3997f3 Mon Sep 17 00:00:00 2001
From: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Date: Tue, 22 Dec 2020 16:58:29 +0000
Subject: [PATCH 02/31] Export -> Import

---
 README.ko.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.ko.md b/README.ko.md
index a86eae8d9..460a90dc1 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -98,7 +98,7 @@ NewPipe 코드의 변경이 있을 때(기능 추가 또는 버그 수정으로
 1. 당신의 기록, 구독, 그리고 재생목록을 유지할 수 있도록 Settings > Content > Export Database 를 통해 데이터를 백업하십시오.
 2. NewPipe를 삭제하십시오.
 3. 새로운 소스에서 APK를 다운로드하고 이것을 설치하십시오.
-4. Step 1의 Settings > Content > Export Database 을 통해 데이터를 불러오십시오.
+4. Step 1의 Settings > Content > Import Database 을 통해 데이터를 불러오십시오.
 
 ## Contribution
 당신이 아이디어, 번역, 디자인 변경, 코드 정리, 또는 정말 큰 코드 수정에 대한 의견이 있다면, 도움은 항상 환영합니다.

From b2e9981313ad338b173de7123dfa5f65493a0914 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 23 Dec 2020 20:06:02 +0530
Subject: [PATCH 03/31] Fix queue display in ServicePlayerActivity.

---
 .../java/org/schabi/newpipe/player/ServicePlayerActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 41d66dc90..fd20fd175 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -638,12 +638,12 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             case BasePlayer.STATE_COMPLETED:
                 queueControlBinding.controlPlayPause.setClickable(true);
                 queueControlBinding.controlPlayPause.setVisibility(View.VISIBLE);
-                queueControlBinding.progressBar.setVisibility(View.GONE);
+                queueControlBinding.controlProgressBar.setVisibility(View.GONE);
                 break;
             default:
                 queueControlBinding.controlPlayPause.setClickable(false);
                 queueControlBinding.controlPlayPause.setVisibility(View.INVISIBLE);
-                queueControlBinding.progressBar.setVisibility(View.VISIBLE);
+                queueControlBinding.controlProgressBar.setVisibility(View.VISIBLE);
                 break;
         }
     }

From ced3898499c1157e67cb82f176fcd128c0263506 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Wed, 23 Dec 2020 16:45:56 +0100
Subject: [PATCH 04/31] Add Somali (Af Soomaali)[so] to app language chooser

---
 app/src/main/res/values/settings_keys.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index a861b9607..44e75c10c 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -1067,6 +1067,7 @@
         <item>sc</item>
         <item>sk</item>
         <item>sl</item>
+        <item>so</item>
         <item>sq</item>
         <item>sr</item>
         <item>sv</item>
@@ -1144,6 +1145,7 @@
         <item>sardu</item>
         <item>Slovenčina</item>
         <item>Slovenščina</item>
+        <item>Af Soomaali</item>
         <item>Shqip</item>
         <item>Српски</item>
         <item>Svenska</item>

From eddc12693ab42114132116cf79589685750a7af2 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Wed, 23 Dec 2020 19:58:02 +0100
Subject: [PATCH 05/31] [media.ccc.de] Fix service color

Caused by changing service name in TeamNewPipe/NewPipeExtractor#472
---
 app/src/main/AndroidManifest.xml                       | 2 +-
 app/src/main/java/org/schabi/newpipe/MainActivity.java | 2 +-
 app/src/main/res/values-v21/styles_services.xml        | 9 +++++----
 app/src/main/res/values/colors_services.xml            | 2 +-
 app/src/main/res/values/styles_services.xml            | 8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0a38b54f..d240d123f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -266,7 +266,7 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
 
-            <!-- MediaCCC filter -->
+            <!-- media.ccc.de filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index ff078fa2c..0c784e9d5 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -129,7 +129,7 @@ public class MainActivity extends AppCompatActivity {
                     + "savedInstanceState = [" + savedInstanceState + "]");
         }
 
-        // enable TLS1.1/1.2 for kitkat devices, to fix download and play for mediaCCC sources
+        // enable TLS1.1/1.2 for kitkat devices, to fix download and play for media.ccc.de sources
         if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
             TLSSocketFactoryCompat.setAsDefault();
         }
diff --git a/app/src/main/res/values-v21/styles_services.xml b/app/src/main/res/values-v21/styles_services.xml
index e5b675ef8..c495a9a31 100644
--- a/app/src/main/res/values-v21/styles_services.xml
+++ b/app/src/main/res/values-v21/styles_services.xml
@@ -12,6 +12,7 @@
     <style name="BlackTheme.YouTube" parent="BlackTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
     </style>
+
     <!-- SoundCloud -->
     <style name="LightTheme.SoundCloud" parent="LightTheme">
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
@@ -50,20 +51,20 @@
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
-    <!-- Media.ccc -->
-    <style name="LightTheme.MediaCCC" parent="LightTheme">
+    <!-- media.ccc.de -->
+    <style name="LightTheme.media.ccc.de" parent="LightTheme">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/light_media_ccc_accent_color</item>
     </style>
 
-    <style name="DarkTheme.MediaCCC" parent="DarkTheme">
+    <style name="DarkTheme.media.ccc.de" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
     </style>
 
-    <style name="BlackTheme.MediaCCC" parent="BlackTheme">
+    <style name="BlackTheme.media.ccc.de" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
diff --git a/app/src/main/res/values/colors_services.xml b/app/src/main/res/values/colors_services.xml
index a09878fae..2ff59e8dd 100644
--- a/app/src/main/res/values/colors_services.xml
+++ b/app/src/main/res/values/colors_services.xml
@@ -33,7 +33,7 @@
     <color name="dark_peertube_accent_color">#FFFFFF</color>
     <color name="dark_peertube_statusbar_color">#ff6f00</color>
 
-    <!-- Media.CCC -->
+    <!-- media.ccc.de -->
     <color name="light_media_ccc_primary_color">#9e9e9e</color>
     <color name="light_media_ccc_dark_color">#616161</color>
     <color name="light_media_ccc_accent_color">#000000</color>
diff --git a/app/src/main/res/values/styles_services.xml b/app/src/main/res/values/styles_services.xml
index 45622f627..ad8b35899 100644
--- a/app/src/main/res/values/styles_services.xml
+++ b/app/src/main/res/values/styles_services.xml
@@ -51,20 +51,20 @@
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
-    <!-- Media.ccc -->
-    <style name="LightTheme.MediaCCC" parent="LightTheme">
+    <!-- media.ccc.de -->
+    <style name="LightTheme.media.ccc.de" parent="LightTheme">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/light_media_ccc_accent_color</item>
     </style>
 
-    <style name="DarkTheme.MediaCCC" parent="DarkTheme">
+    <style name="DarkTheme.media.ccc.de" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
     </style>
 
-    <style name="BlackTheme.MediaCCC" parent="BlackTheme">
+    <style name="BlackTheme.media.ccc.de" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>

From a7493d10399c4423802736b12e0981a749bc3c7d Mon Sep 17 00:00:00 2001
From: mhmdanas <6daf084a-8eaf-40fb-86c7-8500077c3b69@anonaddy.me>
Date: Thu, 24 Dec 2020 19:33:03 +0300
Subject: [PATCH 06/31] Remove .gitmodules

It's empty anyway.
---
 .gitmodules | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb..000000000

From 4074c71b6a2457118d7585e154a6b9fb20928f5f Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Fri, 25 Dec 2020 09:45:40 +0000
Subject: [PATCH 07/31] Translated using Weblate (German)

Currently translated at 42.8% (18 of 42 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/de/
---
 fastlane/metadata/android/de/changelogs/961.txt    | 12 ++++++++++++
 fastlane/metadata/android/de/short_description.txt |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/de/changelogs/961.txt

diff --git a/fastlane/metadata/android/de/changelogs/961.txt b/fastlane/metadata/android/de/changelogs/961.txt
new file mode 100644
index 000000000..e145c7cfe
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] Mix-Unterstützung
+• [YouTube] Anzeige von Infos zu öffentlich-rechtlichen Sendern und Covid-19
+• [media.ccc.de] Neue Videos hinzugefügt
+• Somali-Übersetzung hinzugefügt
+
+• Viele interne Verbesserungen
+
+• Fehler beim Teilen von Videos aus dem Player heraus behoben
+• Leere ReCaptcha-Webansicht behoben
+• Absturz behoben, der beim Entfernen eines Streams aus einer Liste auftrat
+• [PeerTube] Verwandte Streams korrigiert
+• [YouTube] Fehler bei YouTube-Musiksuche behoben
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
index b7513976a..138e55523 100644
--- a/fastlane/metadata/android/de/short_description.txt
+++ b/fastlane/metadata/android/de/short_description.txt
@@ -1 +1 @@
-Eine freie, leichtgewichtige YouTube App für Android.
+Eine freie, leichtgewichtige YouTube-App für Android.

From c32bc263282773829d571662b6a4cd12eba2a53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=82=E3=82=8C?= <rjaquino230@gmail.com>
Date: Thu, 24 Dec 2020 03:02:44 +0000
Subject: [PATCH 08/31] Translated using Weblate (Filipino)

Currently translated at 0.0% (0 of 42 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/fil/
---
 fastlane/metadata/android/fil/full_description.txt  | 1 +
 fastlane/metadata/android/fil/short_description.txt | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/fil/full_description.txt
 create mode 100644 fastlane/metadata/android/fil/short_description.txt

diff --git a/fastlane/metadata/android/fil/full_description.txt b/fastlane/metadata/android/fil/full_description.txt
new file mode 100644
index 000000000..b910a60a1
--- /dev/null
+++ b/fastlane/metadata/android/fil/full_description.txt
@@ -0,0 +1 @@
+Hindi gumagamit ang NewPipe ng kahit anong Google framework libraries o ang YouTube API. Pinaparse niya lang ang website upang makakalap ng impormasyong kinakailangan nito. Samakatuwid ang app na ito ay puwedeng gamitin sa mga device na walang naka install na Google Services. Hindi mo rin kailangan ng YouTube account upang magamit ang NewPipe at saka ito ay FLOSS.
diff --git a/fastlane/metadata/android/fil/short_description.txt b/fastlane/metadata/android/fil/short_description.txt
new file mode 100644
index 000000000..6e3aa8fa8
--- /dev/null
+++ b/fastlane/metadata/android/fil/short_description.txt
@@ -0,0 +1 @@
+Isang magaan at libreng YouTube para sa Android.

From 2586c543d3fe278f0e16a31772ee76c7cd1e8861 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Wed, 23 Dec 2020 20:16:06 +0000
Subject: [PATCH 09/31] Translated using Weblate (Hebrew)

Currently translated at 30.9% (13 of 42 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/he/
---
 fastlane/metadata/android/he/changelogs/961.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 fastlane/metadata/android/he/changelogs/961.txt

diff --git a/fastlane/metadata/android/he/changelogs/961.txt b/fastlane/metadata/android/he/changelogs/961.txt
new file mode 100644
index 000000000..cc8e84aa3
--- /dev/null
+++ b/fastlane/metadata/android/he/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] תמיכה בערבול
+• [YouTube] הצגת מידע על משדרים ציבוריים וקורונה
+• [media.ccc.de] נוספו סרטונים אחרונים
+• נוסף תרגום לסומלית
+
+• מגוון שיפורים פנימיים
+
+• תוקן שיתוף סרטונים מתוך הנגן
+• תוקנה תצוגת ReCaptcha (מבחן טיורינג) ריקה
+• תוקנה קריסה שנגרמה בעת הסרת תזרים מרשימה
+• [PeerTube] תוקנו תזרימים קשורים
+• [YouTube] תוקן החיפוש ב־YouTube Music

From d4164653716ec844415a4ff61122447e99689532 Mon Sep 17 00:00:00 2001
From: Bopol <bopol@e.email>
Date: Wed, 23 Dec 2020 14:28:27 +0000
Subject: [PATCH 10/31] Translated using Weblate (French)

Currently translated at 69.0% (29 of 42 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/fr/
---
 fastlane/metadata/android/fr/changelogs/961.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 fastlane/metadata/android/fr/changelogs/961.txt

diff --git a/fastlane/metadata/android/fr/changelogs/961.txt b/fastlane/metadata/android/fr/changelogs/961.txt
new file mode 100644
index 000000000..345b967f4
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/961.txt
@@ -0,0 +1,13 @@
+• [YouTube] Support des Mix
+• [YouTube] Affichage des informations à propos du Covid et des chaines de service public
+• [media.ccc.de] Support des vidéos récentes
+• Traduction en Somalien
+
+• Beaucoup d'améliorations internes
+
+Corrections :
+• Partager des vidéos depuis le lecteur
+• Page ReCaptcha blanche
+• Crash lors de la suppression d'un élément d'une liste
+• [PeerTube] Vidéos liées
+• [YouTube] Moteur de recherche YouTube Music

From 81742565a4af653008c8a3ba5256a9bb3b7bbc8b Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Fri, 25 Dec 2020 19:00:28 +0100
Subject: [PATCH 11/31] Update NewPipe Extractor to v0.20.7

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8e4ce3725..36bce9456 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:79b5aa9760da52020821b68e2af41a9238943304'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b2837698f55296e00aeca5cb1847755dd1174af4'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From 35fc27cfb0a6032b2e5c3ee188f0ff1c4fb0ac0b Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Mon, 21 Dec 2020 19:58:48 +0100
Subject: [PATCH 12/31] update version

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 36bce9456..522c36062 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 960
-        versionName "0.20.6"
+        versionCode 961
+        versionName "0.20.7"
 
         multiDexEnabled true
 

From feea084c60ea2ba12f97683d46777bd35f6c0c2a Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sat, 26 Dec 2020 10:06:16 +0100
Subject: [PATCH 13/31] Replace travic ci badge with github actions one for dev
 branch pushes

---
 README.ko.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.ko.md b/README.ko.md
index a86eae8d9..b5e0d2aa1 100644
--- a/README.ko.md
+++ b/README.ko.md
@@ -6,7 +6,7 @@
 <p align="center">
 <a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
 <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
-<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
 <a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
 <a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
 <a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
diff --git a/README.md b/README.md
index c66bcfa7f..006085a51 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 <p align="center">
 <a href="https://github.com/TeamNewPipe/NewPipe/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
 <a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
-<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
+<a href="https://github.com/TeamNewPipe/NewPipe/actions" alt="Build Status"><img src="https://github.com/TeamNewPipe/NewPipe/workflows/CI/badge.svg?branch=dev&event=push"></a>
 <a href="https://hosted.weblate.org/engage/newpipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/newpipe/-/svg-badge.svg"></a>
 <a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
 <a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>

From c923d35a1fb86de972856ef8d256389222289d8e Mon Sep 17 00:00:00 2001
From: Gontzal Manuel Pujana Onaindia <thadahdenyse@gmail.com>
Date: Sat, 26 Dec 2020 13:48:48 +0000
Subject: [PATCH 14/31] Translated using Weblate (Basque)

Currently translated at 28.5% (12 of 42 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/eu/
---
 fastlane/metadata/android/eu/changelogs/961.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 fastlane/metadata/android/eu/changelogs/961.txt

diff --git a/fastlane/metadata/android/eu/changelogs/961.txt b/fastlane/metadata/android/eu/changelogs/961.txt
new file mode 100644
index 000000000..c5a02831f
--- /dev/null
+++ b/fastlane/metadata/android/eu/changelogs/961.txt
@@ -0,0 +1,12 @@
+• [YouTube] Mix bateragarritasuna
+• [YouTube] Erakutsi emisore publikoei eta Covid-19ri buruzko informazioa
+• [media.ccc.de] Azken bideoak gehitu dira
+• Somaliar itzulpena gehitu da
+
+• Barne hobekuntza ugari
+
+• Erreproduzitzailetik bideoak partekatzea konpondu da
+• ReCaptcha web ikuspegi hutsa konpondu da
+• Zerrenda batetik jario bat kentzean gertatutako kraskadura konpondu da
+• [PeerTube] Konpondu erlazionatutako jarioak
+• [YouTube] YouTube Music bilaketa konpondu da

From 8ba2f5f964a0f5335616dd6b859eb798d3cea45b Mon Sep 17 00:00:00 2001
From: chr56 <chr0056@gmail.com>
Date: Sat, 26 Dec 2020 02:25:09 +0000
Subject: [PATCH 15/31] Translated using Weblate (Chinese (Simplified))

Currently translated at 71.4% (30 of 42 strings)

Translation: NewPipe/Metadata
Translate-URL: https://hosted.weblate.org/projects/newpipe/metadata/zh_Hans/
---
 fastlane/metadata/android/zh_Hans/changelogs/961.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 fastlane/metadata/android/zh_Hans/changelogs/961.txt

diff --git a/fastlane/metadata/android/zh_Hans/changelogs/961.txt b/fastlane/metadata/android/zh_Hans/changelogs/961.txt
new file mode 100644
index 000000000..0bd58c19a
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hans/changelogs/961.txt
@@ -0,0 +1,12 @@
+- [YouTube] Mix支持
+- [YouTube]显示关于公共广播和Covid-19的信息
+- [media.cc.de] 添加了「最近的视频」。
+- 新增 索马里语翻译
+
+- 大量内部改进
+
+- 修正 在播放器内分享视频时出错
+- 修正 ReCaptcha网页视图一片空白
+- 修正 在列表中删除视频时崩溃
+- [PeerTube]修复 相关视频播放
+- [YouTube] 修正 YouTube音乐搜索

From 1984436b41e2b3f32265f17db4e51adc4a29963e Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 27 Dec 2020 01:29:24 +0100
Subject: [PATCH 16/31] [media.ccc.de] Add "recent" kiosk

---
 app/build.gradle                                               | 2 +-
 app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java | 3 +++
 app/src/main/res/values/strings.xml                            | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 36bce9456..ff230d0ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b2837698f55296e00aeca5cb1847755dd1174af4'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:674f2227f3a1ca11cbc9101a9d6211ad7babd42a'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"
diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index ccd4d13fc..c9b69e4d7 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -44,6 +44,8 @@ public final class KioskTranslator {
                 return c.getString(R.string.most_liked);
             case "conferences":
                 return c.getString(R.string.conferences);
+            case "recent":
+                return c.getString(R.string.recent);
             default:
                 return kioskId;
         }
@@ -59,6 +61,7 @@ public final class KioskTranslator {
             case "Local":
                 return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_local);
             case "Recently added":
+            case "recent":
                 return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent);
             case "Most liked":
                 return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d790dfdc..c70b56e97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -691,4 +691,5 @@
     <string name="playlist_page_summary">Playlist page</string>
     <string name="show_thumbnail_title">Show thumbnail</string>
     <string name="show_thumbnail_summary">Use thumbnail for both lock screen background and notifications</string>
+    <string name="recent">Recent</string>
 </resources>
\ No newline at end of file

From 36aea35a92950037193ce27087b3a6310d575f70 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 27 Dec 2020 13:26:40 +0100
Subject: [PATCH 17/31] [media.ccc.de] Add live stream kiosk

---
 app/build.gradle                                             | 2 +-
 .../newpipe/info_list/holder/StreamMiniInfoItemHolder.java   | 3 ++-
 .../main/java/org/schabi/newpipe/util/KioskTranslator.java   | 4 ++++
 app/src/main/res/drawable/ic_live_tv_black_24dp.xml          | 5 +++++
 app/src/main/res/drawable/ic_live_tv_white_24dp.xml          | 5 +++++
 app/src/main/res/values/attrs.xml                            | 1 +
 app/src/main/res/values/styles.xml                           | 2 ++
 7 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_live_tv_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_live_tv_white_24dp.xml

diff --git a/app/build.gradle b/app/build.gradle
index ff230d0ee..370bb4e8f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:674f2227f3a1ca11cbc9101a9d6211ad7babd42a'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b4e191397117447364d137791ec4b1ca3672d75b'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
index c0096ed10..12eab4734 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
@@ -70,7 +70,8 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
             } else {
                 itemProgressView.setVisibility(View.GONE);
             }
-        } else if (item.getStreamType() == StreamType.LIVE_STREAM) {
+        } else if (item.getStreamType() == StreamType.LIVE_STREAM
+                || item.getStreamType() == StreamType.AUDIO_LIVE_STREAM) {
             itemDurationView.setText(R.string.duration_live);
             itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
                     R.color.live_duration_background_color));
diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index c9b69e4d7..d2daaf6cc 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -46,6 +46,8 @@ public final class KioskTranslator {
                 return c.getString(R.string.conferences);
             case "recent":
                 return c.getString(R.string.recent);
+            case "live":
+                return c.getString(R.string.duration_live);
             default:
                 return kioskId;
         }
@@ -65,6 +67,8 @@ public final class KioskTranslator {
                 return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent);
             case "Most liked":
                 return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up);
+            case "live":
+                return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_live_tv);
             default:
                 return 0;
         }
diff --git a/app/src/main/res/drawable/ic_live_tv_black_24dp.xml b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml
new file mode 100644
index 000000000..1f7957c4a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/black" android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_live_tv_white_24dp.xml b/app/src/main/res/drawable/ic_live_tv_white_24dp.xml
new file mode 100644
index 000000000..303858f9d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_live_tv_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
+</vector>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ab415508f..42fc7660e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -82,6 +82,7 @@
     <attr name="ic_sort" format="reference" />
     <attr name="ic_help" format="reference" />
     <attr name="ic_arrow_back" format="reference" />
+    <attr name="ic_live_tv" format="reference" />
 
     <attr name="progress_horizontal_drawable" format="reference" />
     <!-- Can't refer to colors directly in drawable's xml-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5c402b751..d7e7ab1dc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -48,6 +48,7 @@
         <item name="ic_kiosk_local">@drawable/ic_home_black_24dp</item>
         <item name="ic_kiosk_recent">@drawable/ic_add_circle_outline_black_24dp</item>
         <item name="ic_channel">@drawable/ic_tv_black_24dp</item>
+        <item name="ic_live_tv">@drawable/ic_live_tv_black_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item>
         <item name="ic_playlist_add">@drawable/ic_playlist_add_black_24dp</item>
         <item name="ic_playlist_check">@drawable/ic_playlist_add_check_black_24dp</item>
@@ -156,6 +157,7 @@
         <item name="ic_kiosk_local">@drawable/ic_home_white_24dp</item>
         <item name="ic_kiosk_recent">@drawable/ic_add_circle_outline_white_24dp</item>
         <item name="ic_channel">@drawable/ic_tv_white_24dp</item>
+        <item name="ic_live_tv">@drawable/ic_live_tv_white_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
         <item name="ic_playlist_add">@drawable/ic_playlist_add_white_24dp</item>
         <item name="ic_playlist_check">@drawable/ic_playlist_add_check_white_24dp</item>

From 8343d9cc18337c8cc69e350d6d8e4ab4d6183946 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 27 Dec 2020 14:55:57 +0100
Subject: [PATCH 18/31] Release 0.20.8 (962)

---
 app/build.gradle                                   | 4 ++--
 fastlane/metadata/android/en-US/changelogs/962.txt | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/962.txt

diff --git a/app/build.gradle b/app/build.gradle
index 5d1dce46e..f4ca64661 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 961
-        versionName "0.20.7"
+        versionCode 962
+        versionName "0.20.8"
 
         multiDexEnabled true
 
diff --git a/fastlane/metadata/android/en-US/changelogs/962.txt b/fastlane/metadata/android/en-US/changelogs/962.txt
new file mode 100644
index 000000000..3e43bc70d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/962.txt
@@ -0,0 +1,2 @@
+Added "recent" videos to media.ccc.de service.
+Added live streams to media.ccc.de service.
\ No newline at end of file

From 0483d3ff3241b4ef26c5bef5a9bac352c66aa038 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 27 Dec 2020 15:06:03 +0100
Subject: [PATCH 19/31] add live stream support to changelog

---
 fastlane/metadata/android/en-US/changelogs/962.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/en-US/changelogs/962.txt b/fastlane/metadata/android/en-US/changelogs/962.txt
index 3e43bc70d..9551cda23 100644
--- a/fastlane/metadata/android/en-US/changelogs/962.txt
+++ b/fastlane/metadata/android/en-US/changelogs/962.txt
@@ -1,2 +1,2 @@
 Added "recent" videos to media.ccc.de service.
-Added live streams to media.ccc.de service.
\ No newline at end of file
+Added live streams to media.ccc.de service and also live stream support.
\ No newline at end of file

From 7153506ddbe5b5c4ad3acf2ae281927ad73b44d7 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sun, 27 Dec 2020 17:09:09 +0100
Subject: [PATCH 20/31] Update extractor

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f4ca64661..2b7b9cdb0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b4e191397117447364d137791ec4b1ca3672d75b'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:deb9af7bf53b3f8fd9d32322adae02df78d985ea'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

From d45ce19b04f175cbb2fd22fd01636e5e2bdb5ca9 Mon Sep 17 00:00:00 2001
From: urlordjames <urlordjames@gmail.com>
Date: Sat, 26 Dec 2020 12:47:08 -0500
Subject: [PATCH 21/31] Fix #4481

---
 .../schabi/newpipe/fragments/detail/VideoDetailFragment.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 6560ab404..0da79d4c2 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -2048,6 +2048,10 @@ public final class VideoDetailFragment
             // Apply system brightness when the player is not in fullscreen
             restoreDefaultBrightness();
         } else {
+            // Do not restore if user has disabled brightness gesture
+            if (!PlayerHelper.isBrightnessGestureEnabled(activity)) {
+                return;
+            }
             // Restore already saved brightness level
             final float brightnessLevel = PlayerHelper.getScreenBrightness(activity);
             if (brightnessLevel == lp.screenBrightness) {

From 0a05534c848a5b32d67ce3df7060a037ce686c1c Mon Sep 17 00:00:00 2001
From: Eric Lemieux <eric@lemieuxdev.com>
Date: Mon, 28 Dec 2020 15:20:17 -0500
Subject: [PATCH 22/31] Fix null pointer exception in play button method

When the play queue was null, and this method was called a null pointer
exception would be thrown. This change adds an additional check to see
if the play queue is not null before making additional changes.
---
 .../newpipe/player/VideoPlayerImpl.java       | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index a304b4430..06cbcd780 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -1071,11 +1071,25 @@ public class VideoPlayerImpl extends VideoPlayer
 
     private void animatePlayButtons(final boolean show, final int duration) {
         animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
-        if (playQueue.getIndex() > 0 || !show) {
-            animateView(playPreviousButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+
+        boolean showQueueButtons = show;
+        if (playQueue == null) {
+            showQueueButtons = false;
         }
-        if (playQueue.getIndex() + 1 < playQueue.getStreams().size() || !show) {
-            animateView(playNextButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+
+        if (!showQueueButtons || playQueue.getIndex() > 0) {
+            animateView(
+                playPreviousButton,
+                AnimationUtils.Type.SCALE_AND_ALPHA,
+                showQueueButtons,
+                duration);
+        }
+        if (!showQueueButtons || playQueue.getIndex() + 1 < playQueue.getStreams().size()) {
+            animateView(
+                playNextButton,
+                AnimationUtils.Type.SCALE_AND_ALPHA,
+                showQueueButtons,
+                duration);
         }
 
     }

From 1f15368b7bd53ed06e149c6eca81c1e6a91bed5c Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Wed, 30 Dec 2020 21:07:30 +0100
Subject: [PATCH 23/31] Fix urls with timestamps not being played

Else path is now executed, when a timestamp (item.getRecoveryPosition) is present
---
 .../org/schabi/newpipe/player/BasePlayer.java | 80 +++++++++----------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index d5ad9cb6f..8eae33de6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -19,6 +19,12 @@
 
 package org.schabi.newpipe.player;
 
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
+import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -30,11 +36,9 @@ import android.media.AudioManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
-
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -53,7 +57,12 @@ import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.SerialDisposable;
+import java.io.IOException;
 import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
@@ -75,20 +84,6 @@ import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.SerializedCache;
 
-import java.io.IOException;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.disposables.SerialDisposable;
-
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
-import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 /**
  * Base for the players, joining the common properties.
  *
@@ -342,37 +337,36 @@ public abstract class BasePlayer implements
             simpleExoPlayer.setPlayWhenReady(playWhenReady);
 
         } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false)
-                && isPlaybackResumeEnabled()
-                && !samePlayQueue) {
-            final PlayQueueItem item = queue.getItem();
-            if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
-                stateLoader = recordManager.loadStreamState(item)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        // Do not place initPlayback() in doFinally() because
-                        // it restarts playback after destroy()
-                        //.doFinally()
-                        .subscribe(
-                                state -> {
-                                    queue.setRecovery(queue.getIndex(), state.getProgressTime());
-                                    initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                                            playbackSkipSilence, playWhenReady, isMuted);
-                                },
-                                error -> {
-                                    if (DEBUG) {
-                                        error.printStackTrace();
-                                    }
-                                    // In case any error we can start playback without history
-                                    initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
-                                            playbackSkipSilence, playWhenReady, isMuted);
-                                },
-                                () -> {
-                                    // Completed but not found in history
+            && isPlaybackResumeEnabled()
+            && !samePlayQueue
+            && !queue.isEmpty()
+            && queue.getItem().getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
+            stateLoader = recordManager.loadStreamState(queue.getItem())
+                .observeOn(AndroidSchedulers.mainThread())
+                // Do not place initPlayback() in doFinally() because
+                // it restarts playback after destroy()
+                //.doFinally()
+                .subscribe(
+                    state -> {
+                        queue.setRecovery(queue.getIndex(), state.getProgressTime());
+                        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
+                            playbackSkipSilence, playWhenReady, isMuted);
+                    },
+                    error -> {
+                        if (DEBUG) {
+                            error.printStackTrace();
+                        }
+                        // In case any error we can start playback without history
+                        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
+                            playbackSkipSilence, playWhenReady, isMuted);
+                    },
+                    () -> {
+                        // Completed but not found in history
                                     initPlayback(queue, repeatMode, playbackSpeed, playbackPitch,
                                             playbackSkipSilence, playWhenReady, isMuted);
                                 }
                         );
                 databaseUpdateReactor.add(stateLoader);
-            }
         } else {
             // Good to go...
             // In a case of equal PlayQueues we can re-init old one but only when it is disposed

From ebd589c9cbe7c73f4a2ba174438b533529860668 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Wed, 30 Dec 2020 17:10:57 -0500
Subject: [PATCH 24/31] Use AndroidX Media compat in AudioReactor

---
 app/build.gradle                              |  1 +
 .../newpipe/player/helper/AudioReactor.java   | 39 ++++++-------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 15561b2d2..15b0668c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -203,6 +203,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.media:media:1.2.1'
     implementation 'androidx.webkit:webkit:1.4.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
index ffe19599d..13ee24e16 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -5,14 +5,14 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.Intent;
-import android.media.AudioFocusRequest;
 import android.media.AudioManager;
 import android.media.audiofx.AudioEffect;
-import android.os.Build;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+import androidx.media.AudioFocusRequestCompat;
+import androidx.media.AudioManagerCompat;
 
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
@@ -21,20 +21,17 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
 
     private static final String TAG = "AudioFocusReactor";
 
-    private static final boolean SHOULD_BUILD_FOCUS_REQUEST =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-
     private static final int DUCK_DURATION = 1500;
     private static final float DUCK_AUDIO_TO = .2f;
 
-    private static final int FOCUS_GAIN_TYPE = AudioManager.AUDIOFOCUS_GAIN;
+    private static final int FOCUS_GAIN_TYPE = AudioManagerCompat.AUDIOFOCUS_GAIN;
     private static final int STREAM_TYPE = AudioManager.STREAM_MUSIC;
 
     private final SimpleExoPlayer player;
     private final Context context;
     private final AudioManager audioManager;
 
-    private final AudioFocusRequest request;
+    private final AudioFocusRequestCompat request;
 
     public AudioReactor(@NonNull final Context context,
                         @NonNull final SimpleExoPlayer player) {
@@ -43,15 +40,11 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
         this.audioManager = ContextCompat.getSystemService(context, AudioManager.class);
         player.addAnalyticsListener(this);
 
-        if (SHOULD_BUILD_FOCUS_REQUEST) {
-            request = new AudioFocusRequest.Builder(FOCUS_GAIN_TYPE)
-                    .setAcceptsDelayedFocusGain(true)
-                    .setWillPauseWhenDucked(true)
-                    .setOnAudioFocusChangeListener(this)
-                    .build();
-        } else {
-            request = null;
-        }
+        request = new AudioFocusRequestCompat.Builder(FOCUS_GAIN_TYPE)
+                //.setAcceptsDelayedFocusGain(true)
+                .setWillPauseWhenDucked(true)
+                .setOnAudioFocusChangeListener(this)
+                .build();
     }
 
     public void dispose() {
@@ -64,19 +57,11 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
     //////////////////////////////////////////////////////////////////////////*/
 
     public void requestAudioFocus() {
-        if (SHOULD_BUILD_FOCUS_REQUEST) {
-            audioManager.requestAudioFocus(request);
-        } else {
-            audioManager.requestAudioFocus(this, STREAM_TYPE, FOCUS_GAIN_TYPE);
-        }
+        AudioManagerCompat.requestAudioFocus(audioManager, request);
     }
 
     public void abandonAudioFocus() {
-        if (SHOULD_BUILD_FOCUS_REQUEST) {
-            audioManager.abandonAudioFocusRequest(request);
-        } else {
-            audioManager.abandonAudioFocus(this);
-        }
+        AudioManagerCompat.abandonAudioFocusRequest(audioManager, request);
     }
 
     public int getVolume() {
@@ -88,7 +73,7 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
     }
 
     public int getMaxVolume() {
-        return audioManager.getStreamMaxVolume(STREAM_TYPE);
+        return AudioManagerCompat.getStreamMaxVolume(audioManager, STREAM_TYPE);
     }
 
     /*//////////////////////////////////////////////////////////////////////////

From 71add5a7c28945682ad9e45b108baa47f1928353 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Thu, 31 Dec 2020 19:26:41 -0500
Subject: [PATCH 25/31] Update displayed licenses

---
 app/src/main/assets/epl1.html                 | 245 ++++++++++++++++++
 .../schabi/newpipe/about/AboutActivity.java   |  62 +++--
 .../newpipe/about/StandardLicenses.java       |   2 +
 3 files changed, 283 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/assets/epl1.html

diff --git a/app/src/main/assets/epl1.html b/app/src/main/assets/epl1.html
new file mode 100644
index 000000000..7123552dd
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
index 6ff691561..2569f4a94 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -29,37 +29,46 @@ public class AboutActivity extends AppCompatActivity {
      * List of all software components.
      */
     private static final SoftwareComponent[] SOFTWARE_COMPONENTS = {
-            new SoftwareComponent("Giga Get", "2014 - 2015", "Peter Cai",
+            new SoftwareComponent("ACRA", "2013", "Kevin Gaudin",
+                    "https://github.com/ACRA/acra", StandardLicenses.APACHE2),
+            new SoftwareComponent("AndroidX", "2005 - 2011", "The Android Open Source Project",
+                    "https://developer.android.com/jetpack", StandardLicenses.APACHE2),
+            new SoftwareComponent("CircleImageView", "2014 - 2020", "Henning Dodenhof",
+                    "https://github.com/hdodenhof/CircleImageView",
+                    StandardLicenses.APACHE2),
+            new SoftwareComponent("ExoPlayer", "2014 - 2020", "Google, Inc.",
+                    "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
+            new SoftwareComponent("GigaGet", "2014 - 2015", "Peter Cai",
                     "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL3),
+            new SoftwareComponent("Groupie", "2016", "Lisa Wray",
+                    "https://github.com/lisawray/groupie", StandardLicenses.MIT),
+            new SoftwareComponent("Icepick", "2015", "Frankie Sardo",
+                    "https://github.com/frankiesardo/icepick", StandardLicenses.EPL1),
+            new SoftwareComponent("Jsoup", "2009 - 2020", "Jonathan Hedley",
+                    "https://github.com/jhy/jsoup", StandardLicenses.MIT),
+            new SoftwareComponent("Markwon", "2019", "Dimitry Ivanov",
+                    "https://github.com/noties/Markwon", StandardLicenses.APACHE2),
+            new SoftwareComponent("Material Components for Android", "2016 - 2020", "Google, Inc.",
+                    "https://github.com/material-components/material-components-android",
+                    StandardLicenses.APACHE2),
             new SoftwareComponent("NewPipe Extractor", "2017 - 2020", "Christian Schabesberger",
                     "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
-            new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley",
-                    "https://github.com/jhy/jsoup", StandardLicenses.MIT),
-            new SoftwareComponent("Rhino", "2015", "Mozilla",
-                    "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
-            new SoftwareComponent("ACRA", "2013", "Kevin Gaudin",
-                    "http://www.acra.ch", StandardLicenses.APACHE2),
+            new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam",
+                    "https://github.com/spacecowboy/NoNonsense-FilePicker",
+                    StandardLicenses.MPL2),
+            new SoftwareComponent("OkHttp", "2019", "Square, Inc.",
+                    "https://square.github.io/okhttp/", StandardLicenses.APACHE2),
+            new SoftwareComponent("PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
+                    "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors",
+                    "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxBinding", "2015", "Jake Wharton",
+                    "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxJava", "2016 - 2020", "RxJava Contributors",
+                    "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2),
             new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich",
                     "https://github.com/nostra13/Android-Universal-Image-Loader",
                     StandardLicenses.APACHE2),
-            new SoftwareComponent("CircleImageView", "2014 - 2020", "Henning Dodenhof",
-                    "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
-            new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam",
-                    "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2),
-            new SoftwareComponent("ExoPlayer", "2014 - 2020", "Google Inc",
-                    "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxAndroid", "2015 - 2018", "The RxAndroid authors",
-                    "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxJava", "2016 - 2020", "RxJava Contributors",
-                    "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2),
-            new SoftwareComponent("RxBinding", "2015 - 2018", "Jake Wharton",
-                    "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2),
-            new SoftwareComponent("PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
-                    "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2),
-            new SoftwareComponent("Markwon", "2017 - 2020", "Noties",
-                    "https://github.com/noties/Markwon", StandardLicenses.APACHE2),
-            new SoftwareComponent("Groupie", "2016", "Lisa Wray",
-                    "https://github.com/lisawray/groupie", StandardLicenses.MIT)
     };
 
     private static final int POS_ABOUT = 0;
@@ -115,7 +124,8 @@ public class AboutActivity extends AppCompatActivity {
      * A placeholder fragment containing a simple view.
      */
     public static class AboutFragment extends Fragment {
-        public AboutFragment() { }
+        public AboutFragment() {
+        }
 
         /**
          * Created a new instance of this fragment for the given section number.
diff --git a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java b/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java
index 50ee5ebc3..60b1e168c 100644
--- a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java
+++ b/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java
@@ -12,6 +12,8 @@ public final class StandardLicenses {
             = new License("Mozilla Public License, Version 2.0", "MPL 2.0", "mpl2.html");
     public static final License MIT
             = new License("MIT License", "MIT", "mit.html");
+    public static final License EPL1
+            = new License("Eclipse Public License, Version 1.0", "EPL 1.0", "epl1.html");
 
     private StandardLicenses() { }
 }

From 31899d2ab9dee7a6a41f17b818297d4170408152 Mon Sep 17 00:00:00 2001
From: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:40:20 +0000
Subject: [PATCH 26/31] Checklist is compulsory: bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f9201f948..e74a5a761 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.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 -->

From 24c1cfbf721bc8df5f36005c180cfec653a82bdf Mon Sep 17 00:00:00 2001
From: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Date: Fri, 1 Jan 2021 18:42:07 +0000
Subject: [PATCH 27/31] Checklist is compulsory: feature request template

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index c4d378d14..361c8057f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.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.

From 14a21710359f2ae688288087a661bd9f27a16772 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 23 Dec 2020 07:50:43 +0530
Subject: [PATCH 28/31] Use Objects.requireNonNull().

---
 .../org/schabi/newpipe/about/LicenseFragment.java  |  8 +++-----
 .../newpipe/settings/DownloadSettingsFragment.java |  5 +----
 .../java/us/shandian/giga/get/DownloadMission.java |  5 +++--
 .../us/shandian/giga/get/DownloadRunnable.java     |  4 ++--
 .../giga/get/sqlite/FinishedMissionStore.java      | 14 +++++---------
 .../us/shandian/giga/io/CircularFileWriter.java    |  5 ++---
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
index 8367a75dc..6e48a0e14 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -19,6 +19,7 @@ import org.schabi.newpipe.util.ShareUtils;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
@@ -35,12 +36,9 @@ public class LicenseFragment extends Fragment {
     private final CompositeDisposable compositeDisposable = new CompositeDisposable();
 
     public static LicenseFragment newInstance(final SoftwareComponent[] softwareComponents) {
-        if (softwareComponents == null) {
-            throw new NullPointerException("softwareComponents is null");
-        }
-        final LicenseFragment fragment = new LicenseFragment();
         final Bundle bundle = new Bundle();
-        bundle.putParcelableArray(ARG_COMPONENTS, softwareComponents);
+        bundle.putParcelableArray(ARG_COMPONENTS, Objects.requireNonNull(softwareComponents));
+        final LicenseFragment fragment = new LicenseFragment();
         fragment.setArguments(bundle);
         return fragment;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index a4b29fc49..8742f0937 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -246,10 +246,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
 
 
         // revoke permissions on the old save path (required for SAF only)
-        final Context context = getContext();
-        if (context == null) {
-            throw new NullPointerException("getContext()");
-        }
+        final Context context = requireContext();
 
         forgetSAFTree(context, defaultPreferences.getString(key, ""));
 
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index d7c586083..2b3faa3e0 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -22,6 +22,7 @@ import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.channels.ClosedByInterruptException;
+import java.util.Objects;
 
 import javax.net.ssl.SSLException;
 
@@ -154,8 +155,8 @@ public class DownloadMission extends Mission {
     public transient Thread init = null;
 
     public DownloadMission(String[] urls, StoredFileHelper storage, char kind, Postprocessing psInstance) {
-        if (urls == null) throw new NullPointerException("urls is null");
-        if (urls.length < 1) throw new IllegalArgumentException("urls is empty");
+        if (Objects.requireNonNull(urls).length < 1)
+            throw new IllegalArgumentException("urls array is empty");
         this.urls = urls;
         this.kind = kind;
         this.offsets = new long[urls.length];
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 7fb12d088..6f504cea3 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.nio.channels.ClosedByInterruptException;
+import java.util.Objects;
 
 import us.shandian.giga.get.DownloadMission.Block;
 import us.shandian.giga.get.DownloadMission.HttpError;
@@ -29,8 +30,7 @@ public class DownloadRunnable extends Thread {
     private HttpURLConnection mConn;
 
     DownloadRunnable(DownloadMission mission, int id) {
-        if (mission == null) throw new NullPointerException("mission is null");
-        mMission = mission;
+        mMission = Objects.requireNonNull(mission);
         mId = id;
     }
 
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
index 1d1dca0df..15c45c6fd 100644
--- a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java
@@ -12,6 +12,7 @@ import androidx.annotation.NonNull;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Objects;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
@@ -140,9 +141,7 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
     }
 
     private FinishedMission getMissionFromCursor(Cursor cursor) {
-        if (cursor == null) throw new NullPointerException("cursor is null");
-
-        String kind = cursor.getString(cursor.getColumnIndex(KEY_KIND));
+        String kind = Objects.requireNonNull(cursor).getString(cursor.getColumnIndex(KEY_KIND));
         if (kind == null || kind.isEmpty()) kind = "?";
 
         String path = cursor.getString(cursor.getColumnIndexOrThrow(KEY_PATH));
@@ -186,15 +185,13 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
     }
 
     public void addFinishedMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+        ContentValues values = getValuesOfMission(Objects.requireNonNull(downloadMission));
         SQLiteDatabase database = getWritableDatabase();
-        ContentValues values = getValuesOfMission(downloadMission);
         database.insert(FINISHED_TABLE_NAME, null, values);
     }
 
     public void deleteMission(Mission mission) {
-        if (mission == null) throw new NullPointerException("mission is null");
-        String ts = String.valueOf(mission.timestamp);
+        String ts = String.valueOf(Objects.requireNonNull(mission).timestamp);
 
         SQLiteDatabase database = getWritableDatabase();
 
@@ -212,9 +209,8 @@ public class FinishedMissionStore extends SQLiteOpenHelper {
     }
 
     public void updateMission(Mission mission) {
-        if (mission == null) throw new NullPointerException("mission is null");
+        ContentValues values = getValuesOfMission(Objects.requireNonNull(mission));
         SQLiteDatabase database = getWritableDatabase();
-        ContentValues values = getValuesOfMission(mission);
         String ts = String.valueOf(mission.timestamp);
 
         int rowsAffected;
diff --git a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
index 4d62ab200..dbceeb091 100644
--- a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
+++ b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java
@@ -7,6 +7,7 @@ import org.schabi.newpipe.streams.io.SharpStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Objects;
 
 public class CircularFileWriter extends SharpStream {
 
@@ -27,9 +28,7 @@ public class CircularFileWriter extends SharpStream {
     private BufferedFile aux;
 
     public CircularFileWriter(SharpStream target, File temp, OffsetChecker checker) throws IOException {
-        if (checker == null) {
-            throw new NullPointerException("checker is null");
-        }
+        Objects.requireNonNull(checker);
 
         if (!temp.exists()) {
             if (!temp.createNewFile()) {

From aeca8dc5b2fb9f612d1d26b797d2160977247c40 Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Sat, 2 Jan 2021 14:39:31 +0100
Subject: [PATCH 29/31] Disable sending metrics to Google in Android System
 Webview

Fixes TeamNewPipe/NewPipe#5335
---
 app/src/main/AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d240d123f..3509f2d13 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -318,6 +318,8 @@
             android:name=".RouterActivity$FetcherService"
             android:exported="false" />
 
+        <!-- opting out of sending metrics to Google in Android System WebView -->
+        <meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true" />
         <!-- see https://github.com/TeamNewPipe/NewPipe/issues/3947 -->
         <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>

From 907106156fa2887e1714a0c8ff25e326e67433c4 Mon Sep 17 00:00:00 2001
From: Mikhail Barashkov <git@mbarashkov.email>
Date: Fri, 1 Jan 2021 23:23:59 +0200
Subject: [PATCH 30/31] When in Fullscreen playback mode, toggle play/pause
 with the hardware Space button.

---
 .../schabi/newpipe/fragments/detail/VideoDetailFragment.java | 2 ++
 .../main/java/org/schabi/newpipe/player/VideoPlayerImpl.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 470de3aa9..aeb51f63a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1891,8 +1891,10 @@ public final class VideoDetailFragment
 
         if (fullscreen) {
             hideSystemUiIfNeeded();
+            viewPager.setVisibility(View.GONE);
         } else {
             showSystemUi();
+            viewPager.setVisibility(View.VISIBLE);
         }
 
         if (relatedStreamsLayout != null) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index 06cbcd780..10887790b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -505,6 +505,11 @@ public class VideoPlayerImpl extends VideoPlayer
         switch (keyCode) {
             default:
                 break;
+            case KeyEvent.KEYCODE_SPACE:
+                if (isFullscreen) {
+                    onPlayPause();
+                }
+                break;
             case KeyEvent.KEYCODE_BACK:
                 if (DeviceUtils.isTv(service) && isControlsVisible()) {
                     hideControls(0, 0);

From 0ff7170ab18cef623a281a3beb1984e6f4bc60e4 Mon Sep 17 00:00:00 2001
From: nadiration <59365236+nadiration@users.noreply.github.com>
Date: Sat, 9 Jan 2021 18:39:43 +0300
Subject: [PATCH 31/31] Update settings_keys.xml

Changed the Somali language name from Af-Soomaali to Soomaali which is common and more user friendly when users are looking for Somali language in the list (since they aren't expecting it starts with A as in Af-Soomaali).
I contributed the language to the project on Weblate and I think this is name is better.
---
 app/src/main/res/values/settings_keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 44e75c10c..e9d951520 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -1145,7 +1145,7 @@
         <item>sardu</item>
         <item>Slovenčina</item>
         <item>Slovenščina</item>
-        <item>Af Soomaali</item>
+        <item>Soomaali</item>
         <item>Shqip</item>
         <item>Српски</item>
         <item>Svenska</item>