Inline deleteSync and SSREv2 capabilities.

This commit is contained in:
Greyson Parrelli
2025-08-15 12:23:02 -04:00
committed by Jeffrey Starke
parent 8df8cdf28d
commit 1c7f6a68e4
12 changed files with 33 additions and 84 deletions

View File

@@ -9,7 +9,6 @@ import android.content.Context
import android.database.Cursor
import com.google.protobuf.InvalidProtocolBufferException
import org.signal.core.util.Base64
import org.signal.core.util.Bitmask
import org.signal.core.util.logging.Log
import org.signal.core.util.optionalBlob
import org.signal.core.util.optionalBoolean
@@ -28,7 +27,6 @@ import org.thoughtcrime.securesms.badges.models.Badge
import org.thoughtcrime.securesms.conversation.colors.AvatarColor
import org.thoughtcrime.securesms.conversation.colors.ChatColors
import org.thoughtcrime.securesms.database.IdentityTable.VerifiedStatus
import org.thoughtcrime.securesms.database.RecipientTable.Capabilities
import org.thoughtcrime.securesms.database.RecipientTable.RegisteredState
import org.thoughtcrime.securesms.database.model.DistributionListId
import org.thoughtcrime.securesms.database.model.RecipientRecord
@@ -175,8 +173,7 @@ object RecipientTableCursorUtil {
fun readCapabilities(cursor: Cursor): RecipientRecord.Capabilities {
val capabilities = cursor.requireLong(RecipientTable.CAPABILITIES)
return RecipientRecord.Capabilities(
rawBits = capabilities,
storageServiceEncryptionV2 = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.STORAGE_SERVICE_ENCRYPTION_V2, Capabilities.BIT_LENGTH).toInt())
rawBits = capabilities
)
}

View File

@@ -119,14 +119,12 @@ data class RecipientRecord(
)
data class Capabilities(
val rawBits: Long,
val storageServiceEncryptionV2: Recipient.Capability
val rawBits: Long
) {
companion object {
@JvmField
val UNKNOWN = Capabilities(
rawBits = 0,
storageServiceEncryptionV2 = Recipient.Capability.UNKNOWN
rawBits = 0
)
}
}