Skip to content
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.

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

Sort a copy of the list of libraries to prevent a crash #967

Merged
merged 1 commit into from Mar 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -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
Expand Down Expand Up @@ -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>()
Expand All @@ -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))
Expand Down