Skip to content

Commit f1de353

Browse files
Use stream sorting.
1 parent b7a4456 commit f1de353

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,20 @@
33
import org.schabi.newpipe.database.LocalItem;
44
import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
55

6-
import java.util.ArrayList;
7-
import java.util.Collections;
86
import java.util.Comparator;
97
import java.util.List;
8+
import java.util.stream.Collectors;
9+
import java.util.stream.Stream;
1010

1111
public interface PlaylistLocalItem extends LocalItem {
1212
String getOrderingName();
1313

1414
static List<PlaylistLocalItem> merge(
1515
final List<PlaylistMetadataEntry> localPlaylists,
1616
final List<PlaylistRemoteEntity> remotePlaylists) {
17-
final List<PlaylistLocalItem> items = new ArrayList<>(
18-
localPlaylists.size() + remotePlaylists.size());
19-
items.addAll(localPlaylists);
20-
items.addAll(remotePlaylists);
21-
22-
Collections.sort(items, Comparator.comparing(PlaylistLocalItem::getOrderingName,
23-
Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
24-
25-
return items;
17+
return Stream.concat(localPlaylists.stream(), remotePlaylists.stream())
18+
.sorted(Comparator.comparing(PlaylistLocalItem::getOrderingName,
19+
Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)))
20+
.collect(Collectors.toList());
2621
}
2722
}

app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
import org.schabi.newpipe.util.external_communication.ShareUtils;
2727
import org.schabi.newpipe.util.external_communication.TextLinkifier;
2828

29-
import java.util.ArrayList;
30-
import java.util.Collections;
3129
import java.util.List;
30+
import java.util.stream.Collectors;
3231

3332
import icepick.State;
3433
import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -209,8 +208,8 @@ private void addTagsMetadataItem(final LayoutInflater inflater, final LinearLayo
209208
final ItemMetadataTagsBinding itemBinding
210209
= ItemMetadataTagsBinding.inflate(inflater, layout, false);
211210

212-
final List<String> tags = new ArrayList<>(streamInfo.getTags());
213-
Collections.sort(tags);
211+
final List<String> tags = streamInfo.getTags().stream().sorted()
212+
.collect(Collectors.toList());
214213
for (final String tag : tags) {
215214
final Chip chip = (Chip) inflater.inflate(R.layout.chip,
216215
itemBinding.metadataTagsChips, false);

0 commit comments

Comments
 (0)