empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Exclude unregistered group members from invalid collisions check.

Browse source 
Fixes #13866
This commit is contained in:
Alex Hart 2025-01-06 13:38:05 -04:00
parent 0655b6f767
commit de6b9bc4ef
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/database/NameCollisionTables.kt
View file

@ -177,7 +177,12 @@ class NameCollisionTables(
val groupMembers: Optional<List<RecipientId>> = SignalDatabase.groups.getGroup(recipientId).map { it.members }
val invalidCollisions: Set<ReviewRecipient> = collisions.filter {
groupMembers.isPresent && (it.recipient.id !in groupMembers.get())
if (groupMembers.isPresent) {
val notAMember = it.recipient.id !in groupMembers.get()
val unregistered = it.recipient.isUnregistered
notAMember || unregistered
} else false
}.toSet()
val groups = (collisions - invalidCollisions).groupBy { SqlUtil.buildCaseInsensitiveGlobPattern(it.recipient.getDisplayName(context)) }