Updated to NewPipeExtractor v0.20.2

Applied the pull request: Polish strings #4655 (NewPipe) Applied the pull request: Layout strings TeamNewPipe#31 (NewPipe-legacy)
juanpaulconte · Nov 4, 2020 · cb5046b · cb5046b
1 parent 1b5f221
commit cb5046b
Show file tree

Hide file tree

Showing 69 changed files with 448 additions and 436 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -163,7 +163,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:5ac80624a40f4c600ae493e66881b5bf008f0ddb'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:30ed4f2d636dbb6112ae1951e646f8756ae93ff4'
 
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
     implementation "org.jsoup:jsoup:1.13.1"

diff --git a/app/src/main/java/org/schabi/newpipelegacy/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipelegacy/fragments/detail/VideoDetailFragment.java
@@ -1364,8 +1364,8 @@ protected boolean onError(final Throwable exception) {
             return true;
         }
 
-        int errorId = exception instanceof YoutubeStreamExtractor.DecryptException
-                ? R.string.youtube_signature_decryption_error
+        int errorId = exception instanceof YoutubeStreamExtractor.DeobfuscateException
+                ? R.string.youtube_signature_deobfuscation_error
                 : exception instanceof ExtractionException
                         ? R.string.parsing_error
                         : R.string.general_error;

diff --git a/app/src/main/java/org/schabi/newpipelegacy/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipelegacy/player/resolver/VideoPlaybackResolver.java
@@ -106,7 +106,7 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
                         SELECTION_FLAG_AUTOSELECT,
                         PlayerHelper.captionLanguageOf(context, subtitle));
                 final MediaSource textSource = dataSource.getSampleMediaSourceFactory()
-                        .createMediaSource(Uri.parse(subtitle.getURL()), textFormat, TIME_UNSET);
+                        .createMediaSource(Uri.parse(subtitle.getUrl()), textFormat, TIME_UNSET);
                 mediaSources.add(textSource);
             }
         }

diff --git a/app/src/main/java/org/schabi/newpipelegacy/util/ExtractorHelper.java b/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 {
-                int errorId = exception instanceof YoutubeStreamExtractor.DecryptException
-                        ? R.string.youtube_signature_decryption_error
+                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,