From 085f0266acfd133d9ea920880b722ef7b5b098b9 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sat, 11 Jul 2020 20:51:57 +0200 Subject: [PATCH 01/10] Fix Linter (translations) --- app/src/main/res/values-b+zh+HANS+CN/strings.xml | 2 +- app/src/main/res/values-ckb/strings.xml | 4 ++-- app/src/main/res/values-ku/strings.xml | 2 +- app/src/main/res/values-ml/strings.xml | 4 ++-- app/src/main/res/values-ne/strings.xml | 6 +++--- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml index eef8ae3e4..ee5989f10 100644 --- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml +++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml @@ -535,7 +535,7 @@ %d秒 - 由于ExoPlayer的限制，搜寻间隔设置为％d秒 + 由于ExoPlayer的限制，搜寻间隔设置为%d秒 静音 取消静音 帮助 diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 2a386c262..19cd376b0 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -513,7 +513,7 @@ هاوبه‌شپێكردن بوخچەی داگرتن بگۆڕە بۆ ئەنجامدانی کاریگەری پیشاندانی ڕێنمایی کاتێ لە پاشبنەما یاخوود پەنجەرەی بچووکدا گرتە دەکرێ لەسەر” وردەکاری:” ڤیدیۆیەک - %1$ لە داگرتنەکان سڕانەوە + %1$s لە داگرتنەکان سڕانەوە پەخشی هیچ دەنگێک نەدۆزرایەوە هونەرمەندەکان هیچ کەسێک تەماشای ناکات @@ -613,4 +613,4 @@ پیت و ژمارەکان وڵاتی بنەڕەتی نوێکارییەکان - \ No newline at end of file + diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml index cf04b9732..19cbb3201 100644 --- a/app/src/main/res/values-ku/strings.xml +++ b/app/src/main/res/values-ku/strings.xml @@ -534,7 +534,7 @@ کاتێ کارپێکەری پاشبنەما کاردەکات ئەوا وێنۆچکەی ڤیدیۆکە لە ڕوونما داخراوەکەدا نیشاندەدرێت سڕینەوەی مێژووی داگرتن سڕینەوەی فایلە داگیراوەکان - %1$ لە داگرتنەکان سڕانەوە + %1$s لە داگرتنەکان سڕانەوە دەسەڵاتی پێبدە بۆ پیشاندان لەسەرووی ئەپەکانیترەوە زمانی ئەپ بنەڕەتی سیستەم diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 7f95a81cf..a329d53a5 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -574,7 +574,7 @@ ഡൗൺലോഡ് റദ്ദാക്കുന്നതിനുമുമ്പ് പരമാവധി ശ്രമങ്ങൾ പരമാവധി വീണ്ടും ശ്രമിക്കുന്നു നിർത്തുക - 1$s ഡൗൺ‌ലോഡുകൾ ഇല്ലാതാക്കി + %1$s ഡൗൺ‌ലോഡുകൾ ഇല്ലാതാക്കി ഡൗൺലോഡ് ചെയ്ത ഫയലുകൾ ഇല്ലാതാക്കുക നിങ്ങളുടെ ഡൗൺലോഡ് ചരിത്രം മായ്‌ക്കണോ ഡൗൺലോഡ് ചെയ്ത എല്ലാ ഫയലുകളും ഇല്ലാതാക്കണോ\? ഡൗൺലോഡ് ചരിത്രം മായ്‌ക്കുക @@ -606,7 +606,7 @@ ഡൗൺലോഡ് പൂർത്തിയായി ഡൗൺലോഡ് പരാജയപ്പെട്ടു സിസ്റ്റം പ്രവർത്തനം തടഞ്ഞു - % മുഖാന്തരം + %s മുഖാന്തരം %s സൃഷ്ടിച്ചത് ചാനൽ ലഘുചിത്രം സേവനങ്ങളിൽ നിന്നുള്ള യഥാർത്ഥ വാചകങ്ങൾ സ്ട്രീം ഇനങ്ങളിൽ ദൃശ്യമാകും diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index f32c330dc..342e395a1 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -190,7 +190,7 @@ यस्तो कुनै फाइल / सामग्री स्रोत भेटिएन फाइल अवस्थित छैन वा पढ्न वा यो लेख्न अनुमति अभाव छ फाइलको नाम खाली हुन सक्दैन - एउटा त्रुटि देखापर्यो:%1$ + एउटा त्रुटि देखापर्यो:%s कुनै धाराहरु डाउनलोड गर्न उपलब्ध छैनन् बचत गरिएका ट्याबहरू पढ्न सकिएन, पूर्वनिर्धारित प्रयोग गरिदै फेरी पहिलाकै अवस्थामा लैजाऊ @@ -276,7 +276,7 @@ सेटिङहरू बारेमा तेस्रो-पक्ष इजाजत पत्र - ©%1$ को %2$s द्वारा %3$ अन्तर्गत + ©%1$s को %2$s द्वारा %3$s अन्तर्गत लाइसेन्स लोड गर्न सकेन वेबसाइट खुला बारेमा @@ -528,7 +528,7 @@ पृष्ठभूमिमा प्लेयर प्रयोग गर्दा एउटा भिडियो थम्बनेल लक स्क्रिनमा देखाइएको छ डाउनलोड इतिहास मेटाउ डाउनलोड गरिएका फाइलहरु मेटाउ - %1$ डाउनलोडहरु मेटियो + %1$s डाउनलोडहरु मेटियो अन्य अनुप्रयोगहरूमा प्रदर्शन गर्न अनुमति दिने एप्सको भाषा सिस्टम पूर्वनिर्धारित diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 57bf49544..e23d866c1 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -569,7 +569,7 @@ %d dní Skupiny kanálov - Aktualizované: % s + Aktualizované: %s Nenačítané: %d Načítavanie zdroja… Spracovávanie zdroja… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39e345929..32d58967c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -352,7 +352,7 @@ Settings About Third-party Licenses - © %1$s by %2$s under %3$s + © %1$s by %2$s under %3$s Could not load license Open website About From c2a012553df7ae38b809b997c1f43a1504b90387 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sat, 11 Jul 2020 21:46:27 +0200 Subject: [PATCH 02/10] Use %1$d instead of %1$s in deleted_downloads string We don't pass a String, but an Integer --- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-b+zh+HANS+CN/strings.xml | 2 +- app/src/main/res/values-ckb/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-ku/strings.xml | 2 +- app/src/main/res/values-ml/strings.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-ne/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sq/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-ur/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3d03e88fd..2d007a043 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -549,7 +549,7 @@ عند استخدام مشغل الخلفية، سيتم عرض صورة العرض للفيديو على شاشة القفل تنظيف تاريخ التحميل حذف الملفات التي تم تنزيلها - التنزيلات %1$s المحذوفة + التنزيلات %1$d المحذوفة إعطاء إذن لعرضه على التطبيقات الأخرى لغة التطبيق النظام الافتراضي diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml index ee5989f10..575af6f16 100644 --- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml +++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml @@ -525,7 +525,7 @@ 在后台播放时，锁屏上将会显示视频的缩略图 清除下载历史记录 删除已下载的文件 - 已删除 %1$s 下载 + 已删除 %1$d 下载 授予在其他应用上层显示的权限 Newpipe应用语言 ［系统默认］ diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 19cd376b0..c913207cc 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -513,7 +513,7 @@ هاوبه‌شپێكردن بوخچەی داگرتن بگۆڕە بۆ ئەنجامدانی کاریگەری پیشاندانی ڕێنمایی کاتێ لە پاشبنەما یاخوود پەنجەرەی بچووکدا گرتە دەکرێ لەسەر” وردەکاری:” ڤیدیۆیەک - %1$s لە داگرتنەکان سڕانەوە + %1$d لە داگرتنەکان سڕانەوە پەخشی هیچ دەنگێک نەدۆزرایەوە هونەرمەندەکان هیچ کەسێک تەماشای ناکات diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 73229693f..f18da7ba0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -538,7 +538,7 @@ otevření ve vyskakovacím okně Při použití přehrávače na pozadí se náhled videa ukáže na zamknuté obrazovce Smazat historii stahování Smazat stažené soubory - Smazat %1$s stahování + Smazat %1$d stahování Souhlasit se zobrazením přes jiné aplikace Jazyk aplikace Jazyk systému diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bcd03a7ab..20c4e3286 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -532,7 +532,7 @@ Ein Video-Miniaturbild wird auf dem Sperrbildschirm angezeigt, wenn der Hintergrundplayer verwendet wird Downloadverlauf löschen Heruntergeladene Dateien löschen - %1$s Downloads gelöscht + %1$d Downloads gelöscht Berechtigung zur Anzeige über andere Apps erteilen Sprache der App Systemstandard diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index ae12c577b..f219ee2e8 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -530,7 +530,7 @@ Bildeta filmeto estas montrita ĉe ŝlosita ekrano uzante la fona ludilo Forviŝi la historion de elŝutoj Forviŝi elŝutitajn dosierojn - %1$s elŝutoj forviŝitaj + %1$d elŝutoj forviŝitaj Filmetoj Doni la permeson por afiŝiĝi supre aliaj apoj Preferata aplingvo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 54ab846ee..cbff74f70 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -531,7 +531,7 @@ Se mostrará una miniatura del vídeo en la pantalla de bloqueo al usar el reproductor en segundo plano Limpiar historial de descargas Eliminar archivos descargados - Eliminadas %1$s descargas + Eliminadas %1$d descargas Dar permisos para que se muestre por sobre otras apps Idioma de aplicación Predeterminado del sistema diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 635e89d95..db02eaedc 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -530,7 +530,7 @@ Atzeko planoko bideo erreproduzitzailea erabiltzen den bitartean, bideoaren karatula blokeo pantailan erakutsiko da Garbitu deskargen historiala Ezabatu deskargatutako fitxategiak - %1$s deskarga ezabatuta + %1$d deskarga ezabatuta Baimena eman beste aplikazioen gainetik erakusteko Aplikazioaren hizkuntza Sistemaren lehenetsia diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d50201efe..8f40e68ff 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -549,7 +549,7 @@ پیش‌فرض دستگاه زبان برنامه نمونه‌ای را انتخاب کنید - تعداد %1$s بارگیری، پاک شد + تعداد %1$d بارگیری، پاک شد پاک کردن پرونده‌های بارگیری شده پاک کردن تاریخچه بارگیری ناتوانی در بازیابی این بارگیری diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index d3eb5f022..b3b4baca9 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -563,7 +563,7 @@ Rajoita latausjonon kokoa Suurin määrä yrityksiä ennen kuin lataus perutaan Uudelleenyritysten maksimimäärä - Poistettiin %1$s latausta + Poistettiin %1$d latausta Tätä latausta ei voi palauttaa Yhteys aikakatkaistiin Eteneminen menetettiin, koska tiedosto poistettiin diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7fa769ffc..0d14f1390 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -529,7 +529,7 @@ Une miniature de la vidéo sera affichée sur l’écran de verrouillage lorsque le lecteur en arrière-plan est utilisé Effacer l’historique de téléchargement Supprimer les fichiers téléchargés - %1$s téléchargements supprimés + %1$d téléchargements supprimés Autoriser l’affichage au-dessus d’autres applications Langue de l’application Prédéfini par le système diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index b9e4a3329..0ac642b19 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -540,7 +540,7 @@ תמונה מוקטנת של הסרטון תופיע על מסך הנעילה בעת שימוש בנגן הרקע מחיקת היסטוריית ההורדות למחוק את הקבצים שהורדתי - נמחקו %1$s הורדות + נמחקו %1$d הורדות יש להעניק הרשאה להציג על גבי יישומונים אחרים שפת היישומון בררת המחדל של המערכת diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 3181c6ea5..4512e265b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -496,7 +496,7 @@ Automatski generirano (nije pronađen nijedan autor) Očisti povijest preuzimanja Izbriši preuzete datoteke - Obrisano %1$s preuzimanja + Obrisano %1$d preuzimanja Dajte dopuštenje za prikazivanje na vrhu Jezik aplikacije Zadani sustav diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a18a2b93f..cc976ecff 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -524,7 +524,7 @@ Kiosk Default Hapus riwayat unduhan Hapus berkas yang diunduh - %1$s unduhan dihapus + %1$d unduhan dihapus Izinkan untuk ditampilkan di atas aplikasi lain Bahasa apl Default sistem diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 06348d427..0b2b3b44b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -530,7 +530,7 @@ La copertina del video verrà mostrata nella schermata di blocco, durante la riproduzione in sottofondo Pulisci Cronologia Download Elimina File Scaricati - %1$s download eliminati + %1$d download eliminati Consentire la visualizzazione sopra altre applicazioni Lingua Applicazione Predefinita di Sistema diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 02ffdb3e2..f66930a0c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -524,7 +524,7 @@ バックグラウンドプレイヤーを使用中、ロック画面に動画のサムネイルが表示されるようになります ダウンロード履歴を消去 ダウンロードしたファイルを消去 - %1$s 個削除しました + %1$d 個削除しました 自動生成 (アップローダーが見つかりません) 他のアプリの上に表示する権限を与えてください アプリの言語 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 849b5aaf2..78550ca5e 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -526,5 +526,5 @@ 백그라운드 플레이어를 사용하는 경우 비디오 썸네일은 잠금화면 상에 표시됩니다. 다운로드 기록 삭제 다운로드된 파일 삭제 - %1$s 다운로드 삭제 + %1$d 다운로드 삭제 \ No newline at end of file diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml index 19cbb3201..47c46cc49 100644 --- a/app/src/main/res/values-ku/strings.xml +++ b/app/src/main/res/values-ku/strings.xml @@ -534,7 +534,7 @@ کاتێ کارپێکەری پاشبنەما کاردەکات ئەوا وێنۆچکەی ڤیدیۆکە لە ڕوونما داخراوەکەدا نیشاندەدرێت سڕینەوەی مێژووی داگرتن سڕینەوەی فایلە داگیراوەکان - %1$s لە داگرتنەکان سڕانەوە + %1$d لە داگرتنەکان سڕانەوە دەسەڵاتی پێبدە بۆ پیشاندان لەسەرووی ئەپەکانیترەوە زمانی ئەپ بنەڕەتی سیستەم diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index a329d53a5..bc27edaa4 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -574,7 +574,7 @@ ഡൗൺലോഡ് റദ്ദാക്കുന്നതിനുമുമ്പ് പരമാവധി ശ്രമങ്ങൾ പരമാവധി വീണ്ടും ശ്രമിക്കുന്നു നിർത്തുക - %1$s ഡൗൺ‌ലോഡുകൾ ഇല്ലാതാക്കി + %1$d ഡൗൺ‌ലോഡുകൾ ഇല്ലാതാക്കി ഡൗൺലോഡ് ചെയ്ത ഫയലുകൾ ഇല്ലാതാക്കുക നിങ്ങളുടെ ഡൗൺലോഡ് ചരിത്രം മായ്‌ക്കണോ ഡൗൺലോഡ് ചെയ്ത എല്ലാ ഫയലുകളും ഇല്ലാതാക്കണോ\? ഡൗൺലോഡ് ചരിത്രം മായ്‌ക്കുക diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index a18f9121f..6adb1c9f8 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -516,7 +516,7 @@ Velg en instans Tøm nedlastingshistorikk Slett nedlastede filer - Slettet %1$s nedlastninger + Slettet %1$d nedlastninger Aktiver videominiatyrbilde på låseskjerm Når du bruker bakgrunnsspilleren, vises ent videominiatyrbilde på låseskjermen Velg dine favoritter blandt PeerTube-instansene diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 342e395a1..aac2a27ae 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -528,7 +528,7 @@ पृष्ठभूमिमा प्लेयर प्रयोग गर्दा एउटा भिडियो थम्बनेल लक स्क्रिनमा देखाइएको छ डाउनलोड इतिहास मेटाउ डाउनलोड गरिएका फाइलहरु मेटाउ - %1$s डाउनलोडहरु मेटियो + %1$d डाउनलोडहरु मेटियो अन्य अनुप्रयोगहरूमा प्रदर्शन गर्न अनुमति दिने एप्सको भाषा सिस्टम पूर्वनिर्धारित diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5ae419eee..ca4539a60 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -527,7 +527,7 @@ Een video afbeelding wordt weergegeven op het vergrendelscherm wanneer de achtergrond speler wordt gebruikt Download geschiedenis verwijderen Verwijder gedownloade bestanden - %1$s downloads verwijderd + %1$d downloads verwijderd Geef toestemming voor weergave over andere apps Applicatie taal Systeem taal gebruiken diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ca9e63624..deef7afbd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -535,7 +535,7 @@ Podczas korzystania z odtwarzacza w tle na ekranie blokady wyświetlana jest miniatura filmu Wyczyść historię pobierania Usuń pobrane pliki - Usunięte %1$s pobrania + Usunięte %1$d pobrania Zezwól na wyświetlanie w innych aplikacjach Język aplikacji Domyślny systemu diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 5368c29d9..a0a62ca91 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -530,7 +530,7 @@ A capa do vídeo é exibida na tela de bloqueio ao usar o player em segundo plano Limpar histórico de downloads Excluir arquivos baixados - %1$s arquivos excluídos + %1$d arquivos excluídos Permitir exibição sobre outros apps Idioma do app Padrão do sistema diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index dc6facfb1..a52946dbd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -530,7 +530,7 @@ Uma miniatura de vídeo é mostrada no ecrã de bloqueio quando utilizando o leitor de fundo Limpar histórico de transferências Apagar ficheiros transferidos - %1$s transferências apagadas + %1$d transferências apagadas Permitir sobreposição da janela sobre outras aplicações Idioma da aplicação Predefinição do sistema diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 65f0d1742..913475d8e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -534,7 +534,7 @@ Показать миниатюру видео на экране блокировки при воспроизведении в фоне Очистить историю загрузок Удаление загруженных файлов - Удалено загрузок: %1$s + Удалено загрузок: %1$d Разрешите отображение поверх приложений Язык интерфейса Как в системе diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e23d866c1..3352c81f8 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -537,7 +537,7 @@ Pri prehrávaní videa na pozadí sa na zamknutej obrazovke zobrazí náhľad Vymazať históriu sťahovania Vymazať stiahnuté súbory - %1$s odstránených + %1$d odstránených Súhlas pre zobrazenie cez ďalšie aplikácie Jazyk aplikácie Predvolený diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 116b2fba2..278e27371 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -90,7 +90,7 @@ Numri maksimal i provave para se të anulohet shkarkimi Provat maksimale Ndalo - U fshinë %1$s shkarkime + U fshinë %1$d shkarkime Fshij skedarët e shkarkuar A dëshironi të boshatisni historikun e shkarkimeve apo të fshini të gjithë skedarët e shkarkuar\? Boshatis historikun e shkarkimeve diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 9ac4dc5be..23be5276b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -584,7 +584,7 @@ Stäng ner Användbart när du byter till mobildata, även om vissa nedladdningar inte kan avbrytas Avbryt i en uppmätt nätverk - Rensa %1$s nedladdningarna + Rensa %1$d nedladdningarna Radera nedladdade filer Vill du rensa din nedladdningshistorik eller radera alla nerladdade filer\? Rensa nedladdningshistorik diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7ac73e034..bc4808f59 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -530,7 +530,7 @@ Arka plan oynatıcıyı kullanırken kilit ekranında bir video küçük resmi gösterilir İndirme geçmişini temizle İndirilen dosyaları sil - %1$s indirme silindi + %1$d indirme silindi Diğer uygulamaların üzerinde görüntüleme izni ver Uygulama dili Sistem öntanımlısı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f12c19cd2..20e9dbde1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -618,7 +618,7 @@ Це відео з віковим обмеженням. \n \nЩоб побачити його потрібно включите \"Контент 18+\" в налаштуваннях. - Видалено %1$s завантажень + Видалено %1$d завантажень Ескіз аватара каналу Оригінальні тексти сервісів будуть видимі в потокових елементах Режим обмеженого доступу YouTube diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index d222022d6..5609902e3 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -529,5 +529,5 @@ بیک گراؤنڈ پلیئر استعمال کرتے وقت ایک ویڈیو تھمب نیل کو لاک اسکرین پر دکھایا جائے گا ڈاؤن لوڈ کی سرگزشت صاف کریں ڈاؤن لوڈ شدہ فائلیں حذف کریں - %1$s ڈاؤن لوڈز کو حذف کیا گیا + %1$d ڈاؤن لوڈز کو حذف کیا گیا diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a16c93013..1795dd607 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -520,7 +520,7 @@ \'Storage Access Framework\' cho phép tải về thẻ SD. \nMột số thiết bị có thể không tương thích Dùng SAF - Đã xóa %1$s file tải về + Đã xóa %1$d file tải về Xóa file đã tải về Xóa lịch sử tải về Không thể khôi phục bản download này diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 604ad0605..8b87e9b10 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -524,5 +524,5 @@ 在后台播放时，锁屏上将会显示视频的缩略图 清除下载历史记录 删除下载了的文件 - 已删除 %1$s 下载 + 已删除 %1$d 下载 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d8be0b747..b71d64a1f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -525,7 +525,7 @@ 使用背景播放器時，鎖定畫面上將會顯示影片縮圖 清除下載歷史紀錄 刪除已下載的檔案 - 已刪除 %1$s 個下載 + 已刪除 %1$d 個下載 給予顯示在其他應用程式上層的權限 應用程式語言 系統預設值 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32d58967c..3625e67f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -585,7 +585,7 @@ Clear download history Do you want to clear your download history or delete all downloaded files? Delete downloaded files - Deleted %1$s downloads + Deleted %1$d downloads Stop Maximum retries Maximum number of attempts before canceling the download From 2d909b05147cdf8eecfb71f5c7e36df671c81fe8 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Sat, 11 Jul 2020 21:43:50 +0200 Subject: [PATCH 03/10] Remove untranslatable translations --- app/src/main/res/values-b+ast/strings.xml | 1 - app/src/main/res/values-b+zh+HANS+CN/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml index 06f554db1..213c6e884 100644 --- a/app/src/main/res/values-b+ast/strings.xml +++ b/app/src/main/res/values-b+ast/strings.xml @@ -58,7 +58,6 @@ Mil mill. Precísase esti permisu \np\'abrir nel mou ventanu - reCAPTCHA Retu de reCAPTCHA Solicitóse\'l retu de reCAPTCHA En segundu planu diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml index 575af6f16..40712041e 100644 --- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml +++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml @@ -108,7 +108,6 @@ 点击了解详情 请稍候… 复制至剪贴板 - reCAPTCHA验证码 悬浮窗播放 关于NewPipe 设置 diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b3b4baca9..d325f7ee4 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -412,7 +412,6 @@ Kieli vaihtuu, kun sovellus uudelleenkäynnistetään. Kommentteja ei voitu ladata Valinta - \@string/app_name Mitkä välilehdet näytetään pääsivulla Valmis Paina \"Valmis\", kun ratkaistu From c9fafbe1982d7cc6a47a9ded2bf2d456821c5dc5 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Wed, 8 Jul 2020 22:54:54 +0200 Subject: [PATCH 04/10] Add changelog --- .../metadata/android/en-US/changelogs/951.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/951.txt diff --git a/fastlane/metadata/android/en-US/changelogs/951.txt b/fastlane/metadata/android/en-US/changelogs/951.txt new file mode 100644 index 000000000..39a39ed1b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/951.txt @@ -0,0 +1,17 @@ +New +• Add search for subscription picker in the feed group dialog +• Add filter to the feed group dialog to show only ungrouped subscriptions +• Add playlist tab to main page +• Fast forward/rewind in background/pop-up player queue +• Display search suggestion: did you mean & showing result for + +Improved +• Drop writing application metadata in muxed files +• Do not remove failed streams from the queue +• Update status bar color to match toolbar color + +Fixed +• Fixed audio/video desync caused by floating point cumulative errors +• [PeerTube] Handle deleted comments + +and more \ No newline at end of file From d088d432c58d9284a13bbab18fb349934937898b Mon Sep 17 00:00:00 2001 From: TobiGr Date: Wed, 8 Jul 2020 22:47:10 +0200 Subject: [PATCH 05/10] Release NewPipe 0.19.6 (951) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7fe72f1f1..b77e6c986 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { resValue "string", "app_name", "NewPipe" minSdkVersion 19 targetSdkVersion 29 - versionCode 950 - versionName "0.19.5" + versionCode 951 + versionName "0.19.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true From d0c03a0211209cdff8ad2819a4c3c2580a57ee37 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Tue, 14 Jul 2020 21:15:29 +0200 Subject: [PATCH 06/10] Use androidx.annotation.NonNull instead of io.reactivex.annotations.NonNull --- app/src/main/java/org/schabi/newpipe/App.java | 2 +- .../schabi/newpipe/fragments/detail/VideoDetailFragment.java | 4 ++-- .../schabi/newpipe/fragments/list/BaseListInfoFragment.java | 5 ++--- .../newpipe/player/playqueue/AbstractInfoPlayQueue.java | 3 ++- .../schabi/newpipe/player/playqueue/PlayQueueAdapter.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 531cb5a38..33d77ea47 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -9,6 +9,7 @@ import android.content.SharedPreferences; import android.os.Build; import android.util.Log; +import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache; @@ -37,7 +38,6 @@ import java.net.SocketException; import java.util.Collections; import java.util.List; -import io.reactivex.annotations.NonNull; import io.reactivex.exceptions.CompositeException; import io.reactivex.exceptions.MissingBackpressureException; import io.reactivex.exceptions.OnErrorNotImplementedException; 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 fff689930..5718a4600 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 @@ -1025,7 +1025,7 @@ public class VideoDetailFragment extends BaseStateFragment if (description.getType() == Description.HTML) { disposables.add(Single.just(description.getContent()) - .map((@io.reactivex.annotations.NonNull String descriptionText) -> { + .map((@NonNull String descriptionText) -> { Spanned parsedDescription; if (Build.VERSION.SDK_INT >= 24) { parsedDescription = Html.fromHtml(descriptionText, 0); @@ -1037,7 +1037,7 @@ public class VideoDetailFragment extends BaseStateFragment }) .subscribeOn(Schedulers.computation()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe((@io.reactivex.annotations.NonNull Spanned spanned) -> { + .subscribe((@NonNull Spanned spanned) -> { videoDescriptionView.setText(spanned); videoDescriptionView.setVisibility(View.VISIBLE); })); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java index 82b1d18ed..86b093e45 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java @@ -158,11 +158,10 @@ public abstract class BaseListInfoFragment .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .doFinally(this::allowDownwardFocusScroll) - .subscribe((@io.reactivex.annotations.NonNull - ListExtractor.InfoItemsPage InfoItemsPage) -> { + .subscribe((@NonNull ListExtractor.InfoItemsPage InfoItemsPage) -> { isLoading.set(false); handleNextItems(InfoItemsPage); - }, (@io.reactivex.annotations.NonNull Throwable throwable) -> { + }, (@NonNull Throwable throwable) -> { isLoading.set(false); onError(throwable); }); diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java index cde376f4f..3c15cd342 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java @@ -2,6 +2,8 @@ package org.schabi.newpipe.player.playqueue; import android.util.Log; +import androidx.annotation.NonNull; + import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.ListExtractor; import org.schabi.newpipe.extractor.ListInfo; @@ -13,7 +15,6 @@ import java.util.Collections; import java.util.List; import io.reactivex.SingleObserver; -import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; abstract class AbstractInfoPlayQueue extends PlayQueue { diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java index f8777597a..3b42f2745 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import org.schabi.newpipe.R; @@ -20,7 +21,6 @@ import org.schabi.newpipe.util.FallbackViewHolder; import java.util.List; import io.reactivex.Observer; -import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; /** From 7a30f4a7d2598549e9fcd5a8d75a04461c420609 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Sat, 30 May 2020 17:51:23 +0200 Subject: [PATCH 07/10] Remove calls to getNextStream() --- app/build.gradle | 2 +- .../fragments/detail/VideoDetailFragment.java | 4 -- .../list/videos/RelatedVideosFragment.java | 37 ++++++------------- .../newpipe/player/helper/PlayerHelper.java | 31 ++++++++-------- .../newpipe/util/RelatedStreamInfo.java | 16 -------- 5 files changed, 29 insertions(+), 61 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b77e6c986..94c7a2ce5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -163,7 +163,7 @@ dependencies { exclude module: 'support-annotations' } - implementation 'com.github.TeamNewPipe:NewPipeExtractor:a70cb0283ffc3bba2709815673a5a7940aab0a3a' + implementation 'com.github.wb9688:NewPipeExtractor:70136e6a099d610d1fe6340549aa0542f7f26f1e' implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751" implementation "org.jsoup:jsoup:1.13.1" 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 fff689930..b2f1709c2 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 @@ -365,10 +365,6 @@ public class VideoDetailFragment extends BaseStateFragment public void onSaveInstanceState(final Bundle outState) { super.onSaveInstanceState(outState); - // Check if the next video label and video is visible, - // if it is, include the two elements in the next check - int nextCount = currentInfo != null && currentInfo.getNextVideo() != null ? 2 : 0; - if (!isLoading.get() && currentInfo != null && isVisible()) { outState.putSerializable(INFO_KEY, currentInfo); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java index 5d48afd15..d66433fa8 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java @@ -9,7 +9,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.CompoundButton; import android.widget.Switch; import androidx.annotation.NonNull; @@ -40,9 +39,7 @@ public class RelatedVideosFragment extends BaseListInfoFragment PreferenceManager.getDefaultSharedPreferences(getContext()).edit() - .putBoolean(getString(R.string.auto_queue_key), b).apply(); - } - }); + .putBoolean(getString(R.string.auto_queue_key), b).apply()); return headerRootLayout; } else { return null; @@ -105,7 +92,7 @@ public class RelatedVideosFragment extends BaseListInfoFragment loadMoreItemsLogic() { - return Single.fromCallable(() -> ListExtractor.InfoItemsPage.emptyPage()); + return Single.fromCallable(ListExtractor.InfoItemsPage::emptyPage); } /*////////////////////////////////////////////////////////////////////////// @@ -216,8 +203,8 @@ public class RelatedVideosFragment extends BaseListInfoFragment - * This method detects and prevents cycle by naively checking if a - * candidate next video's url already exists in the existing items. + * This method detects and prevents cycles by naively checking + * if a candidate next video's url already exists in the existing items. *

