From 5e6752db14bee50c58d3fbd90e674ada4f546788 Mon Sep 17 00:00:00 2001 From: Stypox Date: Fri, 15 Apr 2022 10:54:31 +0200 Subject: [PATCH 1/3] Update NewPipeExtractor for hotfix release --- app/build.gradle | 2 +- .../schabi/newpipe/fragments/detail/DescriptionFragment.java | 2 +- .../schabi/newpipe/settings/PeertubeInstanceListFragment.java | 2 +- .../main/java/us/shandian/giga/get/DownloadMissionRecover.java | 2 +- app/src/main/java/us/shandian/giga/get/MissionRecoveryInfo.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 633da37bd..d8467d1e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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:bebdc55ad42ef964a547059110573a177331cf4d' /** 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 index 9b1bf121b..d57ddb02d 100644 --- 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 @@ public class DescriptionFragment extends BaseFragment { 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 index dfc053a62..5557efd9c 100644 --- 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 @@ public class PeertubeInstanceListFragment extends Fragment { .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 index 5b2858aa2..90886b63c 100644 --- 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 @@ public class DownloadMissionRecover extends Thread { 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 index 403eee0c7..bba6fdd7f 100644 --- 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' } From ffa7efedd6b263d5ef85ce83d8334bacfc026b7d Mon Sep 17 00:00:00 2001 From: Stypox Date: Fri, 15 Apr 2022 10:57:55 +0200 Subject: [PATCH 2/3] Hotfix release 0.22.2 (985) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d8467d1e0..5d3b9e7e4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { resValue "string", "app_name", "NewPipe" minSdk 19 targetSdk 29 - versionCode 984 - versionName "0.22.1" + versionCode 985 + versionName "0.22.2" multiDexEnabled true From 5ce5f84f4a7fdb8c637175cbaefa527a16ead640 Mon Sep 17 00:00:00 2001 From: Stypox Date: Fri, 15 Apr 2022 11:05:19 +0200 Subject: [PATCH 3/3] Add hotfix changelogs for NewPipe 0.22.2 (985) The changelogs were just copied from 982.txt for all languages that had it, since the subject of the hotfix release was the same, i.e. youtube breaking --- fastlane/metadata/android/de/changelogs/985.txt | 1 + fastlane/metadata/android/en-US/changelogs/985.txt | 1 + fastlane/metadata/android/he/changelogs/985.txt | 1 + fastlane/metadata/android/it/changelogs/985.txt | 1 + fastlane/metadata/android/nl/changelogs/985.txt | 1 + fastlane/metadata/android/sv/changelogs/985.txt | 1 + fastlane/metadata/android/uk/changelogs/985.txt | 1 + fastlane/metadata/android/zh-Hans/changelogs/985.txt | 1 + 8 files changed, 8 insertions(+) create mode 100644 fastlane/metadata/android/de/changelogs/985.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/985.txt create mode 100644 fastlane/metadata/android/he/changelogs/985.txt create mode 100644 fastlane/metadata/android/it/changelogs/985.txt create mode 100644 fastlane/metadata/android/nl/changelogs/985.txt create mode 100644 fastlane/metadata/android/sv/changelogs/985.txt create mode 100644 fastlane/metadata/android/uk/changelogs/985.txt create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/985.txt diff --git a/fastlane/metadata/android/de/changelogs/985.txt b/fastlane/metadata/android/de/changelogs/985.txt new file mode 100644 index 000000000..e2a10be2e --- /dev/null +++ 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 new file mode 100644 index 000000000..c720218ac --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/985.txt @@ -0,0 +1 @@ +Fixed YouTube not playing any stream \ No newline at end of file diff --git a/fastlane/metadata/android/he/changelogs/985.txt b/fastlane/metadata/android/he/changelogs/985.txt new file mode 100644 index 000000000..8123c9da3 --- /dev/null +++ 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 new file mode 100644 index 000000000..296db3632 --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/985.txt @@ -0,0 +1 @@ +Sistemato un problema nell'estrattore di YouTube che impediva di guardare qualsiasi video. \ No newline at end of file diff --git a/fastlane/metadata/android/nl/changelogs/985.txt b/fastlane/metadata/android/nl/changelogs/985.txt new file mode 100644 index 000000000..deaa12d0c --- /dev/null +++ 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 new file mode 100644 index 000000000..4c434af54 --- /dev/null +++ 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 new file mode 100644 index 000000000..41d4d11ce --- /dev/null +++ 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 new file mode 100644 index 000000000..8a5424c9e --- /dev/null +++ b/fastlane/metadata/android/zh-Hans/changelogs/985.txt @@ -0,0 +1 @@ +修复YouTube无法播放任何视频