From e08a4cf1b25649759ee8052bda3d13abcdf69e1f Mon Sep 17 00:00:00 2001 From: Koitharu Date: Mon, 21 Jun 2021 17:50:16 +0300 Subject: [PATCH] Fix crash if title is empty --- .../java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt | 1 + app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt index 03cfdbbe4..d8c3db0c4 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt @@ -35,6 +35,7 @@ class ShortcutsRepository( if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity) + .filter { x -> x.title.isNotEmpty() } .map { buildShortcutInfo(it).build().toShortcutInfo() } manager.dynamicShortcuts = shortcuts } diff --git a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt index 587d2cdef..d0b42326b 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt @@ -4,6 +4,7 @@ import org.koin.android.ext.koin.androidContext import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.core.qualifier.named import org.koin.dsl.module +import org.koitharu.kotatsu.core.model.MangaSource import org.koitharu.kotatsu.search.domain.MangaSearchRepository import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider import org.koitharu.kotatsu.search.ui.SearchViewModel @@ -18,7 +19,7 @@ val searchModule factory { MangaSuggestionsProvider.createSuggestions(androidContext()) } viewModel { params -> - SearchViewModel(get(named(params[0])), params[1], get()) + SearchViewModel(get(named(params.get(0))), params[1], get()) } viewModel { query -> GlobalSearchViewModel(query.get(), get(), get())