From de8ec56184984dba507260418ffad50e20b65ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Mon, 3 Apr 2023 15:21:50 -0400 Subject: [PATCH] contact search: fix selection glitch GitLab: #1221 Change-Id: I4279891bde91c0d97bec3ed1058b401571f85728 --- .../cx/ring/tv/search/ContactSearchFragment.kt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt b/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt index 9905d61e0..06cc2f6a9 100644 --- a/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt +++ b/jami-android/app/src/main/java/cx/ring/tv/search/ContactSearchFragment.kt @@ -1,7 +1,5 @@ /* - * Copyright (C) 2004-2022 Savoir-faire Linux Inc. - * - * Author: Michel Schmit <michel.schmit@savoirfairelinux.com> + * Copyright (C) 2004-2023 Savoir-faire Linux Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,16 +56,10 @@ class ContactSearchFragment : BaseSearchFragment<ContactSearchPresenter>(), override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) mTextEditor = view.findViewById(R.id.lb_search_text_editor) - } - - override fun onResume() { - super.onResume() mTextEditor?.requestFocus() } - override fun getResultsAdapter(): ObjectAdapter { - return mRowsAdapter - } + override fun getResultsAdapter(): ObjectAdapter = mRowsAdapter override fun onQueryTextChange(newQuery: String): Boolean { presenter.queryTextChanged(newQuery) @@ -125,12 +117,6 @@ class ContactSearchFragment : BaseSearchFragment<ContactSearchPresenter>(), contacts.conversations.map { item -> ContactCard(item, Card.Type.CONTACT_ONLINE) }, diff) } } - if (scrollToTop) { - rowsSupportFragment.view?.postDelayed({ - rowsSupportFragment.verticalGridView.smoothScrollToPosition(0) - mTextEditor?.requestFocus() - }, 300) - } } override fun clearSearch() { -- GitLab