gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

set default emoji only when status icon is null

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-09-26 16:28:31 +02:00
parent 1347ec29c4
commit 25846fe23f
No known key found for this signature in database
GPG Key ID: F7AA2A8B65B50220
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt
View File

@ -58,7 +58,7 @@ data class Conversation(
@JsonField(name = ["actorType"]) @JsonField(name = ["actorType"])
var actorType: String = "", 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"]) @JsonField(name = ["isFavorite"])
var favorite: Boolean = false, var favorite: Boolean = false,

4
app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
View File

@ -176,7 +176,9 @@ class SetStatusDialogFragment :
setupGeneralStatusOptions() 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.clearStatus.setOnClickListener { clearStatus() }
binding.setStatus.setOnClickListener { setStatusMessage() } binding.setStatus.setOnClickListener { setStatusMessage() }

7
app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt
View File

@ -51,7 +51,7 @@ class ConversationConversionTest(
val conversationEntity = conversationJson.asEntity(1) val conversationEntity = conversationJson.asEntity(1)
assertNotNull(conversationEntity) assertNotNull(conversationEntity)
val apiVersion : Int = jsonFileName.substringAfterLast("APIv").first().digitToInt() val apiVersion: Int = jsonFileName.substringAfterLast("APIv").first().digitToInt()
checkConversationEntity(conversationEntity, apiVersion) checkConversationEntity(conversationEntity, apiVersion)
@ -61,10 +61,7 @@ class ConversationConversionTest(
checkConversationEntity(conversationEntityConvertedBack, apiVersion) checkConversationEntity(conversationEntityConvertedBack, apiVersion)
} }
private fun checkConversationEntity( private fun checkConversationEntity(conversationEntity: ConversationEntity, apiVersion: Int) {
conversationEntity: ConversationEntity,
apiVersion: Int
) {
assertEquals("1@juwd77g6", conversationEntity.internalId) assertEquals("1@juwd77g6", conversationEntity.internalId)
assertEquals(1, conversationEntity.accountId) assertEquals(1, conversationEntity.accountId)