Skip to content

Commit baa0902

Browse files
committed
fix NPE in ConversationCreationActivity
also avoid not nullable spreedCapabilities elsewhere in this class. It may not solve the root cause and may lead to unexpected behavior but at least will not crash. java.lang.NullPointerException at com.nextcloud.talk.conversationcreation.ConversationCreationActivityKt.ConversationCreationScreen$lambda$5(ConversationCreationActivity.kt:230) at com.nextcloud.talk.conversationcreation.ConversationCreationActivityKt$$ExternalSyntheticLambda29.invoke(D8$$SyntheticClass:0) at androidx.compose.runtime.internal.ComposableLambdaImpl.invoke(ComposableLambda.kt:131) at androidx.compose.runtime.internal.ComposableLambdaImpl.invoke(ComposableLambda.kt:52) at androidx.compose.material3.ScaffoldKt$ScaffoldLayout$bodyContent$1$1.invoke(Scaffold.kt:163) at androidx.compose.material3.ScaffoldKt$ScaffoldLayout$bodyContent$1$1.invoke(Scaffold.kt:163) Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent a43b9d2 commit baa0902

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)