Skip to content

Commit edf868a

Browse files
authored
Merge pull request #6518 from nextcloud/bugfix/noid/fixNpeInConversationCreationActivity
fix NPE in ConversationCreationActivity
2 parents f68715a + baa0902 commit edf868a

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ fun ConversationCreationScreen(
244244

245245
if (
246246
CapabilitiesUtil.hasSpreedFeatureCapability(
247-
conversationCreationViewModel.currentUser.capabilities?.spreedCapability!!,
247+
conversationCreationViewModel.currentUser.capabilities?.spreedCapability,
248248
SpreedFeatures.CONVERSATION_PRESETS
249249
)
250250
) {
@@ -362,14 +362,14 @@ fun ConversationNameAndDescription(conversationCreationViewModel: ConversationCr
362362
onValueChange = {
363363
if (it.length > CapabilitiesUtil.conversationDescriptionLength(
364364
conversationCreationViewModel.currentUser
365-
.capabilities?.spreedCapability!!
365+
.capabilities?.spreedCapability
366366
)
367367
) {
368368
conversationCreationViewModel.updateConversationDescription(
369369
it.take(
370370
CapabilitiesUtil.conversationDescriptionLength(
371371
conversationCreationViewModel.currentUser
372-
.capabilities?.spreedCapability!!
372+
.capabilities?.spreedCapability
373373
)
374374
)
375375
)

app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ object CapabilitiesUtil {
161161
return DEFAULT_MAX_GIF_SIZE
162162
}
163163

164-
fun conversationDescriptionLength(spreedCapabilities: SpreedCapability): Int {
165-
if (spreedCapabilities.config?.containsKey("conversations") == true) {
164+
fun conversationDescriptionLength(spreedCapabilities: SpreedCapability?): Int {
165+
if (spreedCapabilities?.config?.containsKey("conversations") == true) {
166166
val map: Map<String, Any>? = spreedCapabilities.config!!["conversations"]
167167
if (map != null && map.containsKey("description-length")) {
168168
return (map["description-length"].toString().toInt())

0 commit comments

Comments
 (0)