set default emoji only when status icon is null

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>

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,

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() }

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)