Merge branch 'dev'

README.md

@@ -1,7 +1,7 @@
 <p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
 <h4 align="center">A libre lightweight streaming frontend for Android.</h4>
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipelegacy/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p>
 
 <p align="center">
 <a href="https://github.com/TeamNewPipe/NewPipe-legacy" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe-legacy.svg" ></a>

app/build.gradle

@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe Legacy"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 100
-        versionName "0.20.1"
+        versionCode 110
+        versionName "0.20.2"
 
         multiDexEnabled true
 
@@ -86,7 +86,7 @@ android {
 
 ext {
     icepickVersion = '3.2.0'
-    checkstyleVersion = '8.32'
+    checkstyleVersion = '8.36.2'
     stethoVersion = '1.5.1'
     leakCanaryVersion = '2.2'
     exoPlayerVersion = '2.11.8'
@@ -171,7 +171,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:350eed6214b93255d788dfa208b1e9a5e5da91e6'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:62912ee8349f5d26617c039f337297628ff52ead'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"

app/src/main/java/org/schabi/newpipelegacy/RouterActivity.java

@@ -8,7 +8,6 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -27,7 +26,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.app.NotificationCompat;
+import androidx.core.widget.TextViewCompat;
 import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipelegacy.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
@@ -45,8 +46,8 @@
 import org.schabi.newpipelegacy.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipelegacy.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipelegacy.report.UserAction;
-import org.schabi.newpipelegacy.util.DeviceUtils;
 import org.schabi.newpipelegacy.util.Constants;
+import org.schabi.newpipelegacy.util.DeviceUtils;
 import org.schabi.newpipelegacy.util.ExtractorHelper;
 import org.schabi.newpipelegacy.util.ListHelper;
 import org.schabi.newpipelegacy.util.NavigationHelper;
@@ -326,7 +327,7 @@ private void showDialog(final List<AdapterChoiceItem> choices) {
             final RadioButton radioButton
                     = (RadioButton) inflater.inflate(R.layout.list_radio_icon_item, null);
             radioButton.setText(item.description);
-            radioButton.setCompoundDrawablesWithIntrinsicBounds(
+            TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
                     AppCompatResources.getDrawable(getApplicationContext(), item.icon),
                     null, null, null);
             radioButton.setChecked(false);

app/src/main/java/org/schabi/newpipelegacy/fragments/detail/VideoDetailFragment.java

@@ -1641,8 +1641,8 @@ protected boolean onError(final Throwable exception) {
             return true;
         }
 
-        final int errorId = exception instanceof YoutubeStreamExtractor.DecryptException
-                ? R.string.youtube_signature_decryption_error
+        final int errorId = exception instanceof YoutubeStreamExtractor.DeobfuscateException
+                ? R.string.youtube_signature_deobfuscation_error
                 : exception instanceof ExtractionException
                 ? R.string.parsing_error
                 : R.string.general_error;

app/src/main/java/org/schabi/newpipelegacy/settings/NotificationSettingsFragment.java

@@ -2,9 +2,7 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
@@ -23,6 +21,8 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
 import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipelegacy.R;
@@ -237,17 +237,14 @@ void openActionChooserDialog() {
 
                 // if present set action icon with correct color
                 if (NotificationConstants.ACTION_ICONS[action] != 0) {
-                    final Drawable drawable = AppCompatResources.getDrawable(requireContext(),
+                    Drawable drawable = AppCompatResources.getDrawable(requireContext(),
                             NotificationConstants.ACTION_ICONS[action]);
                     if (drawable != null) {
                         final int color = ThemeHelper.resolveColorFromAttr(requireContext(),
                                 android.R.attr.textColorPrimary);
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                            drawable.setTint(color);
-                        } else {
-                            drawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-                        }
-                        radioButton.setCompoundDrawablesWithIntrinsicBounds(
+                        drawable = DrawableCompat.wrap(drawable).mutate();
+                        DrawableCompat.setTint(drawable, color);
+                        TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(radioButton,
                                 null, null, drawable, null);
                     }
                 }

app/src/main/java/org/schabi/newpipelegacy/util/ExtractorHelper.java

@@ -293,8 +293,8 @@ public static void handleGeneralException(final Context context, final int servi
             } else if (exception instanceof ContentNotSupportedException) {
                 Toast.makeText(context, R.string.content_not_supported, Toast.LENGTH_LONG).show();
             } else {
-                final int errorId = exception instanceof YoutubeStreamExtractor.DecryptException
-                        ? R.string.youtube_signature_decryption_error
+                final int errorId = exception instanceof YoutubeStreamExtractor.DeobfuscateException
+                        ? R.string.youtube_signature_deobfuscation_error
                         : exception instanceof ParsingException
                         ? R.string.parsing_error : R.string.general_error;
                 ErrorActivity.reportError(handler, context, exception, MainActivity.class, null,

app/src/main/res/values-ar/strings.xml

@@ -54,7 +54,7 @@
     <string name="could_not_load_thumbnails">تعذرت عملية تحميل كافة صور المعاينة</string>
     <string name="general_error">خطأ</string>
     <string name="parsing_error">تعذرت عملية تحليل الموقع</string>
-    <string name="youtube_signature_decryption_error">تعذر فك تشفير توقيع رابط الفيديو</string>
+    <string name="youtube_signature_deobfuscation_error">تعذر فك تشفير توقيع رابط الفيديو</string>
     <string name="main_bg_subtitle">اضغط على \"بحث\" للبدء
 \n</string>
     <string name="subscribe_button_title">اشتراك</string>

app/src/main/res/values-b+ast/strings.xml

@@ -26,7 +26,7 @@
     <string name="duration_live">En direuto</string>
     <string name="general_error">Fallu</string>
     <string name="could_not_load_thumbnails">Nun pudieron cargase toles miniatures</string>
-    <string name="youtube_signature_decryption_error">Nun pudo descifrase la robla de la URL del videu</string>
+    <string name="youtube_signature_deobfuscation_error">Nun pudo descifrase la robla de la URL del videu</string>
     <string name="parsing_error">Nun pudo analizase\'l sitiu web</string>
     <string name="live_streams_not_supported">Entá nun se sofiten los fluxos en direuto</string>
     <string name="could_not_get_stream">Nun pudo consiguise dengún fluxu</string>

app/src/main/res/values-b+zh+HANS+CN/strings.xml

@@ -175,7 +175,7 @@
     <string name="error_report_title">错误报告</string>
     <string name="general_error">错误</string>
     <string name="could_not_load_thumbnails">无法加载所有缩略图</string>
-    <string name="youtube_signature_decryption_error">无法解密视频的 URL 签名</string>
+    <string name="youtube_signature_deobfuscation_error">无法解密视频的 URL 签名</string>
     <string name="parsing_error">无法解析网址</string>
     <string name="light_parsing_error">无法完全解析网址</string>
     <string name="content_not_available">内容不可用</string>

app/src/main/res/values-be/strings.xml

@@ -147,7 +147,7 @@
     <string name="general_error">Памылка</string>
     <string name="network_error">Памылка сеткі</string>
     <string name="could_not_load_thumbnails">Не атрымалася загрузіць усе мініяцюры</string>
-    <string name="youtube_signature_decryption_error">Не атрымалася расшыфраваць подпіс URL у відэа</string>
+    <string name="youtube_signature_deobfuscation_error">Не атрымалася расшыфраваць подпіс URL у відэа</string>
     <string name="parsing_error">Не атрымалася разабраць вэб-сайт</string>
     <string name="light_parsing_error">Не атрымалася цалкам разабраць вэб-сайт</string>
     <string name="content_not_available">Кантэнт недаступны</string>

app/src/main/res/values-bg/strings.xml

@@ -217,7 +217,7 @@
     <string name="clear_search_history_summary">Изтрива историята с въвежданите за търсене ключови думи</string>
     <string name="delete_search_history_alert">Изтрий цялата история на търсенията\?</string>
     <string name="search_history_deleted">Историята на търсенията е изтрита.</string>
-    <string name="youtube_signature_decryption_error">URL подписът на клипа не можа да бъде дешифрован</string>
+    <string name="youtube_signature_deobfuscation_error">URL подписът на клипа не можа да бъде дешифрован</string>
     <string name="external_player_unsupported_link_type">Външните плейъри не поддържат този вид линкове</string>
     <string name="invalid_url_toast">Невалиден URL</string>
     <string name="invalid_directory">Невалидна директория</string>

app/src/main/res/values-bn-rBD/strings.xml

@@ -74,7 +74,7 @@
     <string name="general_error">ত্রুটি</string>
     <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
     <string name="could_not_load_thumbnails">সব থাম্বনেইল লোড করা যায়নি</string>
-    <string name="youtube_signature_decryption_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
+    <string name="youtube_signature_deobfuscation_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
     <string name="parsing_error">ওয়েবসাইট বিশ্লেষন করা যায়নি</string>
     <string name="light_parsing_error">ওয়েবসাইট সম্পুর্নভাবে বিশ্লেষন করা যায়নি</string>
     <string name="content_not_available">কন্টেন্ট উপলব্ধ নয়</string>

app/src/main/res/values-bn-rIN/strings.xml

@@ -61,7 +61,7 @@
     <string name="content_not_available">কন্টেন্ট উপলব্ধ নয়</string>
     <string name="light_parsing_error">ওয়েবসাইট সম্পুর্নভাবে বিশ্লেষন করা যায়নি</string>
     <string name="parsing_error">ওয়েবসাইট বিশ্লেষন করা যায়নি</string>
-    <string name="youtube_signature_decryption_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
+    <string name="youtube_signature_deobfuscation_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
     <string name="could_not_load_thumbnails">সব থাম্বনেইল লোড করা যায়নি</string>
     <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
     <string name="general_error">ত্রুটি</string>

app/src/main/res/values-bn/strings.xml

@@ -176,7 +176,7 @@
     <string name="content_not_available">কন্টেন্ট উপলব্ধ নয়</string>
     <string name="light_parsing_error">ওয়েবসাইট সম্পুর্নভাবে বিশ্লেষন করা যায়নি</string>
     <string name="parsing_error">ওয়েবসাইট বিশ্লেষন করা যায়নি</string>
-    <string name="youtube_signature_decryption_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
+    <string name="youtube_signature_deobfuscation_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
     <string name="could_not_load_thumbnails">সব থাম্বনেইল লোড করা যায়নি</string>
     <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
     <string name="download_to_sdcard_error_title">বাহ্যিক স্টোরেজ নেই</string>

app/src/main/res/values-ca/strings.xml

@@ -167,7 +167,7 @@
     <string name="notification_channel_name">Notificació del NewPipe</string>
     <string name="notification_channel_description">Notificacions dels reproductors en rerefons o emergents del NewPipe</string>
     <string name="could_not_load_thumbnails">No s\'han pogut carregar totes les miniatures</string>
-    <string name="youtube_signature_decryption_error">No s\'ha pogut desxifrar la signatura de l\'URL del vídeo</string>
+    <string name="youtube_signature_deobfuscation_error">No s\'ha pogut desxifrar la signatura de l\'URL del vídeo</string>
     <string name="parsing_error">No s\'ha pogut processar el lloc web</string>
     <string name="light_parsing_error">No s\'ha pogut processar del tot el lloc web</string>
     <string name="content_not_available">Contingut no disponible</string>

app/src/main/res/values-ckb/strings.xml

@@ -449,7 +449,7 @@
     <string name="invalid_directory">هەمان فۆڵدەر بوونی نییە</string>
     <string name="bookmark_playlist">دڵخوازکردنی لیستی کارپێکردن</string>
     <string name="file_name_empty_error">ناوی پەڕگە ناکرێ بەتاڵ بێت</string>
-    <string name="youtube_signature_decryption_error">ناتوانرێ واژووی بەستەری ڤیدیۆ بخوێنرێتەوە</string>
+    <string name="youtube_signature_deobfuscation_error">ناتوانرێ واژووی بەستەری ڤیدیۆ بخوێنرێتەوە</string>
     <string name="updates_setting_description">پیشاندانی ئاگانامەیەک بۆ ئامادەبوونی داوانامە لەکاتی بەردەست بوونی وەشانی نوێ</string>
     <string name="tab_contributors">بەشداربووەکان</string>
     <string name="enable_watch_history_title">مێژووی تەماشاکردن</string>

app/src/main/res/values-cs/strings.xml

@@ -43,7 +43,7 @@
     <string name="general_error">Chyba</string>
     <string name="network_error">Chyba sítě</string>
     <string name="could_not_load_thumbnails">Nebylo možné nahrát všechny náhledy</string>
-    <string name="youtube_signature_decryption_error">Nebylo možné dekódovat URL videa</string>
+    <string name="youtube_signature_deobfuscation_error">Nebylo možné dekódovat URL videa</string>
     <string name="parsing_error">Nebylo možné analyzovat stránku</string>
     <string name="content_not_available">Obsah není k dispozici</string>
     <string name="list_thumbnail_view_description">Náhled videa</string>

app/src/main/res/values-da/strings.xml

@@ -164,7 +164,7 @@
     <string name="download_to_sdcard_error_message">Download til eksternt SD-kort er endnu ikke muligt. Nulstil placering af download-mappe\?</string>
     <string name="network_error">Netværksfejl</string>
     <string name="could_not_load_thumbnails">Kunne ikke indlæse alle miniaturebilleder</string>
-    <string name="youtube_signature_decryption_error">Kunne ikke dekryptere URL-signatur for video</string>
+    <string name="youtube_signature_deobfuscation_error">Kunne ikke dekryptere URL-signatur for video</string>
     <string name="parsing_error">Kunne ikke analysere websted</string>
     <string name="light_parsing_error">Kunne ikke analysere webstedet fuldstændig</string>
     <string name="content_not_available">Indhold ikke tilgængeligt</string>

app/src/main/res/values-de/strings.xml

@@ -52,7 +52,7 @@
     <string name="info_dir_created">Downloadverzeichnis „%1$s“ erstellt</string>
     <string name="general_error">Fehler</string>
     <string name="could_not_load_thumbnails">Konnte nicht alle Vorschaubilder laden</string>
-    <string name="youtube_signature_decryption_error">Konnte Video-URL-Signatur nicht entschlüsseln</string>
+    <string name="youtube_signature_deobfuscation_error">Konnte Video-URL-Signatur nicht entschlüsseln</string>
     <string name="parsing_error">Konnte Webseite nicht analysieren</string>
     <string name="content_not_available">Inhalt nicht verfügbar</string>
     <string name="content">Inhalt</string>

app/src/main/res/values-el/strings.xml

@@ -177,7 +177,7 @@
     <string name="delete_search_history_alert">Διαγραφή ολόκληρου του ιστορικού αναζητήσεων;</string>
     <string name="search_history_deleted">Το ιστορικό αναζητήσεων διαγράφηκε.</string>
     <string name="could_not_load_thumbnails">Δεν ήταν δυνατή η φόρτωση όλων των εικονιδίων</string>
-    <string name="youtube_signature_decryption_error">Δεν ήταν δυνατή η αποκρυπτογράφηση της υπογραφής του URL του βίντεο</string>
+    <string name="youtube_signature_deobfuscation_error">Δεν ήταν δυνατή η αποκρυπτογράφηση της υπογραφής του URL του βίντεο</string>
     <string name="parsing_error">Δεν ήταν δυνατή η ανάλυση του ιστοτόπου</string>
     <string name="light_parsing_error">Δεν ήταν δυνατή η ανάλυση ολόκληρου του ιστοτόπου</string>
     <string name="content_not_available">Το περιεχόμενο δεν είναι διαθέσιμο</string>

app/src/main/res/values-eo/strings.xml

@@ -40,7 +40,7 @@
     <string name="kore_not_found">Ĉu instali la mankan aplikaĵon Kore\?</string>
     <string name="show_next_and_similar_title">Montri la sekvan filmeton kaj similajn filmetojn</string>
     <string name="could_not_load_thumbnails">Ĉiuj bildetoj ne ŝargeblas</string>
-    <string name="youtube_signature_decryption_error">La subskribo de la ligilo de la filmeto ne malĉifreblas</string>
+    <string name="youtube_signature_deobfuscation_error">La subskribo de la ligilo de la filmeto ne malĉifreblas</string>
     <string name="parsing_error">La retejo ne analizeblas</string>
     <string name="list_thumbnail_view_description">Bildeto de la antaŭrigardo de la filmeto</string>
     <string name="detail_thumbnail_view_description">Ludi filmeton, daŭro:</string>