From ab8a41182a4ca7d44b4761e1202cdabd7c399fe9 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Wed, 21 May 2025 12:11:55 +0200 Subject: [PATCH] add different object types for phone Signed-off-by: sowjanyakch --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 2 +- .../talk/models/json/conversations/ConversationEnums.kt | 3 ++- .../json/converters/ConversationObjectTypeConverter.kt | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) 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 fbb80e4c1..cdcd0d377 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -684,7 +684,7 @@ class ChatActivity : } } - if (currentConversation?.objectId == "phone" && + if (currentConversation?.objectType == ConversationEnums.ObjectType.PHONE_TEMPORARY && hasSpreedFeatureCapability( conversationUser?.capabilities!!.spreedCapability!!, SpreedFeatures.UNBIND_CONVERSATION diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/ConversationEnums.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/ConversationEnums.kt index bca14bf3b..56a8d9660 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/ConversationEnums.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/ConversationEnums.kt @@ -45,7 +45,8 @@ class ConversationEnums { FILE, ROOM, EVENT, - PHONE, + PHONE_TEMPORARY, + PHONE_PERSIST, INSTANT_MEETING } } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/ConversationObjectTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/ConversationObjectTypeConverter.kt index b0566332c..3171bf223 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/ConversationObjectTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/ConversationObjectTypeConverter.kt @@ -16,7 +16,8 @@ class ConversationObjectTypeConverter : StringBasedTypeConverter ConversationEnums.ObjectType.ROOM "file" -> ConversationEnums.ObjectType.FILE "event" -> ConversationEnums.ObjectType.EVENT - "phone" -> ConversationEnums.ObjectType.PHONE + "phone_persist" -> ConversationEnums.ObjectType.PHONE_PERSIST + "phone_temporary" -> ConversationEnums.ObjectType.PHONE_TEMPORARY "instant_meeting" -> ConversationEnums.ObjectType.INSTANT_MEETING else -> ConversationEnums.ObjectType.DEFAULT } @@ -32,7 +33,8 @@ class ConversationObjectTypeConverter : StringBasedTypeConverter "room" ConversationEnums.ObjectType.FILE -> "file" ConversationEnums.ObjectType.EVENT -> "event" - ConversationEnums.ObjectType.PHONE -> "phone" + ConversationEnums.ObjectType.PHONE_PERSIST -> "phone_persist" + ConversationEnums.ObjectType.PHONE_TEMPORARY -> "phone_temporary" ConversationEnums.ObjectType.INSTANT_MEETING -> "instant_meeting" else -> "" }