From 25846fe23f844f7ae1e04dd79aec8aa3fa6c288e Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Thu, 26 Sep 2024 16:28:31 +0200 Subject: [PATCH] set default emoji only when status icon is null Signed-off-by: sowjanyakch --- .../talk/models/json/conversations/Conversation.kt | 2 +- .../nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt | 4 +++- .../com/nextcloud/talk/json/ConversationConversionTest.kt | 7 ++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index 65cd280c9..af0757c85 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt @@ -58,7 +58,7 @@ data class Conversation( @JsonField(name = ["actorType"]) var actorType: String = "", - var password: String? = null, //check if this can be removed.Does not belong to api response but is used internally? + var password: String? = null, // check if this can be removed.Does not belong to api response but is used internally? @JsonField(name = ["isFavorite"]) var favorite: Boolean = false, diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index 940f198ba..96e6d8692 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -176,7 +176,9 @@ class SetStatusDialogFragment : setupGeneralStatusOptions() - binding.emoji.setText(getString(R.string.default_emoji)) + if (currentStatus?.icon == null) { + binding.emoji.setText(getString(R.string.default_emoji)) + } binding.clearStatus.setOnClickListener { clearStatus() } binding.setStatus.setOnClickListener { setStatusMessage() } diff --git a/app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt b/app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt index 1b44293b8..7508bccbf 100644 --- a/app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt +++ b/app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt @@ -51,7 +51,7 @@ class ConversationConversionTest( val conversationEntity = conversationJson.asEntity(1) assertNotNull(conversationEntity) - val apiVersion : Int = jsonFileName.substringAfterLast("APIv").first().digitToInt() + val apiVersion: Int = jsonFileName.substringAfterLast("APIv").first().digitToInt() checkConversationEntity(conversationEntity, apiVersion) @@ -61,10 +61,7 @@ class ConversationConversionTest( checkConversationEntity(conversationEntityConvertedBack, apiVersion) } - private fun checkConversationEntity( - conversationEntity: ConversationEntity, - apiVersion: Int - ) { + private fun checkConversationEntity(conversationEntity: ConversationEntity, apiVersion: Int) { assertEquals("1@juwd77g6", conversationEntity.internalId) assertEquals(1, conversationEntity.accountId)