Merge pull request #4189 from nextcloud/backport/4177/stable-20.0

[stable-20.0] Bugfix/3993/fix flickering unread mention popup
nextcloud · Sep 11, 2024 · e492d32 · e492d32
2 parents e66c03d + 660d157
commit e492d32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -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,

diff --git a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
@@ -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)