Merge branch 'master' into dev

Author: Stypox

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - dev
       - master
+      - release/**
     paths-ignore:
       - 'README.md'
       - 'doc/**'

app/build.gradle

@@ -16,8 +16,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdk 19
         targetSdk 29
-        versionCode 985
-        versionName "0.22.2"
+        versionCode 986
+        versionName "0.23.0"
 
         multiDexEnabled true
 
@@ -190,7 +190,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b77c72fb8826c3ffca0be5f96b066cca0a07b1c9'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:ac1c22d81c65b7b0c5427f4e1989f5256d617f32'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"

app/proguard-rules.pro

@@ -51,3 +51,6 @@
     private void writeObject(java.io.ObjectOutputStream);
     private void readObject(java.io.ObjectInputStream);
 }
+
+# for some reason NotificationModeConfigFragment wasn't kept (only referenced in a preference xml)
+-keep class org.schabi.newpipe.settings.notifications.** { *; }

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -3557,15 +3557,27 @@ private void buildCaptionMenu(@NonNull final List<String> availableLanguages) {
         }
 
         // apply caption language from previous user preference
-        final List<String> selectedPreferredLanguages =
-                trackSelector.getParameters().preferredTextLanguages;
+        final int textRendererIndex = getCaptionRendererIndex();
+        if (textRendererIndex == RENDERER_UNAVAILABLE) {
+            return;
+        }
+
+        // If user prefers to show no caption, then disable the renderer.
+        // Otherwise, DefaultTrackSelector may automatically find an available caption
+        // and display that.
         final String userPreferredLanguage =
                 prefs.getString(context.getString(R.string.caption_user_set_key), null);
-        final int textRendererIndex = getCaptionRendererIndex();
+        if (userPreferredLanguage == null) {
+            trackSelector.setParameters(trackSelector.buildUponParameters()
+                    .setRendererDisabled(textRendererIndex, true));
+            return;
+        }
 
-        if (userPreferredLanguage != null
-                && !selectedPreferredLanguages.contains(userPreferredLanguage)
-                && textRendererIndex != RENDERER_UNAVAILABLE) {
+        // Only set preferred language if it does not match the user preference,
+        // otherwise there might be an infinite cycle at onTextTracksChanged.
+        final List<String> selectedPreferredLanguages =
+                trackSelector.getParameters().preferredTextLanguages;
+        if (!selectedPreferredLanguages.contains(userPreferredLanguage)) {
             trackSelector.setParameters(trackSelector.buildUponParameters()
                     .setPreferredTextLanguages(userPreferredLanguage,
                             PlayerHelper.captionLanguageStemOf(userPreferredLanguage))

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -78,6 +78,20 @@ public final class PlayerHelper {
     private static final NumberFormat SPEED_FORMATTER = new DecimalFormat("0.##x");
     private static final NumberFormat PITCH_FORMATTER = new DecimalFormat("##%");
 
+    /**
+     * Maximum opacity allowed for Android 12 and higher to allow touches on other apps when using
+     * NewPipe's popup player.
+     *
+     * <p>
+     * This value is hardcoded instead of being get dynamically with the method linked of the
+     * constant documentation below, because it is not static and popup player layout parameters
+     * are generated with static methods.
+     * </p>
+     *
+     * @see WindowManager.LayoutParams#FLAG_NOT_TOUCHABLE
+     */
+    private static final float MAXIMUM_OPACITY_ALLOWED_FOR_S_AND_HIGHER = 0.8f;
+
     @Retention(SOURCE)
     @IntDef({AUTOPLAY_TYPE_ALWAYS, AUTOPLAY_TYPE_WIFI,
             AUTOPLAY_TYPE_NEVER})
@@ -412,7 +426,7 @@ public static int getProgressiveLoadIntervalBytes(@NonNull final Context context
                 context.getString(R.string.progressive_load_interval_key),
                 context.getString(R.string.progressive_load_interval_default_value));
 
-        if (context.getString(R.string.progressive_load_interval_default_value)
+        if (context.getString(R.string.progressive_load_interval_exoplayer_default_value)
                 .equals(preferredIntervalBytes)) {
             return ProgressiveMediaSource.DEFAULT_LOADING_CHECK_INTERVAL_BYTES;
         }
@@ -587,6 +601,12 @@ public static WindowManager.LayoutParams buildCloseOverlayLayoutParams() {
                 flags,
                 PixelFormat.TRANSLUCENT);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            // Setting maximum opacity allowed for touch events to other apps for Android 12 and
+            // higher to prevent non interaction when using other apps with the popup player
+            closeOverlayLayoutParams.alpha = MAXIMUM_OPACITY_ALLOWED_FOR_S_AND_HIGHER;
+        }
+
         closeOverlayLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
         closeOverlayLayoutParams.softInputMode =
                 WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.kt

