Skip to content

Fix libraries comparator logic in library manager #9748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Fix libraries comparator logic in library manager #9748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.contributions.libraries.ContributedLibraryReleases;

import java.util.Arrays;
import java.util.Comparator;
import java.util.List;

public class ContributedLibraryReleasesComparator implements Comparator<ContributedLibraryReleases> {

Expand All @@ -47,9 +49,11 @@ public int compare(ContributedLibraryReleases o1, ContributedLibraryReleases o2)
ContributedLibrary lib1 = o1.getLatest();
ContributedLibrary lib2 = o2.getLatest();

if (lib1.getTypes() == null || lib2.getTypes() == null) {
return compareName(lib1, lib2);
}
List<String> types1 = lib1.getTypes();
List<String> types2 = lib2.getTypes();
if (types1 == null) types1 = Arrays.asList();
if (types2 == null) types2 = Arrays.asList();

if (lib1.getTypes().contains(firstType) && lib2.getTypes().contains(firstType)) {
return compareName(lib1, lib2);
}
Expand Down