Merge branch 'master' into sponsorblock

polymorphicshade · Apr 16, 2022 · 7857ae2 · 7857ae2
2 parents 3e688b1 + 53a659c
commit 7857ae2
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         resValue "string", "app_name", "NewPipe SponsorBlock"
         minSdk 19
         targetSdk 29
-        versionCode 984
-        versionName "0.22.1"
+        versionCode 985
+        versionName "0.22.2"
 
         multiDexEnabled true
 
@@ -189,7 +189,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:v0.21.14'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:b77c72fb8826c3ffca0be5f96b066cca0a07b1c9'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
@@ -84,7 +84,7 @@ private void setupUploadDate() {
     private void setupDescription() {
         final Description description = streamInfo.getDescription();
         if (description == null || isEmpty(description.getContent())
-                || description == Description.emptyDescription) {
+                || description == Description.EMPTY_DESCRIPTION) {
             binding.detailDescriptionView.setVisibility(View.GONE);
             binding.detailSelectDescriptionButton.setVisibility(View.GONE);
             return;

diff --git a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
@@ -193,7 +193,7 @@ private void restoreDefaults() {
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
                     sharedPreferences.edit().remove(savedInstanceListKey).apply();
-                    selectInstance(PeertubeInstance.defaultInstance);
+                    selectInstance(PeertubeInstance.DEFAULT_INSTANCE);
                     updateInstanceList();
                     instanceListAdapter.notifyDataSetChanged();
                 })

diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMissionRecover.java b/app/src/main/java/us/shandian/giga/get/DownloadMissionRecover.java
@@ -132,7 +132,7 @@ private void resolveStream() throws IOException, ExtractionException, HttpError
         switch (mRecovery.getKind()) {
             case 'a':
                 for (AudioStream audio : mExtractor.getAudioStreams()) {
-                    if (audio.average_bitrate == mRecovery.getDesiredBitrate() && audio.getFormat() == mRecovery.getFormat()) {
+                    if (audio.getAverageBitrate() == mRecovery.getDesiredBitrate() && audio.getFormat() == mRecovery.getFormat()) {
                         url = audio.getUrl();
                         break;
                     }

diff --git a/app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt b/app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt
@@ -21,7 +21,7 @@ class MissionRecoveryInfo(
     constructor(stream: Stream) : this(format = stream.getFormat()!!) {
         when (stream) {
             is AudioStream -> {
-                desiredBitrate = stream.average_bitrate
+                desiredBitrate = stream.averageBitrate
                 isDesired2 = false
                 kind = 'a'
             }

diff --git a/fastlane/metadata/android/de/changelogs/985.txt b/fastlane/metadata/android/de/changelogs/985.txt
@@ -0,0 +1 @@
+Behoben, dass YouTube keinen Stream abspielte.
diff --git a/fastlane/metadata/android/en-US/changelogs/985.txt b/fastlane/metadata/android/en-US/changelogs/985.txt
@@ -0,0 +1 @@
+Fixed YouTube not playing any stream
diff --git a/fastlane/metadata/android/he/changelogs/985.txt b/fastlane/metadata/android/he/changelogs/985.txt
@@ -0,0 +1 @@
+תוקנה התקלה ש־YouTube לא מנגן אף תזרים.
diff --git a/fastlane/metadata/android/it/changelogs/985.txt b/fastlane/metadata/android/it/changelogs/985.txt
@@ -0,0 +1 @@
+Sistemato un problema nell'estrattore di YouTube che impediva di guardare qualsiasi video.
diff --git a/fastlane/metadata/android/nl/changelogs/985.txt b/fastlane/metadata/android/nl/changelogs/985.txt
@@ -0,0 +1 @@
+Opgelost: YouTube speelt geen stream af.
diff --git a/fastlane/metadata/android/sv/changelogs/985.txt b/fastlane/metadata/android/sv/changelogs/985.txt
@@ -0,0 +1 @@
+Fixade att YouTube inte spelade någon stream.
diff --git a/fastlane/metadata/android/uk/changelogs/985.txt b/fastlane/metadata/android/uk/changelogs/985.txt
@@ -0,0 +1 @@
+Виправлено проблему невідтворюваності трансляцій YouTube.
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/985.txt b/fastlane/metadata/android/zh-Hans/changelogs/985.txt
@@ -0,0 +1 @@
+修复YouTube无法播放任何视频
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		תוקנה התקלה ש־YouTube לא מנגן אף תזרים.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Sistemato un problema nell'estrattore di YouTube che impediva di guardare qualsiasi video.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Виправлено проблему невідтворюваності трансляцій YouTube.