@@ -26,6 +26,10 @@ class NotificationsSettingsFragment : BasePreferenceFragment(), OnSharedPreferen
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.notifications_settings)
+
+        // main check is done in onResume, but also do it here to prevent flickering
+        preferenceScreen.isEnabled =
+            NotificationHelper.areNotificationsEnabledOnDevice(requireContext())
     }
 
     override fun onStart() {
@@ -64,7 +68,7 @@ class NotificationsSettingsFragment : BasePreferenceFragment(), OnSharedPreferen
         // If they are disabled, show a snackbar informing the user about that
         // while allowing them to open the device's app settings.
         val enabled = NotificationHelper.areNotificationsEnabledOnDevice(requireContext())
-        preferenceScreen.isEnabled = enabled
+        preferenceScreen.isEnabled = enabled // it is disabled by default, see the xml
         if (!enabled) {
             if (notificationWarningSnackbar == null) {
                 notificationWarningSnackbar = Snackbar.make(
@@ -85,9 +89,6 @@ class NotificationsSettingsFragment : BasePreferenceFragment(), OnSharedPreferen
                     show()
                 }
             }
-        } else {
-            notificationWarningSnackbar?.dismiss()
-            notificationWarningSnackbar = null
         }
 
         // (Re-)Create loader
@@ -102,6 +103,9 @@ class NotificationsSettingsFragment : BasePreferenceFragment(), OnSharedPreferen
         loader?.dispose()
         loader = null
 
+        notificationWarningSnackbar?.dismiss()
+        notificationWarningSnackbar = null
+
         super.onPause()
     }
 

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

@@ -735,6 +735,32 @@
     <string name="leak_canary_not_available">LeakCanary غير متوفر</string>
     <string name="adjust_by_semitones_checkbox">ضبط الصوت من خلال النغمات الموسيقية النصفية</string>
     <string name="playback_tempo_step">خطوة الإيقاع</string>
-    <string name="progressive_load_interval_default">الافتراضي ExoPlayer</string>
+    <string name="progressive_load_interval_exoplayer_default">الافتراضي ExoPlayer</string>
     <string name="progressive_load_interval_summary">تغيير حجم الفاصل الزمني للتحميل (حاليا %s). قد تؤدي القيمة الأقل إلى تسريع تحميل الفيديو الأولي. تتطلب التغييرات إعادة تشغيل المشغل.</string>
+    <string name="settings_category_player_notification_summary">تكوين إشعار مشغل البث الحالي</string>
+    <string name="notifications">الإشعارات</string>
+    <string name="loading_stream_details">تحميل تفاصيل البث…</string>
+    <string name="notifications_disabled">تم تعطيل الإشعارات</string>
+    <string name="streams_notification_channel_name">بث جديد</string>
+    <string name="settings_category_player_notification_title">إشعار المشغل</string>
+    <string name="you_successfully_subscribed">لقد اشتركت الآن في هذه القناة</string>
+    <string name="streams_notification_channel_description">الإخطارات حول التدفقات الجديدة للاشتراكات</string>
+    <string name="enable_streams_notifications_title">إشعارات أحداث البث الجديدة</string>
+    <string name="enable_streams_notifications_summary">الإخطار بأحداث البث الجديدة من الاشتراكات</string>
+    <string name="check_new_streams">تشغيل التحقق من وجود تدفقات جديدة</string>
+    <string name="streams_notifications_interval_title">معدل البحث</string>
+    <string name="streams_notifications_network_title">مطلوب اتصال الشبكة</string>
+    <string name="any_network">أي شبكة</string>
+    <string name="delete_downloaded_files_confirm">محو جميع الملفات التي تم تنزيلها من القرص؟</string>
+    <string name="get_notified">الحصول على إشعار</string>
+    <string name="enumeration_comma">,</string>
+    <string name="toggle_all">تبديل الكل</string>
+    <plurals name="new_streams">
+        <item quantity="zero">%s دفق جديد</item>
+        <item quantity="one">%s دفق جديد</item>
+        <item quantity="two">%s دفق جديد</item>
+        <item quantity="few">%s دفوق جديدة</item>
+        <item quantity="many">%s دفق جديد</item>
+        <item quantity="other">%s دفق جديد</item>
+    </plurals>
 </resources>

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

@@ -676,5 +676,27 @@
     <string name="adjust_by_semitones_checkbox">以音乐半音调整音高</string>
     <string name="playback_tempo_step">节奏步长</string>
     <string name="progressive_load_interval_summary">改变加载间隔的大小（当前%s），较低的值可以加快初始的视频加载速度，改变需要重启播放器。</string>
-    <string name="progressive_load_interval_default">ExoPlayer 默认</string>
+    <string name="progressive_load_interval_exoplayer_default">ExoPlayer 默认</string>
+    <string name="settings_category_player_notification_summary">配置当前正在播放的串流的通知</string>
+    <string name="enable_streams_notifications_title">新串流通知</string>
+    <string name="streams_notifications_interval_title">检查频率</string>
+    <string name="streams_notifications_network_title">所需的网络连接</string>
+    <string name="notifications_disabled">通知已被禁用</string>
+    <string name="you_successfully_subscribed">你刚刚订阅了此频道</string>
+    <string name="enumeration_comma">，</string>
+    <string name="toggle_all">全选</string>
+    <string name="settings_category_player_notification_title">播放器通知</string>
+    <string name="notifications">通知</string>
+    <string name="streams_notification_channel_name">新的串流</string>
+    <plurals name="new_streams">
+        <item quantity="one">%s 条新串流</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="streams_notification_channel_description">被订阅的新串流的通知</string>
+    <string name="loading_stream_details">正在加载串流详情…</string>
+    <string name="check_new_streams">检查新串流</string>
+    <string name="any_network">任何网络</string>
+    <string name="delete_downloaded_files_confirm">清除所有下载的文件？</string>
+    <string name="get_notified">获取通知</string>
+    <string name="enable_streams_notifications_summary">来自订阅的新串流的通知</string>
 </resources>

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

@@ -189,7 +189,7 @@
     <string name="search_no_results">কোন রেজাল্ট নেই</string>
     <string name="invalid_directory">কোন ফোল্ডার নেই</string>
     <string name="download_to_sdcard_error_title">বাহ্যিক স্টোরেজ নেই</string>
-    <string name="search_history_deleted">সার্চ ইতিহাস ডিলিট হয়েছে।</string>
+    <string name="search_history_deleted">সার্চ ইতিহাস মোছা হয়েছে</string>
     <string name="name">নাম</string>
     <string name="rename_playlist">নাম পরিবর্তন</string>
     <string name="action_history">ইতিহাস</string>
@@ -198,7 +198,7 @@
     <string name="create">তৈরি করুন</string>
     <string name="retry">পুনরায় চেষ্টা করুন</string>
     <string name="help">সাহায্য</string>
-    <string name="watch_history_deleted">দেখার ইতিহাস মুছে গেছে।</string>
+    <string name="watch_history_deleted">দেখার ইতিহাস মুছে গেছে</string>
     <string name="delete_view_history_alert">সম্পূর্ণ দেখার ইতিহাস মুছে ফেলুন\?</string>
     <string name="clear_views_history_title">দেখার ইতিহাস মুছে ফেলুন</string>
     <string name="export_data_title">ডাটা বেস এক্সপোর্ট করুন</string>
@@ -269,14 +269,14 @@
     <string name="enable_playback_state_lists_title">তালিকা তে পজিশন</string>
     <string name="enable_playback_resume_summary">শেষ প্লে ব্যাক পজিশন এ যান</string>
     <string name="enable_search_history_summary">সার্চ গুলি স্থানীয় ভাবে জমা করুন</string>
-    <string name="show_search_suggestions_summary">সার্চ এর সময় সাজেশন দেখান</string>
+    <string name="show_search_suggestions_summary">সার্চ এর সময় সাজেশন পছন্দ করুন</string>
     <string name="show_search_suggestions_title">সার্চ সাজেশন</string>
     <string name="feed_notification_loading">ফিড লোড হচ্ছে…</string>
     <string name="show_error">এরর দেখান</string>
     <string name="select_a_playlist">একটি প্লে লিস্ট পছন্দ করুন</string>
     <string name="tab_about">সম্পর্কিত</string>
     <string name="title_licenses">থার্ড-পার্টি লাইসেন্স সমূহ</string>
-    <string name="error_report_open_issue_button_text">গিটহাব এ এরর রিপোর্ট করুন</string>
+    <string name="error_report_open_issue_button_text">গিটহাব এ রিপোর্ট করুন</string>
     <string name="restore_defaults">ডিফল্ট এ ফিরে যান</string>
     <string name="search_showing_result_for">রেজাল্ট দেখান হচ্ছেঃ %s</string>
     <string name="clear_queue_confirmation_title">কিউ মোছার আগে নিশ্চিত করুন</string>
@@ -292,4 +292,12 @@
     <string name="show_meta_info_title">মেটা ইনফো দেখান</string>
     <string name="show_description_title">বিবরণ দেখান</string>
     <string name="night_theme_title">রাত্রি থিম</string>
+    <string name="notification_action_2_title">তৃতীয় অ্যাকশান বোতাম</string>
+    <string name="notification_action_3_title">চতুর্থ অ্যাকশান বোতাম</string>
+    <string name="clear_queue_confirmation_description">সক্রিয় প্লেয়ার ক্রম পরিবর্তিত হয়ে যাবে</string>
+    <string name="local_search_suggestions">স্থানীয় সার্চ সাজেশন</string>
+    <string name="notification_action_4_title">পঞ্চম অ্যাকশান বোতাম</string>
+    <string name="notification_action_0_title">প্রথম অ্যাকশান বোতাম</string>
+    <string name="notification_action_1_title">দ্বিতীয় অ্যাকশান বোতাম</string>
+    <string name="streams_notification_channel_name">নতুন স্ট্রিম</string>
 </resources>

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

@@ -700,5 +700,5 @@
     <string name="leak_canary_not_available">LeakCanary není dostupné</string>
     <string name="adjust_by_semitones_checkbox">Upravit výšku tónů po půltónech</string>
     <string name="playback_tempo_step">Krok tempa</string>
-    <string name="progressive_load_interval_default">Výchozí ExoPlayer</string>
+    <string name="progressive_load_interval_exoplayer_default">Výchozí ExoPlayer</string>
 </resources>