*

- * To select the next video, {@link StreamInfo#getNextVideo()} is first - * checked. If it is nonnull and is not part of the existing items, then - * it will be used as the next video. Otherwise, an random item with - * non-repeating url will be selected from the {@link StreamInfo#getRelatedStreams()}. + * The first item in {@link StreamInfo#getRelatedStreams()} is checked first. + * If it is non-null and is not part of the existing items, it will be used as the next stream. + * Otherwise, a random item with non-repeating url will be selected + * from the {@link StreamInfo#getRelatedStreams()}. *

* * @param info currently playing stream @@ -152,27 +152,28 @@ public final class PlayerHelper { @Nullable public static PlayQueue autoQueueOf(@NonNull final StreamInfo info, @NonNull final List existingItems) { - Set urls = new HashSet<>(existingItems.size()); + final Set urls = new HashSet<>(existingItems.size()); for (final PlayQueueItem item : existingItems) { urls.add(item.getUrl()); } - final StreamInfoItem nextVideo = info.getNextVideo(); - if (nextVideo != null && !urls.contains(nextVideo.getUrl())) { - return getAutoQueuedSinglePlayQueue(nextVideo); - } - final List relatedItems = info.getRelatedStreams(); if (relatedItems == null) { return null; } - List autoQueueItems = new ArrayList<>(); + if (relatedItems.get(0) != null && relatedItems.get(0) instanceof StreamInfoItem + && !urls.contains(relatedItems.get(0).getUrl())) { + return getAutoQueuedSinglePlayQueue((StreamInfoItem) relatedItems.get(0)); + } + + final List autoQueueItems = new ArrayList<>(); for (final InfoItem item : info.getRelatedStreams()) { if (item instanceof StreamInfoItem && !urls.contains(item.getUrl())) { autoQueueItems.add((StreamInfoItem) item); } } + Collections.shuffle(autoQueueItems); return autoQueueItems.isEmpty() ? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0)); diff --git a/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java b/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java index ce642da5e..fcd392d67 100644 --- a/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java +++ b/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java @@ -4,16 +4,12 @@ import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.ListInfo; import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler; import org.schabi.newpipe.extractor.stream.StreamInfo; -import org.schabi.newpipe.extractor.stream.StreamInfoItem; import java.util.ArrayList; import java.util.Collections; import java.util.List; public class RelatedStreamInfo extends ListInfo { - - private StreamInfoItem nextStream; - public RelatedStreamInfo(final int serviceId, final ListLinkHandler listUrlIdHandler, final String name) { super(serviceId, listUrlIdHandler, name); @@ -25,20 +21,8 @@ public class RelatedStreamInfo extends ListInfo { RelatedStreamInfo relatedStreamInfo = new RelatedStreamInfo( info.getServiceId(), handler, info.getName()); List streams = new ArrayList<>(); - if (info.getNextVideo() != null) { - streams.add(info.getNextVideo()); - } streams.addAll(info.getRelatedStreams()); relatedStreamInfo.setRelatedItems(streams); - relatedStreamInfo.setNextStream(info.getNextVideo()); return relatedStreamInfo; } - - public StreamInfoItem getNextStream() { - return nextStream; - } - - public void setNextStream(final StreamInfoItem nextStream) { - this.nextStream = nextStream; - } } From 4274827dbe4a814f2aa4cb2ffc8c4168f5a322a3 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Wed, 15 Jul 2020 18:52:36 +0200 Subject: [PATCH 08/10] Use relatedItems instead of info.getRelatedStreams() --- app/build.gradle | 2 +- .../newpipe/fragments/list/videos/RelatedVideosFragment.java | 2 +- .../java/org/schabi/newpipe/player/helper/PlayerHelper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 94c7a2ce5..229871f59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -163,7 +163,7 @@ dependencies { exclude module: 'support-annotations' } - implementation 'com.github.wb9688:NewPipeExtractor:70136e6a099d610d1fe6340549aa0542f7f26f1e' + implementation 'com.github.wb9688:NewPipeExtractor:fc3a63fec56c110d7f434ef4377b3eeb2b8bbefe' implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751" implementation "org.jsoup:jsoup:1.13.1" diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java index d66433fa8..cf2101111 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java @@ -83,7 +83,7 @@ public class RelatedVideosFragment extends BaseListInfoFragment PreferenceManager.getDefaultSharedPreferences(getContext()).edit() - .putBoolean(getString(R.string.auto_queue_key), b).apply()); + .putBoolean(getString(R.string.auto_queue_key), b).apply()); return headerRootLayout; } else { return null; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java index da0e7403a..e63e56bf9 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java @@ -168,7 +168,7 @@ public final class PlayerHelper { } final List autoQueueItems = new ArrayList<>(); - for (final InfoItem item : info.getRelatedStreams()) { + for (final InfoItem item : relatedItems) { if (item instanceof StreamInfoItem && !urls.contains(item.getUrl())) { autoQueueItems.add((StreamInfoItem) item); } From e028a63f304951efdee5843b58828d958d2e3e94 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Sat, 18 Jul 2020 10:01:44 +0200 Subject: [PATCH 09/10] Check for description == null --- .../schabi/newpipe/fragments/detail/VideoDetailFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fff689930..4413a7d1e 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 @@ -1018,7 +1018,7 @@ public class VideoDetailFragment extends BaseStateFragment } private void prepareDescription(final Description description) { - if (TextUtils.isEmpty(description.getContent()) + if (description == null || TextUtils.isEmpty(description.getContent()) || description == Description.emptyDescription) { return; } From 88c86e88b04839bd670cf2ef77ef1cb5e0ac6faf Mon Sep 17 00:00:00 2001 From: TobiGr Date: Mon, 20 Jul 2020 20:34:02 +0200 Subject: [PATCH 10/10] Update extractor version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 229871f59..558fcc083 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -163,7 +163,7 @@ dependencies { exclude module: 'support-annotations' } - implementation 'com.github.wb9688:NewPipeExtractor:fc3a63fec56c110d7f434ef4377b3eeb2b8bbefe' + implementation 'com.github.TeamNewPipe:NewPipeExtractor:df28a087de3d9ccb9eb180e001b1d8ca7f7cf544' implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751" implementation "org.jsoup:jsoup:1.13.1"