Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use strongly-typed ACIs and PNIs everywhere.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-28 12:58:04 -04:00
parent 7ff4a82755
commit 82906aee58
146 changed files with 1416 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/testShared/org/thoughtcrime/securesms/database/model/databaseprotos/DecryptedGroupHelper.kt
View File

@@ -8,6 +8,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedMember
import org.signal.storageservice.protos.groups.local.DecryptedPendingMember
import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember
import org.whispersystems.signalservice.api.push.ServiceId
import org.whispersystems.signalservice.api.push.ServiceId.ACI
import org.whispersystems.signalservice.api.util.UuidUtil
import org.whispersystems.signalservice.internal.push.SignalServiceProtos
import java.util.UUID
@@ -30,30 +31,30 @@ fun encryptedGroupContext(masterKey: GroupMasterKey): SignalServiceProtos.GroupC
return SignalServiceProtos.GroupContextV2.newBuilder().setMasterKey(ByteString.copyFrom(masterKey.serialize())).build()
}
fun DecryptedGroupChange.Builder.addRequestingMember(serviceId: ServiceId) {
addNewRequestingMembers(requestingMember(serviceId))
fun DecryptedGroupChange.Builder.addRequestingMember(aci: ACI) {
addNewRequestingMembers(requestingMember(aci))
}
fun DecryptedGroupChange.Builder.deleteRequestingMember(serviceId: ServiceId) {
addDeleteRequestingMembers(serviceId.toByteString())
fun DecryptedGroupChange.Builder.deleteRequestingMember(aci: ACI) {
addDeleteRequestingMembers(aci.toByteString())
}
fun DecryptedGroupChange.Builder.addMember(serviceId: ServiceId) {
addNewMembers(member(serviceId))
fun DecryptedGroupChange.Builder.addMember(aci: ACI) {
addNewMembers(member(aci))
}
fun ServiceId.toByteString(): ByteString {
return UuidUtil.toByteString(uuid())
return UuidUtil.toByteString(rawUuid)
}
fun member(serviceId: UUID, role: Member.Role = Member.Role.DEFAULT, joinedAt: Int = 0): DecryptedMember {
return member(ServiceId.from(serviceId), role, joinedAt)
return member(ACI.from(serviceId), role, joinedAt)
}
fun member(serviceId: ServiceId, role: Member.Role = Member.Role.DEFAULT, joinedAt: Int = 0): DecryptedMember {
fun member(aci: ACI, role: Member.Role = Member.Role.DEFAULT, joinedAt: Int = 0): DecryptedMember {
return DecryptedMember.newBuilder()
.setRole(role)
.setUuid(serviceId.toByteString())
.setUuid(aci.toByteString())
.setJoinedAtRevision(joinedAt)
.build()
}