Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xx Messenger Android
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile
android
xx Messenger Android
Commits
54323da4
Commit
54323da4
authored
Aug 9, 2022
by
Kamal Bramwell
Browse files
Options
Downloads
Patches
Plain Diff
Implemented getContactRequests once for failedVerifiedRequests()
parent
faf24a3f
No related branches found
No related tags found
3 merge requests
!84
Version 2.92 build 629
,
!77
v2.9 b627
,
!74
FE-957: Requests stuck verifying
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/io/xxlabs/messenger/requests/data/contact/ContactRequestRepository.kt
+11
-2
11 additions, 2 deletions
...ssenger/requests/data/contact/ContactRequestRepository.kt
with
11 additions
and
2 deletions
app/src/main/java/io/xxlabs/messenger/requests/data/contact/ContactRequestRepository.kt
+
11
−
2
View file @
54323da4
...
@@ -10,6 +10,8 @@ import io.xxlabs.messenger.requests.bindings.VerificationResult
...
@@ -10,6 +10,8 @@ import io.xxlabs.messenger.requests.bindings.VerificationResult
import
io.xxlabs.messenger.requests.data.LocalRequestsDataSource
import
io.xxlabs.messenger.requests.data.LocalRequestsDataSource
import
io.xxlabs.messenger.requests.data.RequestDataSource
import
io.xxlabs.messenger.requests.data.RequestDataSource
import
io.xxlabs.messenger.requests.model.ContactRequest
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
io.xxlabs.messenger.support.util.value
import
kotlinx.coroutines.*
import
kotlinx.coroutines.*
import
kotlinx.coroutines.flow.*
import
kotlinx.coroutines.flow.*
...
@@ -121,8 +123,15 @@ class ContactRequestsRepository @Inject constructor(
...
@@ -121,8 +123,15 @@ class ContactRequestsRepository @Inject constructor(
override
fun
failUnverifiedRequests
()
{
override
fun
failUnverifiedRequests
()
{
scope
.
launch
{
scope
.
launch
{
getRequests
().
take
(
1
).
collect
{
requests
->
localDataSource
.
getContactRequestsOnce
().
let
{
requestDataList
->
requests
.
filter
{
requestDataList
.
mapNotNull
{
requestData
->
val
contactData
=
daoRepository
.
getContactByUserId
(
requestData
.
requestId
)
.
value
()
contactData
?.
let
{
ContactRequestData
(
it
,
requestData
.
unread
)
}
}.
filter
{
it
.
requestStatus
==
VERIFYING
it
.
requestStatus
==
VERIFYING
}.
forEach
{
}.
forEach
{
update
(
it
,
VERIFICATION_FAIL
)
update
(
it
,
VERIFICATION_FAIL
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment