Skip to content

Commit 5a921c9

Browse files
authored
Merge pull request #10440 from Stypox/remove-deobfuscation-exception
Update extractor and remove DeobfuscateException
2 parents b508dd6 + bdc2aa2 commit 5a921c9

74 files changed

Lines changed: 1 addition & 75 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ dependencies {
197197
// name and the commit hash with the commit hash of the (pushed) commit you want to test
198198
// This works thanks to JitPack: https://jitpack.io/
199199
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
200-
implementation 'com.github.TeamNewPipe:NewPipeExtractor:3be76a6406d59f1fd8eedf5fab6552e6c2a3da76'
200+
implementation 'com.github.TeamNewPipe:NewPipeExtractor:289db1178ab66694c23893e6a487d4708343c47b'
201201
implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
202202

203203
/** Checkstyle **/

app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
1111
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
1212
import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
1313
import org.schabi.newpipe.extractor.exceptions.ExtractionException
14-
import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
1514
import org.schabi.newpipe.ktx.isNetworkRelated
1615
import org.schabi.newpipe.util.ServiceHelper
1716

@@ -96,7 +95,6 @@ class ErrorInfo(
9695
throwable is ContentNotAvailableException -> R.string.content_not_available
9796
throwable != null && throwable.isNetworkRelated -> R.string.network_error
9897
throwable is ContentNotSupportedException -> R.string.content_not_supported
99-
throwable is DeobfuscateException -> R.string.youtube_signature_deobfuscation_error
10098
throwable is ExtractionException -> R.string.parsing_error
10199
throwable is ExoPlaybackException -> {
102100
when (throwable.type) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<string name="could_not_load_thumbnails">تعذر تحميل كافة الصور المصغرة</string>
4646
<string name="general_error">خطأ</string>
4747
<string name="parsing_error">تعذر تحليل الموقع</string>
48-
<string name="youtube_signature_deobfuscation_error">تعذر فك تشفير توقيع رابط الفيديو</string>
4948
<string name="main_bg_subtitle">اضغط على عدسة المكبرة للبدء.</string>
5049
<string name="subscribe_button_title">اشتراك</string>
5150
<string name="subscribed_button_title">مشترك</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,6 @@
641641
<string name="settings_category_player_notification_title">Oynadıcı bildirişi</string>
642642
<string name="streams_notification_channel_name">Yeni yayımlar</string>
643643
<string name="error_report_channel_name">Xəta hesabatı bildirişi</string>
644-
<string name="youtube_signature_deobfuscation_error">Video URL\'i imzası şifrəsi qırılmadı</string>
645644
<string name="no_streams_available_download">Endirmək üçün yayım mövcud deyil</string>
646645
<string name="error_report_notification_toast">Xəta baş verdi, bildirişi gör</string>
647646
<string name="your_comment">Şərhiniz (İngiliscə):</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<string name="duration_live">En direuto</string>
2626
<string name="general_error">Fallu</string>
2727
<string name="could_not_load_thumbnails">Nun pudieron cargase toles miniatures</string>
28-
<string name="youtube_signature_deobfuscation_error">Nun pudo sabese la robla de la URL del videu</string>
2928
<string name="parsing_error">Nun pudo analizase\'l sitiu web</string>
3029
<string name="sorry_string">Buff… Esto nun debió asoceder.</string>
3130
<string name="error_snackbar_message">Perdona mas asocedió daqué malo.</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@
312312
<string name="could_not_setup_download_menu">Yuklab olish menyusi sozlanmadi</string>
313313
<string name="content_not_available">Tarkib mavjud emas</string>
314314
<string name="parsing_error">Veb-saytni tahlil qilib bo\'lmadi</string>
315-
<string name="youtube_signature_deobfuscation_error">Videoning URL manzilini o\'chirib bo\'lmadi</string>
316315
<string name="could_not_load_thumbnails">Barcha eskizlarni yuklab bo\'lmadi</string>
317316
<string name="network_error">Tarmoqda xato</string>
318317
<string name="download_to_sdcard_error_message">Tashqi SD-kartaga yuklab olishning iloji yo\'q. Yuklash papkasining joylashuvi tiklansinmi\?</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<string name="general_error">Памылка</string>
125125
<string name="network_error">Памылка сеткі</string>
126126
<string name="could_not_load_thumbnails">Не атрымалася загрузіць усе мініяцюры</string>
127-
<string name="youtube_signature_deobfuscation_error">Не атрымалася расшыфраваць подпіс URL у відэа</string>
128127
<string name="parsing_error">Не атрымалася разабраць вэб-сайт</string>
129128
<string name="content_not_available">Кантэнт недаступны</string>
130129
<string name="could_not_setup_download_menu">Не атрымалася стварыць меню загрузкі</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@
176176
<string name="clear_search_history_summary">Изтрива историята с въвежданите за търсене ключови думи</string>
177177
<string name="delete_search_history_alert">Изтрий цялата история на търсенията\?</string>
178178
<string name="search_history_deleted">Историята на търсенията е изтрита.</string>
179-
<string name="youtube_signature_deobfuscation_error">URL подписът на клипа не можа да бъде дешифрован</string>
180179
<string name="external_player_unsupported_link_type">Външните плейъри не поддържат този вид линкове</string>
181180
<string name="invalid_directory">Невалидна директория</string>
182181
<string name="invalid_source">Невалиден файл или източник на съдържание</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<string name="general_error">ত্রুটি</string>
6262
<string name="network_error">নেটওয়ার্ক ত্রুটি</string>
6363
<string name="could_not_load_thumbnails">সব থাম্বনেইল লোড করা যায়নি</string>
64-
<string name="youtube_signature_deobfuscation_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
6564
<string name="parsing_error">ওয়েবসাইট বিশ্লেষন করা যায়নি</string>
6665
<string name="content_not_available">কন্টেন্ট উপলব্ধ নয়</string>
6766
<string name="could_not_setup_download_menu">ডাউনলোড মেনু সেটআপ করা যায়নি</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<string name="could_not_setup_download_menu">ডাউনলোড মেনু সেটআপ করা যায়নি</string>
4545
<string name="content_not_available">কন্টেন্ট উপলব্ধ নয়</string>
4646
<string name="parsing_error">ওয়েবসাইট বিশ্লেষন করা যায়নি</string>
47-
<string name="youtube_signature_deobfuscation_error">ভিডিও URL স্বাক্ষর ডিক্রিপ্ট করা যায়নি</string>
4847
<string name="could_not_load_thumbnails">সব থাম্বনেইল লোড করা যায়নি</string>
4948
<string name="network_error">নেটওয়ার্ক ত্রুটি</string>
5049
<string name="general_error">ত্রুটি</string>

0 commit comments

Comments
 (0)