From 194d4bfb01dcee15d6427d84372a75be35ceeee4 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 11 Feb 2020 23:06:54 +0100
Subject: [PATCH] Fix libraries comparator logic

Previously it could lead to contract violations for example consider
this:

A = Library{ Name:"A", Types: ["Sensors"] }
B = Library{ Name:"B", Types: null        }
C = Library{ Name:"C", Types: ["Arduino"] }

it results in:

A<B (because B has Types==null and compare("A","B")<0)
B<C (because B has Types==null and compare("B","C")<0)
C<A (becuase C has Types=="Arduino" and the comparator returns -1)

This commit fix this behavior
---
 .../ui/ContributedLibraryReleasesComparator.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
index b302306523c..11436b2ccfb 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryReleasesComparator.java
@@ -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> {
 
@@ -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);
     }