Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove announcement group capability checks.

Browse Source
This commit is contained in:
Cody Henthorne
2022-04-29 16:47:39 -04:00
committed by Greyson Parrelli
parent 1fad4d4f65
commit 9599d3a0b6
4 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupManagementRepository.kt
View File

@@ -7,18 +7,14 @@ import io.reactivex.rxjava3.schedulers.Schedulers
import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery
import org.thoughtcrime.securesms.database.GroupDatabase
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.groups.GroupChangeException
import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.groups.GroupManager
import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason
import org.thoughtcrime.securesms.jobs.RetrieveProfileJob
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import java.io.IOException
import java.util.concurrent.TimeUnit
private val TAG: String = Log.tag(GroupManagementRepository::class.java)
@@ -38,7 +34,6 @@ class GroupManagementRepository @JvmOverloads constructor(private val context: C
private fun addMembers(potentialGroupId: GroupId?, potentialGroupRecipient: Recipient?, selected: List<RecipientId>, consumer: Consumer<GroupAddMembersResult>) {
SignalExecutors.UNBOUNDED.execute {
val groupId: GroupId.Push = potentialGroupId?.requirePush() ?: potentialGroupRecipient!!.requireGroupId().requirePush()
val record: GroupDatabase.GroupRecord = SignalDatabase.groups.getGroup(groupId).get()
val recipients = selected.map(Recipient::resolved)
.filterNot { it.hasServiceId() && it.isRegistered }
@@ -51,23 +46,6 @@ class GroupManagementRepository @JvmOverloads constructor(private val context: C
consumer.accept(GroupAddMembersResult.Failure(GroupChangeFailureReason.NETWORK))
}
if (record.isAnnouncementGroup) {
val needsResolve = selected
.map { Recipient.resolved(it) }
.filter { it.announcementGroupCapability != Recipient.Capability.SUPPORTED && !it.isSelf }
.map { it.id }
.toSet()
ApplicationDependencies.getJobManager().runSynchronously(RetrieveProfileJob(needsResolve), TimeUnit.SECONDS.toMillis(10))
val updatedWithCapabilities = needsResolve.map { Recipient.resolved(it) }
if (updatedWithCapabilities.any { it.announcementGroupCapability != Recipient.Capability.SUPPORTED }) {
consumer.accept(GroupAddMembersResult.Failure(GroupChangeFailureReason.NOT_ANNOUNCEMENT_CAPABLE))
return@execute
}
}
consumer.accept(
try {
val toAdd = selected.filter { Recipient.resolved(it).isRegistered }