mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-27 06:35:37 +01:00
Merge pull request #5128 from nextcloud/backport/5124/stable-21.1
[stable-21.1] Crash fix
This commit is contained in:
commit
6db5418034
@ -298,7 +298,7 @@ class ConversationsListActivity :
|
|||||||
} else {
|
} else {
|
||||||
binding.loadingContent.visibility = View.GONE
|
binding.loadingContent.visibility = View.GONE
|
||||||
}
|
}
|
||||||
adapter!!.addListener(this)
|
adapter?.addListener(this)
|
||||||
prepareViews()
|
prepareViews()
|
||||||
|
|
||||||
showNotificationWarning()
|
showNotificationWarning()
|
||||||
@ -314,9 +314,11 @@ class ConversationsListActivity :
|
|||||||
showServerEOLDialog()
|
showServerEOLDialog()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
|
currentUser?.capabilities?.spreedCapability?.let { spreedCapabilities ->
|
||||||
|
if (isUnifiedSearchAvailable(spreedCapabilities)) {
|
||||||
searchHelper = MessageSearchHelper(unifiedSearchRepository)
|
searchHelper = MessageSearchHelper(unifiedSearchRepository)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token)
|
credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token)
|
||||||
|
|
||||||
loadUserAvatar(binding.switchAccountButton)
|
loadUserAvatar(binding.switchAccountButton)
|
||||||
|
Loading…
Reference in New Issue
Block a user