diff --git a/app/src/main/java/io/xxlabs/messenger/requests/ui/RequestsViewModel.kt b/app/src/main/java/io/xxlabs/messenger/requests/ui/RequestsViewModel.kt index 85fe5942da16cc55f42ed5336f47be804209cca2..3873c490cb801c1fc3ac1310b7c9e1b62e2502b6 100644 --- a/app/src/main/java/io/xxlabs/messenger/requests/ui/RequestsViewModel.kt +++ b/app/src/main/java/io/xxlabs/messenger/requests/ui/RequestsViewModel.kt @@ -381,7 +381,7 @@ class RequestsViewModel @Inject constructor( when (request.request.requestStatus) { RECEIVED -> retryVerification(request).also { actionQueue.remove(request.id) } VERIFYING -> showVerifyingInfo().also { actionQueue.remove(request.id) } - SEND_FAIL, SENT -> resendRequest(request) + RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> resendRequest(request) VERIFICATION_FAIL -> retryVerification(request) } } diff --git a/app/src/main/java/io/xxlabs/messenger/requests/ui/list/adapter/RequestItem.kt b/app/src/main/java/io/xxlabs/messenger/requests/ui/list/adapter/RequestItem.kt index 62f2f5d5a804ab8d2afeac41a0f741ecbf642ae5..8bc44075ba7f574fb47810d831bd51813af9076e 100644 --- a/app/src/main/java/io/xxlabs/messenger/requests/ui/list/adapter/RequestItem.kt +++ b/app/src/main/java/io/xxlabs/messenger/requests/ui/list/adapter/RequestItem.kt @@ -25,7 +25,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { when (request.requestStatus) { VERIFYING -> appContext().getString(R.string.request_item_action_verifying) VERIFICATION_FAIL -> appContext().getString(R.string.request_item_action_failed_verification) - SEND_FAIL, SENT -> appContext().getString(R.string.request_item_action_retry) + RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> appContext().getString(R.string.request_item_action_retry) RESENT -> appContext().getString(R.string.request_item_action_resent) else -> null } @@ -33,7 +33,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { open val actionIcon: Int? = when (request.requestStatus) { VERIFICATION_FAIL -> R.drawable.ic_info_outline_24dp - SEND_FAIL, SENT -> R.drawable.ic_retry + RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> R.drawable.ic_retry RESENT -> R.drawable.ic_check_green else -> null } @@ -41,7 +41,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { open val actionIconColor: Int? = when (request.requestStatus) { VERIFICATION_FAIL -> R.color.accent_danger - SEND_FAIL, SENT-> R.color.brand_default + RESET_FAIL, RESET_SENT, SEND_FAIL, SENT-> R.color.brand_default RESENT -> R.color.accent_success else -> null } @@ -51,7 +51,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { when (request.requestStatus) { VERIFYING -> R.style.request_item_verifying VERIFICATION_FAIL -> R.style.request_item_error - SEND_FAIL, SENT -> R.style.request_item_retry + RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> R.style.request_item_retry RESENT -> R.style.request_item_resent else -> null }