Merge branch 'fix-sort-crash' of github.com:alexbakker/AboutLibraries…

… into alexbakker-fix-sort-crash
mikepenz · Mar 23, 2024 · 3d60dc9 · 3d60dc9
2 parents c220ad8 + c1820c9
commit 3d60dc9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/aboutlibraries/src/main/java/com/mikepenz/aboutlibraries/viewmodel/LibsViewModel.kt b/aboutlibraries/src/main/java/com/mikepenz/aboutlibraries/viewmodel/LibsViewModel.kt
@@ -6,6 +6,7 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
+import com.mikepenz.aboutlibraries.entity.Library
 import com.mikepenz.aboutlibraries.ui.item.HeaderItem
 import com.mikepenz.aboutlibraries.ui.item.LibraryItem
 import com.mikepenz.aboutlibraries.ui.item.LoaderItem
@@ -91,8 +92,9 @@ class LibsViewModel(
                 return@withContext
             }
 
-            if (builder.libraryComparator != null) {
-                Collections.sort(builtLibs.libraries, builder.libraryComparator)
+            var libraries: Iterable<Library> = builtLibs.libraries
+            builder.libraryComparator?.let {
+                libraries = builtLibs.libraries.sortedWith(it)
             }
 
             val finalList = mutableListOf<GenericItem>()
@@ -110,7 +112,7 @@ class LibsViewModel(
             }
 
             //add the libs
-            for (library in builtLibs.libraries) {
+            for (library in libraries) {
                 when {
                     builder.aboutMinimalDesign -> finalList.add(SimpleLibraryItem(library, builder))
                     else -> finalList.add(LibraryItem(library, builder))