Skip to content

Commit c6b87cd

Browse files
tfgatfga
committed
[TeamNewPipe#11930] Making CheckStyle happy
1 parent 94d4c21 commit c6b87cd

File tree

3 files changed

+74
-56
lines changed

3 files changed

+74
-56
lines changed

‎app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

+44-25
Original file line numberDiff line numberDiff line change
@@ -399,67 +399,85 @@ public boolean onOptionsItemSelected(final MenuItem item) {
399399
* @param shareMode Whether the playlist details should be included in the
400400
* shared content.
401401
*/
402-
private void sharePlaylist(PlayListShareMode shareMode) {
402+
private void sharePlaylist(final PlayListShareMode shareMode) {
403403
final Context context = requireContext();
404404

405405
disposables.add(playlistManager.getPlaylistStreams(playlistId)
406-
.flatMapSingle(playlist -> Single.just(export( shareMode
407-
, playlist.stream().map(PlaylistStreamEntry::getStreamEntity)
408-
, context
409-
)
410-
))
406+
.flatMapSingle(playlist -> Single.just(export(
407+
408+
shareMode,
409+
playlist.stream().map(PlaylistStreamEntry::getStreamEntity),
410+
context
411+
)))
411412
.observeOn(AndroidSchedulers.mainThread())
412-
.subscribe( urlsText -> ShareUtils.shareText( context
413-
, name
414-
, shareMode == JUST_URLS ? urlsText
415-
: context.getString(R.string.share_playlist_content_details, name, urlsText))
416-
, throwable -> showUiErrorSnackbar(this, "Sharing playlist", throwable))
417-
);
413+
.subscribe(
414+
urlsText -> {
415+
416+
final String content = shareMode == JUST_URLS
417+
? urlsText
418+
: context.getString(R.string.share_playlist_content_details,
419+
name,
420+
urlsText
421+
);
422+
423+
ShareUtils.shareText(context, name, content);
424+
},
425+
throwable -> showUiErrorSnackbar(this, "Sharing playlist", throwable)
426+
)
427+
);
418428
}
419429

420-
static String export(PlayListShareMode shareMode, Stream<StreamEntity> entityStream, Context context) {
430+
static String export(final PlayListShareMode shareMode,
431+
final Stream<StreamEntity> entityStream,
432+
final Context context) {
421433

422-
return switch(shareMode) {
434+
return switch (shareMode) {
423435

424436
case WITH_TITLES -> exportWithTitles(entityStream, context);
425437
case JUST_URLS -> exportJustUrls(entityStream);
426438
case YOUTUBE_TEMP_PLAYLIST -> exportAsYoutubeTempPlaylist(entityStream);
427439
};
428440
}
429441

430-
static String exportWithTitles(Stream<StreamEntity> entityStream, Context context) {
442+
static String exportWithTitles(final Stream<StreamEntity> entityStream, final Context context) {
431443

432444
return entityStream
433-
.map(entity -> context.getString(R.string.video_details_list_item, entity.getTitle(), entity.getUrl()))
445+
.map(entity -> context.getString(R.string.video_details_list_item,
446+
entity.getTitle(),
447+
entity.getUrl()
448+
)
449+
)
434450
.collect(Collectors.joining("\n"));
435451
}
436452

437-
static String exportJustUrls(Stream<StreamEntity> entityStream) {
453+
static String exportJustUrls(final Stream<StreamEntity> entityStream) {
438454

439455
return entityStream
440456
.map(StreamEntity::getUrl)
441457
.collect(Collectors.joining("\n"));
442458
}
443459

444-
static String exportAsYoutubeTempPlaylist(Stream<StreamEntity> entityStream) {
460+
static String exportAsYoutubeTempPlaylist(final Stream<StreamEntity> entityStream) {
445461

446-
String videoIDs = entityStream
462+
final String videoIDs = entityStream
447463
.map(entity -> getYouTubeId(entity.getUrl()))
448464
.collect(Collectors.joining(","));
449465

450466
return "http://www.youtube.com/watch_videos?video_ids=" + videoIDs;
451467
}
452468

453469
/**
454-
* Gets the video id from a YouTube URL
470+
* Gets the video id from a YouTube URL.
471+
*
472+
* @param url YouTube URL
473+
* @return the video id
455474
*/
456-
static String getYouTubeId(String url) {
475+
static String getYouTubeId(final String url) {
457476

458-
HttpUrl httpUrl = HttpUrl.parse(url);
477+
final HttpUrl httpUrl = HttpUrl.parse(url);
459478

460479
return httpUrl == null ? null
461-
: httpUrl.queryParameter("v")
462-
;
480+
: httpUrl.queryParameter("v");
463481
}
464482

465483
public void removeWatchedStreams(final boolean removePartiallyWatched) {
@@ -924,7 +942,8 @@ private void createShareConfirmationDialog() {
924942
.setPositiveButton(R.string.share_playlist_with_titles, (dialog, which) ->
925943
sharePlaylist(WITH_TITLES)
926944
)
927-
.setNeutralButton("Share as YouTube temporary playlist", (dialog, which) -> // TODO R.string.share_playlist_as_YouTube_temporary_playlist
945+
// TODO R.string.share_playlist_as_YouTube_temporary_playlist
946+
.setNeutralButton("Share as YouTube temporary playlist", (dialog, which) ->
928947
sharePlaylist(YOUTUBE_TEMP_PLAYLIST)
929948
)
930949
.setNegativeButton(R.string.share_playlist_with_list, (dialog, which) ->

‎app/src/main/java/org/schabi/newpipe/local/playlist/PlayListShareMode.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public enum PlayListShareMode {
44

5-
JUST_URLS
6-
,WITH_TITLES
7-
,YOUTUBE_TEMP_PLAYLIST
5+
JUST_URLS,
6+
WITH_TITLES,
7+
YOUTUBE_TEMP_PLAYLIST
88
}

‎app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java

+27-28
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,36 @@
1010
import org.schabi.newpipe.database.stream.model.StreamEntity;
1111
import org.schabi.newpipe.extractor.stream.StreamType;
1212

13-
import java.util.List;
1413
import java.util.stream.Stream;
1514

1615
public class LocalPlaylistFragmentTest {
1716

1817
@Test
19-
public void export_asYouTubeTempPlaylist() {
18+
public void exportAsYouTubeTempPlaylist() {
2019

21-
Stream<StreamEntity> entityStream = asStreamEntityStream(
20+
final Stream<StreamEntity> entityStream = asStreamEntityStream(
2221

23-
"https://www.youtube.com/watch?v=1"
24-
,"https://www.youtube.com/watch?v=2"
25-
,"https://www.youtube.com/watch?v=3"
22+
"https://www.youtube.com/watch?v=1",
23+
"https://www.youtube.com/watch?v=2",
24+
"https://www.youtube.com/watch?v=3"
2625
);
2726

28-
String url = LocalPlaylistFragment.export(YOUTUBE_TEMP_PLAYLIST, entityStream, null);
27+
final String url = LocalPlaylistFragment.export(YOUTUBE_TEMP_PLAYLIST, entityStream, null);
2928

3029
Assert.assertEquals("http://www.youtube.com/watch_videos?video_ids=1,2,3", url);
3130
}
3231

3332
@Test
34-
public void export_justUrls() {
33+
public void exportJustUrls() {
3534

36-
Stream<StreamEntity> entityStream = asStreamEntityStream(
35+
final Stream<StreamEntity> entityStream = asStreamEntityStream(
3736

38-
"https://www.youtube.com/watch?v=1"
39-
,"https://www.youtube.com/watch?v=2"
40-
,"https://www.youtube.com/watch?v=3"
37+
"https://www.youtube.com/watch?v=1",
38+
"https://www.youtube.com/watch?v=2",
39+
"https://www.youtube.com/watch?v=3"
4140
);
4241

43-
String exported = LocalPlaylistFragment.export(JUST_URLS, entityStream, null);
42+
final String exported = LocalPlaylistFragment.export(JUST_URLS, entityStream, null);
4443

4544
Assert.assertEquals("""
4645
https://www.youtube.com/watch?v=1
@@ -49,30 +48,30 @@ public void export_justUrls() {
4948
}
5049

5150
@NonNull
52-
private static Stream<StreamEntity> asStreamEntityStream(String... urls) {
51+
private static Stream<StreamEntity> asStreamEntityStream(final String... urls) {
5352

5453
return Stream.of(urls)
5554
.map(LocalPlaylistFragmentTest::newStreamEntity);
5655
}
5756

5857
@NonNull
59-
static StreamEntity newStreamEntity(String url) {
58+
static StreamEntity newStreamEntity(final String url) {
6059

6160
return new StreamEntity(
6261

63-
0
64-
, 1
65-
, url
66-
, "Title"
67-
, StreamType.VIDEO_STREAM
68-
, 100
69-
, "Uploader"
70-
, null
71-
, null
72-
, null
73-
, null
74-
, null
75-
, null
62+
0,
63+
1,
64+
url,
65+
"Title",
66+
StreamType.VIDEO_STREAM,
67+
100,
68+
"Uploader",
69+
null,
70+
null,
71+
null,
72+
null,
73+
null,
74+
null
7675
);
7776
}
7877
}

0 commit comments

Comments
 (0)