From b6f92a10a429a09bc38b6061a6a6f27b03602274 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Fri, 4 Jul 2025 22:15:39 +0200
Subject: [PATCH] avoid null

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../talk/conversationlist/ConversationsListActivity.kt      | 6 ++++--
 1 file changed, 4 insertions(+), 2 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
index 426761dd6..3d87f1c12 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -314,8 +314,10 @@ class ConversationsListActivity :
                 showServerEOLDialog()
                 return
             }
-            if (isUnifiedSearchAvailable(currentUser!!.capabilities?.spreedCapability!!)) {
-                searchHelper = MessageSearchHelper(unifiedSearchRepository)
+            currentUser?.capabilities?.spreedCapability?.let { spreedCapabilities ->
+                if (isUnifiedSearchAvailable(spreedCapabilities)) {
+                    searchHelper = MessageSearchHelper(unifiedSearchRepository)
+                }
             }
             credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token)