Skip to content

Commit 50269d0

Browse files
committed
updated caption file name and clean code
1 parent 1afb9cd commit 50269d0

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -568,16 +568,16 @@ public void onItemSelected(final AdapterView<?> parent,
568568
private void onItemSelectedSetFileName() {
569569
final String setSubtitleLanguageCode = subtitleStreamsAdapter.getItem(selectedSubtitleIndex)
570570
.getLanguageTag();
571+
final String fileName = FilenameUtils.createFilename(getContext(),
572+
currentInfo.getName());
571573
switch (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()) {
572574
case R.id.audio_button:
573575
case R.id.video_button:
574-
dialogBinding.fileName.setText(FilenameUtils.createFilename(getContext(),
575-
currentInfo.getName()));
576+
dialogBinding.fileName.setText(fileName);
576577
break;
577578
case R.id.subtitle_button:
578-
dialogBinding.fileName.setText(FilenameUtils.createFilename(getContext(),
579-
currentInfo.getName() + getString(
580-
R.string.caption_file_name, setSubtitleLanguageCode)));
579+
dialogBinding.fileName.setText(fileName + getString(
580+
R.string.caption_file_name, fileName, setSubtitleLanguageCode));
581581
break;
582582
}
583583
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
<string name="resize_zoom">Zoom</string>
453453
<string name="caption_auto_generated">Auto-generated</string>
454454
<!-- Caption Settings -->
455-
<string name="caption_file_name">-%s</string>
455+
<string name="caption_file_name">%1$s-%2$s</string>
456456
<string name="caption_setting_title">Captions</string>
457457
<string name="caption_setting_description">Modify player caption text scale and background styles. Requires app restart to take effect</string>
458458
<!-- Debug Settings -->

0 commit comments

Comments
 (0)