From 38eba2f6c9ed0b38192412b54d94c8b7cfbb8d04 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 22 May 2025 16:45:21 +0200 Subject: [PATCH] avoid NPE for eventEndTimeStamp Signed-off-by: Marcel Hibbe --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index cdcd0d377..974fd4708 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -675,7 +675,11 @@ class ChatActivity : SpreedFeatures.UNBIND_CONVERSATION ) ) { - val eventEndTimeStamp = currentConversation?.objectId?.split("#")[1]?.toLong() + val eventEndTimeStamp = + currentConversation?.objectId + ?.split("#") + ?.getOrNull(1) + ?.toLongOrNull() val currentTimeStamp = (System.currentTimeMillis() / 1000).toLong() val retentionPeriod = retentionOfEventRooms(spreedCapabilities) val isPastEvent = eventEndTimeStamp?.let { it < currentTimeStamp }