From c6b87cd3169056b1feb301d26763918ea0caa2e7 Mon Sep 17 00:00:00 2001 From: "Thiago F. G. Albuquerque" Date: Tue, 18 Feb 2025 20:59:13 -0300 Subject: [PATCH] [#11930] Making CheckStyle happy --- .../local/playlist/LocalPlaylistFragment.java | 69 ++++++++++++------- .../local/playlist/PlayListShareMode.java | 6 +- .../playlist/LocalPlaylistFragmentTest.java | 55 ++++++++------- 3 files changed, 74 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java index 3e99b01c4..354985b85 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java @@ -399,27 +399,39 @@ public class LocalPlaylistFragment extends BaseLocalListFragment Single.just(export( shareMode - , playlist.stream().map(PlaylistStreamEntry::getStreamEntity) - , context - ) - )) + .flatMapSingle(playlist -> Single.just(export( + + shareMode, + playlist.stream().map(PlaylistStreamEntry::getStreamEntity), + context + ))) .observeOn(AndroidSchedulers.mainThread()) - .subscribe( urlsText -> ShareUtils.shareText( context - , name - , shareMode == JUST_URLS ? urlsText - : context.getString(R.string.share_playlist_content_details, name, urlsText)) - , throwable -> showUiErrorSnackbar(this, "Sharing playlist", throwable)) - ); + .subscribe( + urlsText -> { + + final String content = shareMode == JUST_URLS + ? urlsText + : context.getString(R.string.share_playlist_content_details, + name, + urlsText + ); + + ShareUtils.shareText(context, name, content); + }, + throwable -> showUiErrorSnackbar(this, "Sharing playlist", throwable) + ) + ); } - static String export(PlayListShareMode shareMode, Stream entityStream, Context context) { + static String export(final PlayListShareMode shareMode, + final Stream entityStream, + final Context context) { - return switch(shareMode) { + return switch (shareMode) { case WITH_TITLES -> exportWithTitles(entityStream, context); case JUST_URLS -> exportJustUrls(entityStream); @@ -427,23 +439,27 @@ public class LocalPlaylistFragment extends BaseLocalListFragment entityStream, Context context) { + static String exportWithTitles(final Stream entityStream, final Context context) { return entityStream - .map(entity -> context.getString(R.string.video_details_list_item, entity.getTitle(), entity.getUrl())) + .map(entity -> context.getString(R.string.video_details_list_item, + entity.getTitle(), + entity.getUrl() + ) + ) .collect(Collectors.joining("\n")); } - static String exportJustUrls(Stream entityStream) { + static String exportJustUrls(final Stream entityStream) { return entityStream .map(StreamEntity::getUrl) .collect(Collectors.joining("\n")); } - static String exportAsYoutubeTempPlaylist(Stream entityStream) { + static String exportAsYoutubeTempPlaylist(final Stream entityStream) { - String videoIDs = entityStream + final String videoIDs = entityStream .map(entity -> getYouTubeId(entity.getUrl())) .collect(Collectors.joining(",")); @@ -451,15 +467,17 @@ public class LocalPlaylistFragment extends BaseLocalListFragment sharePlaylist(WITH_TITLES) ) - .setNeutralButton("Share as YouTube temporary playlist", (dialog, which) -> // TODO R.string.share_playlist_as_YouTube_temporary_playlist + // TODO R.string.share_playlist_as_YouTube_temporary_playlist + .setNeutralButton("Share as YouTube temporary playlist", (dialog, which) -> sharePlaylist(YOUTUBE_TEMP_PLAYLIST) ) .setNegativeButton(R.string.share_playlist_with_list, (dialog, which) -> diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/PlayListShareMode.java b/app/src/main/java/org/schabi/newpipe/local/playlist/PlayListShareMode.java index 3de1effc9..f0433aba8 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/PlayListShareMode.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/PlayListShareMode.java @@ -2,7 +2,7 @@ package org.schabi.newpipe.local.playlist; public enum PlayListShareMode { - JUST_URLS - ,WITH_TITLES - ,YOUTUBE_TEMP_PLAYLIST + JUST_URLS, + WITH_TITLES, + YOUTUBE_TEMP_PLAYLIST } diff --git a/app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java b/app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java index 12242ad1d..170193155 100644 --- a/app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java +++ b/app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java @@ -10,37 +10,36 @@ import org.junit.Test; import org.schabi.newpipe.database.stream.model.StreamEntity; import org.schabi.newpipe.extractor.stream.StreamType; -import java.util.List; import java.util.stream.Stream; public class LocalPlaylistFragmentTest { @Test - public void export_asYouTubeTempPlaylist() { + public void exportAsYouTubeTempPlaylist() { - Stream entityStream = asStreamEntityStream( + final Stream entityStream = asStreamEntityStream( - "https://www.youtube.com/watch?v=1" - ,"https://www.youtube.com/watch?v=2" - ,"https://www.youtube.com/watch?v=3" + "https://www.youtube.com/watch?v=1", + "https://www.youtube.com/watch?v=2", + "https://www.youtube.com/watch?v=3" ); - String url = LocalPlaylistFragment.export(YOUTUBE_TEMP_PLAYLIST, entityStream, null); + final String url = LocalPlaylistFragment.export(YOUTUBE_TEMP_PLAYLIST, entityStream, null); Assert.assertEquals("http://www.youtube.com/watch_videos?video_ids=1,2,3", url); } @Test - public void export_justUrls() { + public void exportJustUrls() { - Stream entityStream = asStreamEntityStream( + final Stream entityStream = asStreamEntityStream( - "https://www.youtube.com/watch?v=1" - ,"https://www.youtube.com/watch?v=2" - ,"https://www.youtube.com/watch?v=3" + "https://www.youtube.com/watch?v=1", + "https://www.youtube.com/watch?v=2", + "https://www.youtube.com/watch?v=3" ); - String exported = LocalPlaylistFragment.export(JUST_URLS, entityStream, null); + final String exported = LocalPlaylistFragment.export(JUST_URLS, entityStream, null); Assert.assertEquals(""" https://www.youtube.com/watch?v=1 @@ -49,30 +48,30 @@ public class LocalPlaylistFragmentTest { } @NonNull - private static Stream asStreamEntityStream(String... urls) { + private static Stream asStreamEntityStream(final String... urls) { return Stream.of(urls) .map(LocalPlaylistFragmentTest::newStreamEntity); } @NonNull - static StreamEntity newStreamEntity(String url) { + static StreamEntity newStreamEntity(final String url) { return new StreamEntity( - 0 - , 1 - , url - , "Title" - , StreamType.VIDEO_STREAM - , 100 - , "Uploader" - , null - , null - , null - , null - , null - , null + 0, + 1, + url, + "Title", + StreamType.VIDEO_STREAM, + 100, + "Uploader", + null, + null, + null, + null, + null, + null ); } }