From cc79c90bc77ed863e2804ca898c03da7f5c5c7db Mon Sep 17 00:00:00 2001 From: ibrahim-iqbal Date: Tue, 6 Oct 2026 11:32:07 +0530 Subject: [PATCH] Address review: rename to trackName, use isBlank, point at merged extractor - serviceName -> trackName, since 'service' means YouTube/SoundCloud elsewhere in this codebase. - isEmpty() -> isBlank(), per review suggestion. - Extractor dependency now points at TeamNewPipe/NewPipeExtractor at the commit that merged (#1551), instead of my fork. --- .../java/org/schabi/newpipe/player/helper/PlayerHelper.java | 6 +++--- gradle/libs.versions.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 9b2f5a03f..73951b0ad 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 @@ -116,9 +116,9 @@ public final class PlayerHelper { @NonNull public static String captionLanguageOf(@NonNull final Context context, @NonNull final SubtitlesStream subtitles) { - final String serviceName = subtitles.getName(); - final String displayName = serviceName != null && !serviceName.isEmpty() - ? serviceName + final String trackName = subtitles.getName(); + final String displayName = trackName != null && !trackName.isBlank() + ? trackName : subtitles.getDisplayLanguageName(); return displayName + (subtitles.isAutoGenerated() ? " (" + context.getString(R.string.caption_auto_generated) + ")" : ""); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1abf3ca8..230bf09b9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -73,7 +73,7 @@ teamnewpipe-nanojson = "e9d656ddb49a412a5a0a5d5ef20ca7ef09549996" # the corresponding commit hash, since JitPack sometimes deletes artifacts. # If there’s already a git hash, just add more of it to the end (or remove a letter) # to cause jitpack to regenerate the artifact. -teamnewpipe-newpipe-extractor = "d66acff2536c68db2abbfa308399337e8dd686e2" +teamnewpipe-newpipe-extractor = "65cabc2ba5216ee871ace4a9963c08bdbf5d5dc0" viewpager2 = "1.1.0" webkit = "1.15.0" # New versions require minSdk 24 work = "2.11.2" @@ -152,7 +152,7 @@ lisawray-groupie-core = { module = "com.github.lisawray.groupie:groupie", versio lisawray-groupie-viewbinding = { module = "com.github.lisawray.groupie:groupie-viewbinding", version.ref = "groupie" } livefront-bridge = { module = "com.github.livefront:bridge", version.ref = "bridge" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" } -newpipe-extractor = { module = "com.github.ibrahim-iqbal:NewPipeExtractor", version.ref = "teamnewpipe-newpipe-extractor" } +newpipe-extractor = { module = "com.github.TeamNewPipe:NewPipeExtractor", version.ref = "teamnewpipe-newpipe-extractor" } newpipe-filepicker = { module = "com.github.TeamNewPipe:NoNonsense-FilePicker", version.ref = "teamnewpipe-filepicker" } newpipe-nanojson = { module = "com.github.TeamNewPipe:nanojson", version.ref = "teamnewpipe-nanojson" } noties-markwon-core = { module = "io.noties.markwon:core", version.ref = "markwon" }