From 54323da474b7f453baf860b98919ec7c9b9be714 Mon Sep 17 00:00:00 2001 From: Kamal Bramwell <kamal@elixxir.io> Date: Mon, 8 Aug 2022 21:22:04 -0400 Subject: [PATCH] Implemented getContactRequests once for failedVerifiedRequests() --- .../data/contact/ContactRequestRepository.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xxlabs/messenger/requests/data/contact/ContactRequestRepository.kt b/app/src/main/java/io/xxlabs/messenger/requests/data/contact/ContactRequestRepository.kt index be2e069f..caf0d00d 100644 --- a/app/src/main/java/io/xxlabs/messenger/requests/data/contact/ContactRequestRepository.kt +++ b/app/src/main/java/io/xxlabs/messenger/requests/data/contact/ContactRequestRepository.kt @@ -10,6 +10,8 @@ import io.xxlabs.messenger.requests.bindings.VerificationResult import io.xxlabs.messenger.requests.data.LocalRequestsDataSource import io.xxlabs.messenger.requests.data.RequestDataSource import io.xxlabs.messenger.requests.model.ContactRequest +import io.xxlabs.messenger.support.appContext +import io.xxlabs.messenger.support.extensions.toast import io.xxlabs.messenger.support.util.value import kotlinx.coroutines.* import kotlinx.coroutines.flow.* @@ -121,8 +123,15 @@ class ContactRequestsRepository @Inject constructor( override fun failUnverifiedRequests() { scope.launch { - getRequests().take(1).collect { requests -> - requests.filter { + localDataSource.getContactRequestsOnce().let { requestDataList -> + requestDataList.mapNotNull { requestData -> + val contactData = daoRepository + .getContactByUserId(requestData.requestId) + .value() + contactData?.let { + ContactRequestData(it, requestData.unread) + } + }.filter { it.requestStatus == VERIFYING }.forEach { update(it, VERIFICATION_FAIL) -- GitLab