Эх сурвалжийг харах

fix availability of search feature.

Hide search feature if room is federated.
Also, for conversation list the check for federation inside isUnifiedSearchAvailable makes no sense.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
Marcel Hibbe 9 сар өмнө
parent
commit
305f1732ba

+ 3 - 1
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -2825,7 +2825,9 @@ class ChatActivity :
             }
             }
 
 
             val searchItem = menu.findItem(R.id.conversation_search)
             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 ||
             if (currentConversation!!.remoteServer != null ||
                 !CapabilitiesUtil.isSharedItemsAvailable(spreedCapabilities)
                 !CapabilitiesUtil.isSharedItemsAvailable(spreedCapabilities)

+ 0 - 3
app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt

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