Merge pull request #5128 from nextcloud/backport/5124/stable-21.1

[stable-21.1] Crash fix
This commit is contained in:
Sowjanya Kota 2025-07-07 12:45:05 +02:00 committed by GitHub
commit 6db5418034
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -298,7 +298,7 @@ class ConversationsListActivity :
} else {
binding.loadingContent.visibility = View.GONE
}
adapter!!.addListener(this)
adapter?.addListener(this)
prepareViews()
showNotificationWarning()
@ -314,9 +314,11 @@ class ConversationsListActivity :
showServerEOLDialog()
return
}
if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
currentUser?.capabilities?.spreedCapability?.let { spreedCapabilities ->
if (isUnifiedSearchAvailable(spreedCapabilities)) {
searchHelper = MessageSearchHelper(unifiedSearchRepository)
}
}
credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token)
loadUserAvatar(binding.switchAccountButton)