gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-09 13:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix that contact in search is clickable

Browse Source 
A contact (so not a conversation yet!) had the VIEW_TYPE 2131558677, but 2131558687 was expected to identify the type, see FlexibleViewType.kt

The checks in onItemClick are replaced to directly change the type via kotlin "is" method.

best solution for future: FlexibleAdapter should be removed!-> replace with Compose!

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2025-07-07 10:43:09 +02:00
parent 7f6f077680
commit 02476b10ae
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt
View File

@ -194,7 +194,6 @@ class ContactItem(
} }
companion object { companion object {
const val VIEW_TYPE = FlexibleItemViewType.CONTACT_ITEM
private const val FULLY_OPAQUE: Float = 1.0f private const val FULLY_OPAQUE: Float = 1.0f
private const val SEMI_TRANSPARENT: Float = 0.38f private const val SEMI_TRANSPARENT: Float = 0.38f
} }

1
app/src/main/java/com/nextcloud/talk/adapters/items/FlexibleItemViewType.kt
View File

@ -14,5 +14,4 @@ object FlexibleItemViewType {
const val POLL_RESULT_HEADER_ITEM: Int = 1120391234 const val POLL_RESULT_HEADER_ITEM: Int = 1120391234
const val POLL_RESULT_VOTER_ITEM: Int = 1120391235 const val POLL_RESULT_VOTER_ITEM: Int = 1120391235
const val POLL_RESULT_VOTERS_OVERVIEW_ITEM: Int = 1120391236 const val POLL_RESULT_VOTERS_OVERVIEW_ITEM: Int = 1120391236
const val CONTACT_ITEM: Int = 2131558687
} }

21
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View File

@ -163,7 +163,6 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import retrofit2.HttpException import retrofit2.HttpException
import java.io.File import java.io.File
import java.util.Objects
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
@ -1481,10 +1480,9 @@ class ConversationsListActivity :
override fun onItemClick(view: View, position: Int): Boolean { override fun onItemClick(view: View, position: Int): Boolean {
val item = adapter?.getItem(position) val item = adapter?.getItem(position)
if (item != null) { if (item != null) {
when (item.itemViewType) { when (item) {
MessageResultItem.VIEW_TYPE -> { is MessageResultItem -> {
val messageItem: MessageResultItem = item as MessageResultItem val token = item.messageEntry.conversationToken
val token = messageItem.messageEntry.conversationToken
val conversationName = ( val conversationName = (
conversationItems.first { conversationItems.first {
(it is ConversationItem) && it.model.token == token (it is ConversationItem) && it.model.token == token
@ -1498,27 +1496,26 @@ class ConversationsListActivity :
bundle.putString(BundleKeys.KEY_CREDENTIALS, credentials!!) bundle.putString(BundleKeys.KEY_CREDENTIALS, credentials!!)
bundle.putString(BundleKeys.KEY_BASE_URL, currentUser!!.baseUrl) bundle.putString(BundleKeys.KEY_BASE_URL, currentUser!!.baseUrl)
bundle.putString(KEY_ROOM_TOKEN, token) bundle.putString(KEY_ROOM_TOKEN, token)
bundle.putString(BundleKeys.KEY_MESSAGE_ID, messageItem.messageEntry.messageId) bundle.putString(BundleKeys.KEY_MESSAGE_ID, item.messageEntry.messageId)
bundle.putString(BundleKeys.KEY_CONVERSATION_NAME, conversationName) bundle.putString(BundleKeys.KEY_CONVERSATION_NAME, conversationName)
ContextChatCompose(bundle).GetDialogView(shouldDismiss, context) ContextChatCompose(bundle).GetDialogView(shouldDismiss, context)
} }
} }
} }
LoadMoreResultsItem.VIEW_TYPE -> { is LoadMoreResultsItem -> {
loadMoreMessages() loadMoreMessages()
} }
ConversationItem.VIEW_TYPE -> { is ConversationItem -> {
handleConversation((Objects.requireNonNull(item) as ConversationItem).model) handleConversation(item.model)
} }
ContactItem.VIEW_TYPE -> { is ContactItem -> {
val contact = item as ContactItem
contactsViewModel.createRoom( contactsViewModel.createRoom(
ROOM_TYPE_ONE_ONE, ROOM_TYPE_ONE_ONE,
null, null,
contact.model.actorId!!, item.model.actorId!!,
null null
) )
} }

9
app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
View File

@ -148,13 +148,12 @@ class MessageSearchActivity : BaseActivity() {
adapter!!.addListener(object : FlexibleAdapter.OnItemClickListener { adapter!!.addListener(object : FlexibleAdapter.OnItemClickListener {
override fun onItemClick(view: View?, position: Int): Boolean { override fun onItemClick(view: View?, position: Int): Boolean {
val item = adapter!!.getItem(position) val item = adapter!!.getItem(position)
when (item?.itemViewType) { when (item) {
LoadMoreResultsItem.VIEW_TYPE -> { is LoadMoreResultsItem -> {
viewModel.loadMore() viewModel.loadMore()
} }
MessageResultItem.VIEW_TYPE -> { is MessageResultItem -> {
val messageItem = item as MessageResultItem viewModel.selectMessage(item.messageEntry)
viewModel.selectMessage(messageItem.messageEntry)
} }
} }
return false return false