Merge pull request #4306 from nextcloud/bugfix/4276/fixSearchAvailabi…

…lity Bugfix/4276/fix search availability
nextcloud · Oct 2, 2024 · 3073279 · 3073279
2 parents f6b1007 + ce8143a
commit 3073279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -2070,7 +2070,7 @@ class ChatActivity :
  private fun onMessageSearchResult(intent: Intent?) {
  val messageId = intent?.getStringExtra(MessageSearchActivity.RESULT_KEY_MESSAGE_ID)
  messageId?.let { id ->
- scrollToMessageWithId(id)
+ scrollToAndCenterMessageWithId(id)
  }
  }
 
@@ -2825,7 +2825,9 @@ class ChatActivity :
  }
 
  val searchItem = menu.findItem(R.id.conversation_search)
- searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities)
+
+ searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) &&
+ currentConversation!!.remoteServer.isNullOrEmpty()
 
  if (currentConversation!!.remoteServer != null ||
  !CapabilitiesUtil.isSharedItemsAvailable(spreedCapabilities)

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,9 +161,6 @@ object CapabilitiesUtil {
  }
 
  fun isUnifiedSearchAvailable(spreedCapabilities: SpreedCapability): Boolean {
- if (!hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.FEDERATION_V1)) {
- return false
- }
  return hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.UNIFIED_SEARCH)
  }