Skip to content

revert logic from event conversations PRs #5003

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

revert logic from event conversations PRs #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 13 additions & 37 deletions app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ class ConversationsListActivity :
private var conversationItemsWithHeader: MutableList<AbstractFlexibleItem<*>> = ArrayList()
private val searchableConversationItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
private var filterableConversationItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
private var nearFutureEventConversationItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
private var searchItem: MenuItem? = null
private var chooseAccountItem: MenuItem? = null
private var searchView: SearchView? = null
Expand Down Expand Up @@ -523,31 +522,20 @@ class ConversationsListActivity :
// Update Conversations
conversationItems.clear()
conversationItemsWithHeader.clear()
nearFutureEventConversationItems.clear()
searchableConversationItems.clear()

for (conversation in list) {
if (!isFutureEvent(conversation) && !conversation.hasArchived) {
addToNearFutureEventConversationItems(conversation)
}
addToConversationItems(conversation)
}

searchableConversationItems.addAll(conversationItemsWithHeader)
getFilterStates()
val noFiltersActive = !(
filterState[MENTION] == true ||
filterState[UNREAD] == true ||
filterState[ARCHIVE] == true
)

sortConversations(conversationItems)
sortConversations(conversationItemsWithHeader)
sortConversations(nearFutureEventConversationItems)
sortConversations(searchableConversationItems)

if (noFiltersActive && searchBehaviorSubject.value == false) {
adapter?.updateDataSet(nearFutureEventConversationItems, false)
} else {
applyFilter()
}
applyFilter()

Handler().postDelayed({ checkToShowUnreadBubble() }, UNREAD_BUBBLE_DELAY.toLong())

Expand Down Expand Up @@ -588,17 +576,6 @@ class ConversationsListActivity :
return conversation.objectType == ConversationEnums.ObjectType.EVENT && sixteenHoursAfterTimeStamp
}

fun showOnlyNearFutureEvents() {
sortConversations(nearFutureEventConversationItems)
adapter?.updateDataSet(nearFutureEventConversationItems, false)
adapter?.smoothScrollToPosition(0)
}

private fun addToNearFutureEventConversationItems(conversation: ConversationModel) {
val conversationItem = ConversationItem(conversation, currentUser!!, this, null, viewThemeUtils)
nearFutureEventConversationItems.add(conversationItem)
}

fun getFilterStates() {
val accountId = UserIdUtils.getIdForUser(currentUser)
filterState[UNREAD] = (
Expand Down Expand Up @@ -890,12 +867,7 @@ class ConversationsListActivity :
override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
adapter?.setHeadersShown(false)
searchBehaviorSubject.onNext(false)
if (!hasFilterEnabled()) filterableConversationItems = conversationItemsWithHeader
if (!hasFilterEnabled()) {
adapter?.updateDataSet(nearFutureEventConversationItems, false)
} else {
filterableConversationItems = conversationItems
}
applyFilter()
adapter?.hideAllHeaders()
if (searchHelper != null) {
// cancel any pending searches
Expand Down Expand Up @@ -1050,15 +1022,21 @@ class ConversationsListActivity :
this,
viewThemeUtils
)
conversationItems.add(conversationItem)

val conversationItemWithHeader = ConversationItem(
conversation,
currentUser!!,
this,
callHeaderItems[headerTitle],
viewThemeUtils
)
conversationItemsWithHeader.add(conversationItemWithHeader)

if (isFutureEvent(conversation)) {
searchableConversationItems.add(conversationItem)
} else {
conversationItems.add(conversationItem)
conversationItemsWithHeader.add(conversationItemWithHeader)
}
}

private fun showErrorDialog() {
Expand Down Expand Up @@ -1125,8 +1103,6 @@ class ConversationsListActivity :
}

private fun fetchOpenConversations(apiVersion: Int) {
searchableConversationItems.clear()
searchableConversationItems.addAll(conversationItemsWithHeader)
if (hasSpreedFeatureCapability(
currentUser!!.capabilities!!.spreedCapability!!,
SpreedFeatures.LISTABLE_ROOMS
Expand Down
21 changes: 0 additions & 21 deletions app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package com.nextcloud.talk.ui.dialog

import android.app.Dialog
import android.content.DialogInterface
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
Expand Down Expand Up @@ -100,14 +99,6 @@ class FilterConversationFragment : DialogFragment() {
}

binding.buttonClose.setOnClickListener {
val noFiltersActive = !(
filterState[MENTION] == true ||
filterState[UNREAD] == true ||
filterState[ARCHIVE] == true
)
if (noFiltersActive) {
(requireActivity() as ConversationsListActivity).showOnlyNearFutureEvents()
}
dismiss()
}
}
Expand Down Expand Up @@ -139,18 +130,6 @@ class FilterConversationFragment : DialogFragment() {
(requireActivity() as ConversationsListActivity).filterConversation()
}

override fun onDismiss(dialog: DialogInterface) {
super.onDismiss(dialog)
val noFiltersActive = !(
filterState[MENTION] == true ||
filterState[UNREAD] == true ||
filterState[ARCHIVE] == true
)
if (noFiltersActive) {
(requireActivity() as ConversationsListActivity).showOnlyNearFutureEvents()
}
}

companion object {
private const val FILTER_STATE_ARG = "FILTER_STATE_ARG"

Expand Down
Loading