diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index d255b78c1..f60609b4a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -698,27 +698,27 @@ class LibraryPresenter( } val group = grouping.find { it.first == trackManager.mapTrackingOrder(status, context).toString() } if (group != null) { - map[group.second]?.plusAssign(libraryItem) ?: map.put(group.second, mutableListOf(libraryItem)) + map.getOrPut(group.second) { mutableListOf() } += libraryItem } else { - map[7]?.plusAssign(libraryItem) ?: map.put(7, mutableListOf(libraryItem)) + map.getOrPut(7) { mutableListOf() } += libraryItem } } LibraryGroup.BY_SOURCE -> { val group = grouping.find { it.first.toLongOrNull() == libraryItem.manga.source } if (group != null) { - map[group.second]?.plusAssign(libraryItem) ?: map.put(group.second, mutableListOf(libraryItem)) + map.getOrPut(group.second) { mutableListOf() } += libraryItem } else { if (grouping.all { it.second != Int.MAX_VALUE }) grouping += Triple(Int.MAX_VALUE.toString(), Int.MAX_VALUE, context.getString(R.string.unknown)) - map[Int.MAX_VALUE]?.plusAssign(libraryItem) ?: map.put(Int.MAX_VALUE, mutableListOf(libraryItem)) + map.getOrPut(Int.MAX_VALUE) { mutableListOf() } += libraryItem } } else -> { val group = grouping.find { it.second == libraryItem.manga.status } if (group != null) { - map[group.second]?.plusAssign(libraryItem) ?: map.put(group.second, mutableListOf(libraryItem)) + map.getOrPut(group.second) { mutableListOf() } += libraryItem } else { if (grouping.all { it.second != Int.MAX_VALUE }) grouping += Triple(Int.MAX_VALUE.toString(), Int.MAX_VALUE, context.getString(R.string.unknown)) - map[Int.MAX_VALUE]?.plusAssign(libraryItem) ?: map.put(Int.MAX_VALUE, mutableListOf(libraryItem)) + map.getOrPut(Int.MAX_VALUE) { mutableListOf() } += libraryItem } } } @@ -730,11 +730,12 @@ class LibraryPresenter( LibraryGroup.BY_TRACK_STATUS, LibraryGroup.BY_STATUS -> grouping.filter { it.second in map.keys } else -> grouping } - ).map { - val category = Category.create(it.third) - category.id = it.second - category - } + ) + .map { + val category = Category.create(it.third) + category.id = it.second + category + } return map to categories } diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index 566316eb9..f1d80f270 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -11,7 +11,7 @@ import com.afollestad.materialdialogs.list.listItemsSingleChoice import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EhActivityInterceptBinding import eu.kanade.tachiyomi.source.online.UrlImportableSource -import eu.kanade.tachiyomi.ui.base.activity.BaseActivity +import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController import exh.GalleryAddEvent @@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -class InterceptActivity : BaseActivity() { +class InterceptActivity : BaseViewBindingActivity() { private var statusJob: Job? = null override fun onCreate(savedInstanceState: Bundle?) {