From b9667e45c070beb211af26ae4119e246c163a478 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Fri, 4 Jul 2025 21:33:47 +0200 Subject: [PATCH 1/2] fix crash Signed-off-by: sowjanyakch --- .../talk/conversationlist/ConversationsListActivity.kt | 4 ++-- 1 file changed, 2 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 7e6aed885..408aaff7e 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -300,7 +300,7 @@ class ConversationsListActivity : } else { binding.loadingContent.visibility = View.GONE } - adapter!!.addListener(this) + adapter?.addListener(this) prepareViews() showNotificationWarning() @@ -316,7 +316,7 @@ class ConversationsListActivity : showServerEOLDialog() return } - if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) { + if (isUnifiedSearchAvailable(currentUser!!.capabilities?.spreedCapability!!)) { searchHelper = MessageSearchHelper(unifiedSearchRepository) } credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token) From b3e89633fa1ebca506ae454b24d426601e8f212e Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Fri, 4 Jul 2025 22:15:39 +0200 Subject: [PATCH 2/2] avoid null Signed-off-by: sowjanyakch --- .../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 408aaff7e..3bf56e138 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -316,8 +316,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)