gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-02-08 15:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4177 from nextcloud/bugfix/3993/fixFlickeringUnreadMentionPopup

Browse Source 
Bugfix/3993/fix flickering unread mention popup
This commit is contained in:
Sowjanya Kota 2024-09-11 11:43:51 +02:00 committed by GitHub
commit 58474dd97f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,9 +667,9 @@ class ConversationsListActivity :
if (searchHelper != null) {
// cancel any pending searches
searchHelper!!.cancelSearch()
binding.swipeRefreshLayoutView?.isRefreshing = false
searchBehaviorSubject.onNext(false)
}
binding.swipeRefreshLayoutView?.isRefreshing = false
searchBehaviorSubject.onNext(false)
binding.swipeRefreshLayoutView?.isEnabled = true
searchView!!.onActionViewCollapsed()
@ -1009,13 +1009,15 @@ class ConversationsListActivity :
newFragment.show(supportFragmentManager, FilterConversationFragment.TAG)
}
binding.newMentionPopupBubble?.hide()
binding.newMentionPopupBubble?.setPopupBubbleListener {
binding.recyclerView?.smoothScrollToPosition(
nextUnreadConversationScrollPosition
binding.newMentionPopupBubble.hide()
binding.newMentionPopupBubble.setPopupBubbleListener {
val layoutManager = binding.recyclerView.layoutManager as SmoothScrollLinearLayoutManager?
layoutManager?.scrollToPositionWithOffset(
nextUnreadConversationScrollPosition,
binding.recyclerView.height / 3
)
}
binding.newMentionPopupBubble?.let { viewThemeUtils.material.colorMaterialButtonPrimaryFilled(it) }
binding.newMentionPopupBubble.let { viewThemeUtils.material.colorMaterialButtonPrimaryFilled(it) }
}
private fun hideLogoForBrandedClients() {
@ -1039,14 +1041,14 @@ class ConversationsListActivity :
val position = adapter!!.getGlobalPositionOf(flexItem)
if (hasUnreadItems(conversation) && position > lastVisibleItem) {
nextUnreadConversationScrollPosition = position
if (!binding.newMentionPopupBubble?.isShown!!) {
binding.newMentionPopupBubble?.show()
if (!binding.newMentionPopupBubble.isShown) {
binding.newMentionPopupBubble.show()
}
return@subscribe
}
nextUnreadConversationScrollPosition = 0
binding.newMentionPopupBubble?.hide()
}
nextUnreadConversationScrollPosition = 0
binding.newMentionPopupBubble.hide()
} catch (e: NullPointerException) {
Log.d(
TAG,

2
app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
View File

@ -161,7 +161,7 @@ object CapabilitiesUtil {
}
fun isUnifiedSearchAvailable(spreedCapabilities: SpreedCapability): Boolean {
if (hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.FEDERATION_V1)) {
if (!hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.FEDERATION_V1)) {
return false
}
return hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.UNIFIED_SEARCH)